Skip to content

Fix SAML test IDP redirect #6901

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

Merged
merged 4 commits into from
Aug 5, 2025
Merged

Fix SAML test IDP redirect #6901

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a2c947
Temporary logging to investigate redirect problems
labkey-adam Aug 4, 2025
933d807
Try to fix test SAML redirect
labkey-adam Aug 5, 2025
8b5723c
Remove temporary logging
labkey-adam Aug 5, 2025
1dfdcdc
Parens
labkey-adam Aug 5, 2025
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
7 changes: 4 additions & 3 deletions api/src/org/labkey/api/util/URLHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,10 @@ public static StringBuilder getBaseServer(String scheme, String host, int port)
public boolean isLocalUri(ViewContext currentContext)
{
return getHost() == null
|| currentContext == null
|| currentContext.getActionURL() == null
|| getHost().equalsIgnoreCase(currentContext.getActionURL().getHost());
|| currentContext == null
|| currentContext.getActionURL() == null
// Scheme check is here for test SAML redirect, which is to the same host ("localhost") but a different scheme
|| (getHost().equalsIgnoreCase(currentContext.getActionURL().getHost()) && getScheme().equalsIgnoreCase(currentContext.getActionURL().getScheme()));
}

public String getURIString()
Expand Down