Fix push URLs to match the spec.#986
Merged
Merged
Conversation
richvdh
reviewed
Dec 3, 2020
Member
richvdh
left a comment
richvdh
left a comment
There was a problem hiding this comment.
in principle this looks good, but it seems like there are more instances of non-compliance.
Member
Author
|
Sorry about that! I thought I caught all the instances. 😢 |
clokep
commented
Dec 3, 2020
Comment on lines
+28
to
43
| await_http_request( $PUSH_LOCATION, sub { | ||
| my ( $request ) = @_; | ||
| my $body = $request->body_from_json; | ||
|
|
||
| # Respond to all requests, even if we filter them out | ||
| $request->respond_json( $response // {} ); | ||
|
|
||
| return unless $body->{notification}{type}; | ||
| return unless $body->{notification}{type} eq "m.room.message"; | ||
|
|
||
| # Ensure this is the expected pusher. | ||
| return unless $body->{notification}{devices}; | ||
| return unless $body->{notification}{devices}[0]{pushkey} eq $pushkey; | ||
|
|
||
| # Respond to expected request. | ||
| $request->respond_json( $response // {} ); | ||
|
|
||
| return 1; | ||
| }); |
Member
Author
There was a problem hiding this comment.
This is attempting to check one of the fields of the request instead of differentiating on URL.
erikjohnston
approved these changes
Dec 4, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This matches matrix-org/synapse#8865 to ensure the push URLs match the spec.