diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-05-11 12:20:57 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-11 12:20:57 +0100 |
| commit | 1620578b13fbcdf902f6bef5c15faa98fe871f1c (patch) | |
| tree | a364b16c6f205b6ba0ab4cd0264a0ef3ea184b1a | |
| parent | Merge pull request #775 from matrix-org/erikj/password_hash (diff) | |
| download | synapse-1620578b13fbcdf902f6bef5c15faa98fe871f1c.tar.xz | |
Shuffle when we get the signing_key attribute.
Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers.
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 45d3d47fc1..f9e2c98f3f 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -48,7 +48,6 @@ class MessageHandler(BaseHandler): self.clock = hs.get_clock() self.validator = EventValidator() self.snapshot_cache = SnapshotCache() - self.signing_key = hs.config.signing_key[0] @defer.inlineCallbacks def get_messages(self, requester, room_id=None, pagin_config=None, @@ -766,8 +765,9 @@ class MessageHandler(BaseHandler): yield self.auth.add_auth_events(builder, context) + signing_key = self.hs.config.signing_key[0] add_hashes_and_signatures( - builder, self.server_name, self.signing_key + builder, self.server_name, signing_key ) event = builder.build() |