diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 19:25:51 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 19:25:51 +0000 |
| commit | 35768bceab78ead39833385b64559c653266f494 (patch) | |
| tree | 792f1332b52c075d04e641970e194fa24179f76f /synapse/handlers/federation.py | |
| parent | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats (diff) | |
| parent | Add some checks that we aren't using state from rejected events (#6330) (diff) | |
| download | synapse-35768bceab78ead39833385b64559c653266f494.tar.xz | |
Add some checks that we aren't using state from rejected events (#6330)
* commit '0e3ab8afd': Add some checks that we aren't using state from rejected events (#6330)
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 8b8d907105..7a0d132a3e 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1695,7 +1695,11 @@ class FederationHandler(BaseHandler): # hack around with a try/finally instead. success = False try: - if not event.internal_metadata.is_outlier() and not backfilled: + if ( + not event.internal_metadata.is_outlier() + and not backfilled + and not context.rejected + ): yield self.action_generator.handle_push_actions_for_event( event, context ) |