diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-09-13 13:07:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 13:07:12 -0400 |
| commit | 01c88a09cd6e90fa28c1282a56a08e481727ce20 (patch) | |
| tree | d5875f6291b512163d2e01da2150dd4d0956aa7d /synapse/rest/key/v2 | |
| parent | Fix copy-paste error in the password section of the sample-config. (#10804) (diff) | |
| download | synapse-01c88a09cd6e90fa28c1282a56a08e481727ce20.tar.xz | |
Use direct references for some configuration variables (#10798)
Instead of proxying through the magic getter of the RootConfig object. This should be more performant (and is more explicit).
Diffstat (limited to 'synapse/rest/key/v2')
| -rw-r--r-- | synapse/rest/key/v2/local_key_resource.py | 4 | ||||
| -rw-r--r-- | synapse/rest/key/v2/remote_key_resource.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/key/v2/local_key_resource.py b/synapse/rest/key/v2/local_key_resource.py index a5fcd15e3a..25f6eb842f 100644 --- a/synapse/rest/key/v2/local_key_resource.py +++ b/synapse/rest/key/v2/local_key_resource.py @@ -86,12 +86,12 @@ class LocalKey(Resource): json_object = { "valid_until_ts": self.valid_until_ts, - "server_name": self.config.server_name, + "server_name": self.config.server.server_name, "verify_keys": verify_keys, "old_verify_keys": old_verify_keys, } for key in self.config.signing_key: - json_object = sign_json(json_object, self.config.server_name, key) + json_object = sign_json(json_object, self.config.server.server_name, key) return json_object def render_GET(self, request): diff --git a/synapse/rest/key/v2/remote_key_resource.py b/synapse/rest/key/v2/remote_key_resource.py index 63a40b1852..744360e5fd 100644 --- a/synapse/rest/key/v2/remote_key_resource.py +++ b/synapse/rest/key/v2/remote_key_resource.py @@ -224,7 +224,9 @@ class RemoteKey(DirectServeJsonResource): for key_json in json_results: key_json = json_decoder.decode(key_json.decode("utf-8")) for signing_key in self.config.key_server_signing_keys: - key_json = sign_json(key_json, self.config.server_name, signing_key) + key_json = sign_json( + key_json, self.config.server.server_name, signing_key + ) signed_keys.append(key_json) |