diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-09-11 16:02:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-11 16:02:42 +0100 |
commit | 9fc71dc5eed7531454a34f8fec34bd451458c7c6 (patch) | |
tree | 73dfc6fac705680ea05fe8eef5dd0823569ef9a9 /synapse/util | |
parent | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction (diff) | |
download | synapse-9fc71dc5eed7531454a34f8fec34bd451458c7c6.tar.xz |
Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)
This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`.
Diffstat (limited to 'synapse/util')
-rw-r--r-- | synapse/util/hash.py | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/synapse/util/hash.py b/synapse/util/hash.py new file mode 100644 index 0000000000..359168704e --- /dev/null +++ b/synapse/util/hash.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- + +# Copyright 2019 The Matrix.org Foundation C.I.C. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import hashlib + +import unpaddedbase64 + + +def sha256_and_url_safe_base64(input_text): + """SHA256 hash an input string, encode the digest as url-safe base64, and + return + + :param input_text: string to hash + :type input_text: str + + :returns a sha256 hashed and url-safe base64 encoded digest + :rtype: str + """ + digest = hashlib.sha256(input_text.encode()).digest() + return unpaddedbase64.encode_base64(digest, urlsafe=True) |