diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-08-18 14:14:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 14:14:27 +0100 |
| commit | 5cf7c1299541d4b5ca5b3ac547a300a87465c7e5 (patch) | |
| tree | a03a9d2728e2aa0fbfe9a9a03165fab8d23f21a3 /synapse | |
| parent | Rename changelog from bugfix to misc. (diff) | |
| download | synapse-5cf7c1299541d4b5ca5b3ac547a300a87465c7e5.tar.xz | |
Remove : from allowed client_secret chars (#8101)
Closes: https://github.com/matrix-org/synapse/issues/6766 Equivalent Sydent PR: https://github.com/matrix-org/sydent/pull/309 I believe it's now time to remove the extra allowed `:` from `client_secret` parameters.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/util/stringutils.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index 2e2b40a426..61d96a6c28 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -24,9 +24,7 @@ from synapse.api.errors import Codes, SynapseError _string_with_symbols = string.digits + string.ascii_letters + ".,;:^&*-_+=#~@" # https://matrix.org/docs/spec/client_server/r0.6.0#post-matrix-client-r0-register-email-requesttoken -# Note: The : character is allowed here for older clients, but will be removed in a -# future release. Context: https://github.com/matrix-org/synapse/issues/6766 -client_secret_regex = re.compile(r"^[0-9a-zA-Z\.\=\_\-\:]+$") +client_secret_regex = re.compile(r"^[0-9a-zA-Z\.\=\_\-]+$") # random_string and random_string_with_symbols are used for a range of things, # some cryptographically important, some less so. We use SystemRandom to make sure |