Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_id_localpart

Browse Source 
Fix guest registration
This commit is contained in:
Erik Johnston 2019-11-26 17:04:15 +00:00 committed by GitHub
commit f085894cd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6420.bugfix Normal file
View File

@ -0,0 +1 @@
Fix broken guest registration when there are existing blocks of numeric user IDs.

18
synapse/storage/data_stores/main/registration.py
View File

@ -19,7 +19,6 @@ import logging
import re import re
from six import iterkeys from six import iterkeys
from six.moves import range
from twisted.internet import defer from twisted.internet import defer
from twisted.internet.defer import Deferred from twisted.internet.defer import Deferred
@ -482,12 +481,8 @@ class RegistrationWorkerStore(SQLBaseStore):
""" """
Gets the localpart of the next generated user ID. Gets the localpart of the next generated user ID.
Generated user IDs are integers, and we aim for them to be as small as Generated user IDs are integers, so we find the largest integer user ID
we can. Unfortunately, it's possible some of them are already taken by already taken and return that plus one.
existing users, and there may be gaps in the already taken range. This
function returns the start of the first allocatable gap. This is to
avoid the case of ID 1000 being pre-allocated and starting at 1001 while
0-999 are available.
""" """
def _find_next_generated_user_id(txn): def _find_next_generated_user_id(txn):
@ -497,15 +492,14 @@ class RegistrationWorkerStore(SQLBaseStore):
regex = re.compile(r"^@(\d+):") regex = re.compile(r"^@(\d+):")
found = set() max_found = 0
for (user_id,) in txn: for (user_id,) in txn:
match = regex.search(user_id) match = regex.search(user_id)
if match: if match:
found.add(int(match.group(1))) max_found = max(int(match.group(1)), max_found)
for i in range(len(found) + 1):
if i not in found: return max_found + 1
return i
return ( return (
( (