Sub domains should not match

ORCID · Dec 19, 2023 · 5f33f96 · 5f33f96
1 parent 03432d4
commit 5f33f96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolver.java b/orcid-core/src/main/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolver.java
@@ -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);
     }
 }
diff --git a/orcid-core/src/test/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolverTest.java b/orcid-core/src/test/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolverTest.java
@@ -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"));
     }
 
 }