Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2019-06-11 10:37:43 +01:00
commit 5bc9484537
6 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,9 @@
Synapse 1.0.0rc3 (2019-06-10)
=============================
Security: Fix authentication bug introduced in 1.0.0rc1. Please upgrade to rc3 immediately
Synapse 1.0.0rc2 (2019-06-10) Synapse 1.0.0rc2 (2019-06-10)
============================= =============================

1
changelog.d/5418.bugfix Normal file
View file

@ -0,0 +1 @@
Fix bug where attempting to send transactions with large number of EDUs can fail.

View file

@ -27,4 +27,4 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.0.0rc2" __version__ = "1.0.0rc3"

View file

@ -479,6 +479,7 @@ class AuthHandler(BaseHandler):
medium, medium,
threepid_creds["client_secret"], threepid_creds["client_secret"],
sid=threepid_creds["sid"], sid=threepid_creds["sid"],
validated=True,
) )
threepid = { threepid = {

View file

@ -138,6 +138,10 @@ class DeviceInboxWorkerStore(SQLBaseStore):
if not has_changed or last_stream_id == current_stream_id: if not has_changed or last_stream_id == current_stream_id:
return defer.succeed(([], current_stream_id)) return defer.succeed(([], current_stream_id))
if limit <= 0:
# This can happen if we run out of room for EDUs in the transaction.
return defer.succeed(([], last_stream_id))
def get_new_messages_for_remote_destination_txn(txn): def get_new_messages_for_remote_destination_txn(txn):
sql = ( sql = (
"SELECT stream_id, messages_json FROM device_federation_outbox" "SELECT stream_id, messages_json FROM device_federation_outbox"

View file

@ -998,7 +998,7 @@ class RegistrationStore(
client_secret, client_secret,
address=None, address=None,
sid=None, sid=None,
validated=None, validated=True,
): ):
"""Gets a session_id and last_send_attempt (if available) for a """Gets a session_id and last_send_attempt (if available) for a
client_secret/medium/(address|session_id) combo client_secret/medium/(address|session_id) combo