multi-ingress: Remove single IdP special-case#5291
Open
supersven wants to merge 4 commits into
Open
Conversation
zebot
added
the
ok-to-test
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the IdP selection logic for /sso/get-by-email so that a single configured IdP is no longer automatically returned; instead, the IdP must match the requested domain (including the Nothing/unset case).
Changes:
- Removed the “single IdP always matches” branch in
getSsoCodeByEmailImpl, delegating all non-empty cases to domain-based matching. - Updated the unit property test to assert
Just idpIdonly when the IdP’s configured domain matches the requested domain.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| libs/wire-subsystems/src/Wire/IdPSubsystem/Interpreter.hs | Removes the singleton-IdP shortcut and always performs domain-based IdP selection for non-empty IdP lists. |
| libs/wire-subsystems/test/unit/Wire/IdPSubsystem/InterpreterSpec.hs | Adjusts the property test expectations to align with the updated domain-matching behavior. |
supersven
force-pushed
the
sventennie/remove-single-idp-specialcase
branch
from
bfdec8f to
3998b98
Compare
supersven
changed the title
Comment on lines
+7
to
+8
| To align with the others, this check is also added to the `HEAD | ||
| /sso/initiate-login` pre-check endpoint. |
Contributor
Author
There was a problem hiding this comment.
@copilot Your change seems to have the same issue. Please make better proposal.
Previously, we treated a single IdP as global (spanning all domains) in multi-ingress. But, this leaks information about "something which all ingresses have in in common". Also, it's hard to impossible to configure a working setup for this on (some?) SaaS. So, we now require that - when multi-ingress is configured - the IdP used for a request must have the same domain as the ingress which received the request.
supersven
force-pushed
the
sventennie/remove-single-idp-specialcase
branch
from
19fc31c to
d7114b3
Compare
Comment on lines
+46
to
+48
| let ernieZHost = "nginz-https.ernie.example.com" | ||
| bertZHost = "nginz-https.bert.example.com" | ||
| kermitZHost = "nginz-https.kermit.example.com" |
blackheaven
requested changes
Jun 30, 2026
| initiateSamlLoginWithZHost :: (HasCallStack, MakesValue domain) => domain -> Maybe String -> String -> App Response | ||
| initiateSamlLoginWithZHost domain mbZHost idpId = initiateSamlLoginWithZHostAndLabel domain mbZHost Nothing idpId -- | ||
|
|
||
| -- | https://staging-nginz-https.zinfra.io/v16/api/swagger-ui/#/default/auth-req-precheck |
Contributor
There was a problem hiding this comment.
Can you detail a bit this comment
Contributor
Author
There was a problem hiding this comment.
Sure, I saw that there is a pattern in this module to add links to Swagger to these endpoint client functions. Then, I followed the pattern as well.
Comment on lines
+103
to
+104
| resp.status `shouldMatchInt` 404 | ||
| resp.json %. "label" `shouldMatch` "not-found" |
Contributor
There was a problem hiding this comment.
I think there is a helper like assertLabel?
Contributor
Author
There was a problem hiding this comment.
I forgot about it 😅 But, you're right: It's better 👍
blackheaven
approved these changes
Jun 30, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously,
POST /sso/get-by-emailandGET /sso/initiate-loginendpointstreated an IdP as globally configured for all domains when there was only one
for a team. This led to information leakage and confusion, raising "Why do I endup at another domain's IdP when I'm on this one?" questions. Now, these endpoints
always treat IdPs as bound to a domain when multi-ingress is configured. I.e.
IdP domain and request domain must match, otherwise an error is returned.
The error resembles what would be returned if the IdP wouldn't exist.
To align with the others, this check is also added to the
HEAD /sso/initiate-loginpre-check endpoint.Ticket: https://wearezeta.atlassian.net/browse/WPB-26244
Checklist
changelog.dRead and follow the PR guidelines(Breaking behaviour, but currently no-one is using multi-ingress in prod)