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

Jump to bottom

Sub domains should not match #6952

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Sub domains should not match #6952

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f33f96
Sub domains should not match
amontenegro Dec 19, 2023
6cf9d29
Use random number generator instead of time millis
amontenegro Dec 19, 2023
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
2 changes: 1 addition & 1 deletion orcid-core/src/main/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ private boolean isEqual(String str1, String str2) {

@Override
protected boolean hostMatches(String registered, String requested) {
return isEqual(registered, requested) || (requested != null && requested.endsWith("." + registered));
return isEqual(registered, requested);
}
}
14 changes: 7 additions & 7 deletions orcid-core/src/test/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ private void redirectUriGeneralTest() {

@Test
public void redirectMatches_AllowMatchingSubdomainsTest() {
// Temp: Subdomain should match if the togglz is OFF
assertTrue(resolver.redirectMatches("https://www.orcid.org", "https://orcid.org"));
assertTrue(resolver.redirectMatches("https://qa.orcid.org", "https://orcid.org"));
// Subdomain should not match
assertFalse(resolver.redirectMatches("https://www.orcid.org", "https://orcid.org"));
assertFalse(resolver.redirectMatches("https://qa.orcid.org", "https://orcid.org"));

// Acceptance criteria checks: These should pass when the togglz is OFF
assertTrue(resolver.redirectMatches("https://subdomain.example.com/", "https://example.com"));
assertTrue(resolver.redirectMatches("https://subdomain.example.com/subdirectory", "https://example.com"));
assertTrue(resolver.redirectMatches("https://www.example.com", "https://example.com"));
// Acceptance criteria checks: subdomains should be rejected
assertFalse(resolver.redirectMatches("https://subdomain.example.com/", "https://example.com"));
assertFalse(resolver.redirectMatches("https://subdomain.example.com/subdirectory", "https://example.com"));
assertFalse(resolver.redirectMatches("https://www.example.com", "https://example.com"));
}

}