kaslo/synapse
1
0
Fork 0
Code Packages Releases 124 Wiki Activity

Support for stable m.oauth UIA stage for MSC4312

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2025-12-03 12:06:02 +00:00
parent 978ae0b080
commit 5becde67e1
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/rest/client/auth.py
View File

@@ -67,7 +67,8 @@ class AuthRestServlet(RestServlet):
if not session:
raise SynapseError(400, "No session supplied")
if stagetype == "org.matrix.cross_signing_reset":
# We support the unstable (`org.matrix.cross_signing_reset`) name from MSC4312 until enough clients have adopted the stable name (`m.oauth`).
if stagetype == "m.oauth" or stagetype == "org.matrix.cross_signing_reset":
if self.hs.config.mas.enabled:
assert isinstance(self.auth, MasDelegatedAuth)

10
synapse/rest/client/keys.py
View File

@@ -560,9 +560,14 @@ class SigningKeyUploadServlet(RestServlet):
{
"session": "dummy",
"flows": [
{"stages": ["m.oauth"]},
# The unstable name from MSC4312 should be supported until enough clients have adopted the stable (`m.oauth`) name:
{"stages": ["org.matrix.cross_signing_reset"]},
],
"params": {
"m.oauth": {
"url": url,
},
"org.matrix.cross_signing_reset": {
"url": url,
},
@@ -594,9 +599,14 @@ class SigningKeyUploadServlet(RestServlet):
{
"session": "dummy",
"flows": [
{"stages": ["m.oauth"]},
# The unstable name from MSC4312 should be supported until enough clients have adopted the stable (`m.oauth`) name:
{"stages": ["org.matrix.cross_signing_reset"]},
],
"params": {
"m.oauth": {
"url": url,
},
"org.matrix.cross_signing_reset": {
"url": url,
},