Skip to content

MSC4140: don't cancel delayed state on own state#17810

Merged
anoadragon453 merged 6 commits intoelement-hq:developfrom
AndrewFerr:msc4140_no-self-state-cancel
Mar 17, 2025
Merged

MSC4140: don't cancel delayed state on own state#17810
anoadragon453 merged 6 commits intoelement-hq:developfrom
AndrewFerr:msc4140_no-self-state-cancel

Conversation

@AndrewFerr
Copy link
Copy Markdown
Member

@AndrewFerr AndrewFerr commented Oct 10, 2024 •
edited
Loading

When a user sends a state event, do not cancel their own delayed events for the same piece of state.

For context, see the relevant section in the MSC.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

@AndrewFerr
Copy link
Copy Markdown
Member Author

AndrewFerr commented Oct 10, 2024

Depends on matrix-org/complement#742 for Complement tests to pass.

@anoadragon453 anoadragon453 mentioned this pull request Oct 10, 2024
Closed
1 task
@AndrewFerr AndrewFerr marked this pull request as ready for review October 10, 2024 13:55
@AndrewFerr AndrewFerr requested a review from a team as a code owner October 10, 2024 13:55
anoadragon453
anoadragon453 requested changes Oct 14, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good on the whole, just some small points of feedback.

Comment thread changelog.d/17810.feature Outdated
Comment thread synapse/handlers/delayed_events.py
Comment thread synapse/storage/databases/main/delayed_events.py
@AndrewFerr
Copy link
Copy Markdown
Member Author

AndrewFerr commented Oct 16, 2024

The sytests pass when I run them locally. Is there a way to retry their CI runs?

@MadLittleMods
Copy link
Copy Markdown
Contributor

MadLittleMods commented Oct 16, 2024

@AndrewFerr Retried 👍

@AndrewFerr AndrewFerr mentioned this pull request Oct 23, 2024
Closed
3 tasks
@AndrewFerr
MSC4140: don't cancel delayed state on own state
95c012a 
When a user sends a state event, do not cancel their own delayed events
for the same piece of state.
@AndrewFerr
Add changelog
b75dac7
@AndrewFerr
Reword changelog
f1d66ea
@AndrewFerr
Document args of delayed events store method
4ecbe62
@AndrewFerr AndrewFerr force-pushed the msc4140_no-self-state-cancel branch from d45595c to 4ecbe62 Compare November 11, 2024 03:23
@AndrewFerr
Copy link
Copy Markdown
Member Author

AndrewFerr commented Nov 11, 2024

Now the only failing tests are the ones that depend on matrix-org/complement#742 (finally!).

@hughns
Copy link
Copy Markdown
Member

hughns commented Jan 17, 2025

@AndrewFerr what's the latest on this PR and addressing any outstanding issues?

@AndrewFerr
Copy link
Copy Markdown
Member Author

AndrewFerr commented Jan 17, 2025 •
edited
Loading

what's the latest on this PR and addressing any outstanding issues?

This and matrix-org/complement#742 are both ready to be merged (though the latter should be merged first).

EDIT: I'll open a new Complement PR with its branch name set such that it will be used in this PR's Complement tests in CI.

@AndrewFerr
Copy link
Copy Markdown
Member Author

AndrewFerr commented Mar 10, 2025

Eugh, looks like I had the wrong understanding of how CI chooses which Complement branch to run on.

In any case, I can assure you that TestDelayedEvents passes when using this PR + matrix-org/complement#768.

@hughns hughns mentioned this pull request Mar 11, 2025
Merged
4 tasks
hughns added a commit to matrix-org/matrix-js-sdk that referenced this pull request Mar 12, 2025
@hughns
WIP to remove workaround for MSC4140
3215e7b 
Removes workaround for element-hq/synapse#17810 not having landed
@hughns hughns mentioned this pull request Mar 12, 2025
Closed
4 tasks
@sandhose sandhose requested a review from a team March 17, 2025 13:46
anoadragon453
anoadragon453 approved these changes Mar 17, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM, thanks for your patience 🙏

Will merge this PR at the same time as matrix-org/complement#768.

