Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve error message for cross signing reset with MSC3861 enabled #17121

Merged
merged 6 commits into from
Apr 26, 2024
Merged

Improve error message for cross signing reset with MSC3861 enabled #17121

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
addfdf8
Improve error message for cross signing reset with MSC3861 enabled
t3chguy Apr 25, 2024
1afe8cd
Add changelog
t3chguy Apr 25, 2024
5bd6562
Merge branch 'develop' of https://github.com/element-hq/synapse into …
t3chguy Apr 25, 2024
9a012c3
Merge branch 'develop' of https://github.com/element-hq/synapse into …
t3chguy Apr 25, 2024
609058d
Iterate
t3chguy Apr 25, 2024
cbbe7a6
Merge branch 'develop' into t3chguy/better-oidc-xsigning-reset-error
t3chguy Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/17121.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve error message for cross signing reset with MSC3861 enabled.
4 changes: 3 additions & 1 deletion synapse/rest/client/keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,11 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
# The auth service has to explicitly mark the master key as replaceable
# without UIA to reset the device signing key with MSC3861.
if is_cross_signing_setup and not master_key_updatable_without_uia:
url = self.hs.config.experimental.msc3861.account_management_url
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
raise SynapseError(
HTTPStatus.NOT_IMPLEMENTED,
"Resetting cross signing keys is not yet supported with MSC3861",
"Resetting cross signing keys with MSC3861 requires manual "
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
f"approval at {url}?action=org.matrix.cross_signing_reset",
Codes.UNRECOGNIZED,
)
# But first-time setup is fine
Expand Down
Loading