This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add initial support for a "pick your IdP" page #9017
Merged
+194
−3
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add support for multiple SSO Identity Providers. |
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="UTF-8"> | ||
<link rel="stylesheet" href="/_matrix/static/client/login/style.css"> | ||
<title>{{server_name | e}} Login</title> | ||
</head> | ||
<body> | ||
<div id="container"> | ||
<h1 id="title">{{server_name | e}} Login</h1> | ||
<div class="login_flow"> | ||
<p>Choose one of the following identity providers:</p> | ||
<form> | ||
<input type="hidden" name="redirectUrl" value="{{redirect_url | e}}"> | ||
<ul class="radiobuttons"> | ||
{% for p in providers %} | ||
<li> | ||
<input type="radio" name="idp" id="prov{{loop.index}}" value="{{p.idp_id}}"> | ||
<label for="prov{{loop.index}}">{{p.idp_name | e}}</label> | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
<input type="submit" class="button button--full-width" id="button-submit" value="Submit"> | ||
</form> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2021 The Matrix.org Foundation C.I.C. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
import logging | ||
from typing import TYPE_CHECKING | ||
|
||
from synapse.http.server import ( | ||
DirectServeHtmlResource, | ||
finish_request, | ||
respond_with_html, | ||
) | ||
from synapse.http.servlet import parse_string | ||
from synapse.http.site import SynapseRequest | ||
|
||
if TYPE_CHECKING: | ||
from synapse.server import HomeServer | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class PickIdpResource(DirectServeHtmlResource): | ||
"""IdP picker resource. | ||
|
||
This resource gets mounted under /_synapse/client/pick_idp. It serves an HTML page | ||
which prompts the user to choose an Identity Provider from the list. | ||
""" | ||
|
||
def __init__(self, hs: "HomeServer"): | ||
super().__init__() | ||
self._sso_handler = hs.get_sso_handler() | ||
self._sso_login_idp_picker_template = ( | ||
hs.config.sso.sso_login_idp_picker_template | ||
) | ||
self._server_name = hs.hostname | ||
|
||
async def _async_render_GET(self, request: SynapseRequest) -> None: | ||
client_redirect_url = parse_string(request, "redirectUrl", required=True) | ||
idp = parse_string(request, "idp", required=False) | ||
|
||
# if we need to pick an IdP, do so | ||
if not idp: | ||
return await self._serve_id_picker(request, client_redirect_url) | ||
|
||
# otherwise, redirect to the IdP's redirect URI | ||
providers = self._sso_handler.get_identity_providers() | ||
auth_provider = providers.get(idp) | ||
if not auth_provider: | ||
logger.info("Unknown idp %r", idp) | ||
self._sso_handler.render_error( | ||
request, "unknown_idp", "Unknown identity provider ID" | ||
) | ||
return | ||
|
||
sso_url = await auth_provider.handle_redirect_request( | ||
request, client_redirect_url.encode("utf8") | ||
) | ||
logger.info("Redirecting to %s", sso_url) | ||
request.redirect(sso_url) | ||
finish_request(request) | ||
|
||
async def _serve_id_picker( | ||
self, request: SynapseRequest, client_redirect_url: str | ||
) -> None: | ||
# otherwise, serve up the IdP picker | ||
providers = self._sso_handler.get_identity_providers() | ||
html = self._sso_login_idp_picker_template.render( | ||
redirect_url=client_redirect_url, | ||
server_name=self._server_name, | ||
providers=providers.values(), | ||
) | ||
respond_with_html(request, 200, html) |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a brief thought that we could just return the HTML template here instead of the redirect to avoid encoding the redirectURL, then decoding it, putting it into a template, then submitting it again back to the server...I think this implementation is OK, just seems to involve slightly more back and forth.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, we probably could. The main reason I didn't was because
/_matrix/client/r0/login/sso/redirect
is served as aJsonResource
, so any errors get rendered as json objects, which is a bit silly. Of course, that doesn't mean we handle any errors which do happen during the/_matrix/client/r0/login/sso/redirect
request any more gracefully :/.