@anoadragon453 anoadragon453 merged commit 51df675 into element-hq:develop Mar 17, 2025
@AndrewFerr AndrewFerr deleted the msc4140_no-self-state-cancel branch March 17, 2025 17:36
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Mar 27, 2025
@Midar
Update chat/matrix-synapse to 1.127.1
5d7bfea 
Fixes high severity vulnerability *exploited in the wild*!


# Synapse 1.127.1 (2025-03-26)

## Security
- Fix [CVE-2025-30355](https://www.cve.org/CVERecord?id=CVE-2025-30355) / [GHSA-v56r-hwv5-mxg6](GHSA-v56r-hwv5-mxg6). **High severity vulnerability affecting federation. The vulnerability has been exploited in the wild.**



# Synapse 1.127.0 (2025-03-25)

No significant changes since 1.127.0rc1.




# Synapse 1.127.0rc1 (2025-03-18)

### Features

- Update [MSC4140](matrix-org/matrix-spec-proposals#4140) implementation to no longer cancel a user's own delayed state events with an event type & state key that match a more recent state event sent by that user. ([\#17810](element-hq/synapse#17810))

### Improved Documentation

- Fixed a minor typo in the Synapse documentation. Contributed by @karuto12. ([\#18224](element-hq/synapse#18224))

### Internal Changes

- Remove undocumented `SYNAPSE_USE_FROZEN_DICTS` environment variable. ([\#18123](element-hq/synapse#18123))
- Fix detection of workflow failures in the release script. ([\#18211](element-hq/synapse#18211))
- Add caching support to media endpoints. ([\#18235](element-hq/synapse#18235))



### Updates to locked dependencies

* Bump anyhow from 1.0.96 to 1.0.97. ([\#18201](element-hq/synapse#18201))
* Bump bcrypt from 4.2.1 to 4.3.0. ([\#18207](element-hq/synapse#18207))
* Bump bytes from 1.10.0 to 1.10.1. ([\#18227](element-hq/synapse#18227))
* Bump http from 1.2.0 to 1.3.1. ([\#18245](element-hq/synapse#18245))
* Bump sentry-sdk from 2.19.2 to 2.22.0. ([\#18205](element-hq/synapse#18205))
* Bump serde from 1.0.218 to 1.0.219. ([\#18228](element-hq/synapse#18228))
* Bump serde_json from 1.0.139 to 1.0.140. ([\#18202](element-hq/synapse#18202))
* Bump ulid from 1.2.0 to 1.2.1. ([\#18246](element-hq/synapse#18246))
yingziwu added a commit to yingziwu/synapse that referenced this pull request Apr 13, 2025
@yingziwu
Merge tag 'v1.127.0' into develop
fd7b743 
No significant changes since 1.127.0rc1.

- Update [MSC4140](matrix-org/matrix-spec-proposals#4140) implementation to no longer cancel a user's own delayed state events with an event type & state key that match a more recent state event sent by that user. ([\#17810](element-hq/synapse#17810))

- Fixed a minor typo in the Synapse documentation. Contributed by @karuto12. ([\#18224](element-hq/synapse#18224))

- Remove undocumented `SYNAPSE_USE_FROZEN_DICTS` environment variable. ([\#18123](element-hq/synapse#18123))
- Fix detection of workflow failures in the release script. ([\#18211](element-hq/synapse#18211))
- Add caching support to media endpoints. ([\#18235](element-hq/synapse#18235))

* Bump anyhow from 1.0.96 to 1.0.97. ([\#18201](element-hq/synapse#18201))
* Bump bcrypt from 4.2.1 to 4.3.0. ([\#18207](element-hq/synapse#18207))
* Bump bytes from 1.10.0 to 1.10.1. ([\#18227](element-hq/synapse#18227))
* Bump http from 1.2.0 to 1.3.1. ([\#18245](element-hq/synapse#18245))
* Bump sentry-sdk from 2.19.2 to 2.22.0. ([\#18205](element-hq/synapse#18205))
* Bump serde from 1.0.218 to 1.0.219. ([\#18228](element-hq/synapse#18228))
* Bump serde_json from 1.0.139 to 1.0.140. ([\#18202](element-hq/synapse#18202))
* Bump ulid from 1.2.0 to 1.2.1. ([\#18246](element-hq/synapse#18246))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anoadragon453 anoadragon453 anoadragon453 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@AndrewFerr @MadLittleMods @hughns @anoadragon453 @wrjlewis @sandhose
⚡