Fix 'Outbound federation will ignore a missing event with bad JSON for room version 6' #1061
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…r room version 6' We can't assume that homeservers will process inbound federation events synchronously.
richvdh
requested changes
Jul 1, 2021
Comment on lines
545
to
573
| ->then( sub { | ||
| my ( $req ) = @_; | ||
| my $body = $req->body_from_json; | ||
|
|
||
| log_if_fail "Second /get_missing_events body", $body; | ||
|
|
||
| log_if_fail "Send response", $body; | ||
| assert_json_list( my $earliest = $body->{earliest_events} ); | ||
| @$earliest == 1 or | ||
| die "Expected a single 'earliest_event' ID"; | ||
|
|
||
| assert_json_keys( $body, 'pdus' ); | ||
| # 'pdus' is a map from event id to error details. | ||
| my $pdus = $body->{pdus}; | ||
| # It is expected that the earliest event is the m.room.member event, | ||
| # but it is possible that the caches have not yet been invalidated | ||
| # so also allow any of that event's previous events. | ||
| my @expected = @{$latest_event->{prev_events}}; | ||
| push( @expected, $room->id_for_event( $latest_event ) ); | ||
| assert_ok( any { $earliest->[0] eq $_ } @expected, | ||
| "'earliest_events' did not match" ); | ||
|
|
||
| # Sending the event fails since fetching the event results in | ||
| # invalid JSON, thus we expect an error for the sent PDU. | ||
| assert_json_keys( $pdus, $sent_event_id ); | ||
| assert_json_keys( $pdus->{$sent_event_id}, qw( error ) ); | ||
| assert_json_list( my $latest = $body->{latest_events} ); | ||
| @$latest == 1 or | ||
| die "Expected a single 'latest_events' ID"; | ||
| assert_eq( $latest->[0], $marker_event_id, | ||
| 'latest_events[0]' ); | ||
|
|
||
| Future->done; | ||
| }), | ||
| ); | ||
| $req->respond_json( { | ||
| events => [ $sent_event ], | ||
| } ); | ||
|
|
||
| Future->done; |
There was a problem hiding this comment.
if this is a cut and paste of the earlier code, let's factor it out to a separate sub ?
|
do we even still need this test, given it has been ported to complement? |
FTR we decided we do want to keep the test here, at least until we can add worker mode to complement and add it to CI |
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
erikjohnston
force-pushed
the
erikj/fix_reject_bad_prev_event
branch
from
73eb982
to
13029d1
Compare
richvdh
approved these changes
Jul 7, 2021
richvdh
added a commit
to matrix-org/synapse
that referenced
this pull request
Jul 8, 2021
... now that it has been fixed in matrix-org/sytest#1061.
richvdh
added a commit
to matrix-org/complement
that referenced
this pull request
Jul 9, 2021
…r room version 6' (#152) This test got blacklisted for the release of Synapse 1.37.1. We can't assume that homeservers will process inbound federation events synchronously. In this particular case we replace the check for errors in /send response with a check that if we send a new event that references the expected rejected event we'll see a request for that event come in. c.f. matrix-org/synapse#10275 and matrix-org/sytest#1061
richvdh
added a commit
to matrix-org/synapse
that referenced
this pull request
Jul 9, 2021
... now that it has been fixed in matrix-org/sytest#1061.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We can't assume that homeservers will process inbound federation events synchronously.
In this particular case we replace the check for errors in
/sendresponse with a check that if we send a new event that references the expected rejected event we'll see a request for that event come in.c.f. matrix-org/synapse#10275