Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-13 22:20:37 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/release-v1.8.0' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2020-01-08 13:27:17 +00:00
commit b064a41291
8 changed files with 184 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

30
synapse/rest/key/v2/remote_key_resource.py
View file

@ -15,7 +15,6 @@
import logging
from canonicaljson import encode_canonical_json, json
from signedjson.key import encode_verify_key_base64
from signedjson.sign import sign_json
from twisted.internet import defer
@ -217,28 +216,15 @@ class RemoteKey(DirectServeResource):
if cache_misses and query_remote_on_cache_miss:
yield self.fetcher.get_keys(cache_misses)
yield self.query_keys(request, query, query_remote_on_cache_miss=False)
return
signed_keys = []
for key_json in json_results:
key_json = json.loads(key_json)
# backwards-compatibility hack for #6596: if the requested key belongs
# to us, make sure that all of the signing keys appear in the
# "verify_keys" section.
if key_json["server_name"] == self.config.server_name:
verify_keys = key_json["verify_keys"]
else:
signed_keys = []
for key_json in json_results:
key_json = json.loads(key_json)
for signing_key in self.config.key_server_signing_keys:
key_id = "%s:%s" % (signing_key.alg, signing_key.version)
verify_keys[key_id] = {
"key": encode_verify_key_base64(signing_key.verify_key)
}
key_json = sign_json(key_json, self.config.server_name, signing_key)
for signing_key in self.config.key_server_signing_keys:
key_json = sign_json(key_json, self.config.server_name, signing_key)
signed_keys.append(key_json)
signed_keys.append(key_json)
results = {"server_keys": signed_keys}
results = {"server_keys": signed_keys}
respond_with_json_bytes(request, 200, encode_canonical_json(results))
respond_with_json_bytes(request, 200, encode_canonical_json(results))

4
synapse/storage/data_stores/main/__init__.py
View file

@ -526,9 +526,9 @@ class DataStore(
attr_filter = {}
if not guests:
attr_filter["is_guest"] = False
attr_filter["is_guest"] = 0
if not deactivated:
attr_filter["deactivated"] = False
attr_filter["deactivated"] = 0
return self.db.simple_select_list_paginate(
desc="get_users_paginate",