Be more tolerant towards weird data in transaction pdus #17893
+24
−4
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
MadLittleMods
requested changes
Nov 6, 2024
| @@ -469,14 +475,27 @@ async def _handle_pdus_in_txn( | |||
| logger.info("Ignoring PDU: %s", e) | |||
| continue | |||
|
|
|||
| event = event_from_pdu_json(p, room_version) | |||
| if possible_event_id != "<Unknown>": | |||
There was a problem hiding this comment.
It looks like this is trying to match up to the magic value we set at
synapse/synapse/federation/federation_server.py
Lines 446 to 449 in eac170b
We should make this a constant
| @@ -0,0 +1 @@ | |||
| Fix a bug where all messages from a server could be blocked because of one bad event. Contributed by @morguldir | |||
There was a problem hiding this comment.
Is there more context for the issue you ran into specifically? Some issue that should be linked?
| @@ -469,14 +475,27 @@ async def _handle_pdus_in_txn( | |||
| logger.info("Ignoring PDU: %s", e) | |||
| continue | |||
|
|
|||
| event = event_from_pdu_json(p, room_version) | |||
| if possible_event_id != "<Unknown>": | |||
There was a problem hiding this comment.
(needs wrapping)
Suggested change
| if possible_event_id != "<Unknown>": | |
| # An event should only have an event_id at this point if it's for a v1/v2 room. | |
| # In future room versions, the `event_id` is derived from the event canonical JSON. | |
| # | |
| # So if we see a `event_id` but the room version doesn't support v1/v2 events, it's invalid and we should reject it. | |
| if possible_event_id != "<Unknown>": |
| logger.info(f"Rejecting event {possible_event_id} from {origin} " | ||
| f"because the event was made for a v1 room, " | ||
| f"while {room_id} is a v{room_version.identifier} room") | ||
| pdu_results[possible_event_id] = {"error": "Event ID incorrectly supplied in non-v1/v2 room"} |
There was a problem hiding this comment.
Suggested change
| pdu_results[possible_event_id] = {"error": "Event ID incorrectly supplied in non-v1/v2 room"} | |
| pdu_results[possible_event_id] = {"error": "Event ID should not be supplied in non-v1/v2 room"} |
Comment on lines
+489
to
+490
| if possible_event_id != "<Unknown>": | ||
| pdu_results[possible_event_id] = {"error": f"Failed to convert json into event, {e}"} |
There was a problem hiding this comment.
(needs wrapping)
Suggested change
| if possible_event_id != "<Unknown>": | |
| pdu_results[possible_event_id] = {"error": f"Failed to convert json into event, {e}"} | |
| # We can only provide feedback to the federating server if we can determine what the event_id is but since we we failed to parse the event, we can't derive the `event_id` so there is nothing to use as the `pdu_results` key. Best we can do is just log for our own record and move on. | |
| if possible_event_id != "<Unknown>": | |
| pdu_results[possible_event_id] = {"error": f"Failed to convert json into event, {e}"} |
| @@ -56,7 +56,11 @@ | |||
| SynapseError, | |||
There was a problem hiding this comment.
@morguldir Are you up for adding a test for this? Probably something in tests/federation/test_federation_server.py, make a request like this and then assert that the other PDU's in the transaction besides the corrupted one were persisted.
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.
Pull Request Checklist
Complement test: matrix-org/complement#743