diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-02-01 18:05:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 18:05:47 -0700 |
| commit | 6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7 (patch) | |
| tree | 35701fcc0456593d736a3405f72a5dfd624b1cad /synapse/handlers/e2e_keys.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media (diff) | |
| download | synapse-6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7.tar.xz | |
Merge branch 'develop' into travis/admin-list-media
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 5af8abf66b..9aa95f89e6 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -19,7 +19,9 @@ import logging from canonicaljson import encode_canonical_json from twisted.internet import defer -from synapse.api.errors import SynapseError, CodeMessageException +from synapse.api.errors import ( + SynapseError, CodeMessageException, FederationDeniedError, +) from synapse.types import get_domain_from_id, UserID from synapse.util.logcontext import preserve_fn, make_deferred_yieldable from synapse.util.retryutils import NotRetryingDestination @@ -140,6 +142,10 @@ class E2eKeysHandler(object): failures[destination] = { "status": 503, "message": "Not ready for retry", } + except FederationDeniedError as e: + failures[destination] = { + "status": 403, "message": "Federation Denied", + } except Exception as e: # include ConnectionRefused and other errors failures[destination] = { |