Skip to content

Conversation

@hughns
Copy link
Member

@hughns hughns commented Dec 3, 2025

This PR adds support for the stable m.oauth UIA stage used for resetting the cross-signing identity when using the OAuth 2.0 client authentication API. This was proposed in MSC4312.

It maintains support for unstable org.matrix.cross_signing_reset UIA stage to allow time for clients to adopt the stable version. This is achieved by offering two UIA flows (one for the unstable, and another for the stable) with a single stage in each.

I've added some test coverage of the expected UIA response from POST /_matrix/client/v3/keys/device_signing/upload too.

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)

@hughns hughns force-pushed the hughnsc/msc4312-finalisation branch from e108de7 to 9b2fedd Compare January 5, 2026 12:10
@hughns hughns marked this pull request as ready for review January 5, 2026 12:14
@hughns hughns requested a review from a team as a code owner January 5, 2026 12:14
Copy link
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.

A couple minor changes.

org.matrix.cross_signing_reset being the unstable stage name, yet the stable action name is quite confusing!

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
@hughns
Copy link
Member Author

hughns commented Jan 7, 2026

org.matrix.cross_signing_reset being the unstable stage name, yet the stable action name is quite confusing!

Indeed. Thanks for adding the clarification comments on this. 👍

@hughns hughns requested a review from anoadragon453 January 7, 2026 11:59
Copy link
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.

LGTM. Thanks!

@anoadragon453 anoadragon453 merged commit 4dcf113 into develop Jan 7, 2026
44 checks passed
@anoadragon453 anoadragon453 deleted the hughnsc/msc4312-finalisation branch January 7, 2026 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants