Fix unit tests

ORCID · Nov 15, 2024 · 019de32 · 019de32
1 parent 2de4bd5
commit 019de32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/web/filters/CrossDomainWebManger.java b/orcid-core/src/main/java/org/orcid/core/web/filters/CrossDomainWebManger.java
@@ -58,9 +58,11 @@ public boolean allowed(HttpServletRequest request) throws URISyntaxException {
     public boolean validateDomain(String url) throws URISyntaxException {
         URI uri = new URI(url);
         String domain = uri.getHost();
-        for (String allowedDomain : getAllowedDomainsRegex()) {
-            if (domain.matches(allowedDomain)) {
-                return true;
+        if(domain != null) {
+            for (String allowedDomain : getAllowedDomainsRegex()) {
+                if (domain.matches(allowedDomain)) {
+                    return true;
+                }
             }
         }
         return false;

diff --git a/orcid-core/src/test/java/org/orcid/core/web/filters/CrossDomainWebMangerTest.java b/orcid-core/src/test/java/org/orcid/core/web/filters/CrossDomainWebMangerTest.java
@@ -26,7 +26,7 @@ public class CrossDomainWebMangerTest {
     CrossDomainWebManger crossDomainWebManger;
 
     String [] allowedDomains = {"http://localhost", "https://localhost"};
-    String [] forbiddenDomains = {"http://.orcid.org", "http://www.otherorcid.org", "http://www.myorcid.org", "http://www.ihateorcid.org", "http://qa.ihateorcid.org", "https://.orcid.org", "https://www.otherorcid.org", "https://www.myorcid.org", "https://www.ihateorcid.org", "https://qa.ihateorcid.org"};
+    String [] forbiddenDomains = {"http://.orcid.org", "http://www.otherorcid.org", "http://www.myorcid.org", "http://www.testorcid.org", "http://qa.testorcid.org", "https://.orcid.org", "https://www.otherorcid.org", "https://www.myorcid.org", "https://www.testorcid.org", "https://qa.testorcid.org"};
 
     String [] allowedPaths = {"/lang.json","/userStatus.json","/oauth/userinfo","/oauth/jwks","/.well-known/openid-configuration"};
     String [] forbiddenPaths = {"/oauth","/whatever/oauth","/whatever/oauth/","/whatever/oauth/other",
@@ -54,9 +54,4 @@ public void testPaths() throws URISyntaxException {
             assertFalse("Testing: " + forbidden, crossDomainWebManger.validatePath(forbidden));
         }
     }
-
-    @Test
-    public void failTest() {
-        fail();
-    }
 }