fix: wildcard in allowNavigation (#3833)

ionic-team · Nov 20, 2020 · de1eac8 · de1eac8
1 parent 4f9789d
commit de1eac8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/util/HostMask.java b/android/capacitor/src/main/java/com/getcapacitor/util/HostMask.java
@@ -48,7 +48,7 @@ public boolean matches(String host) {
             List<String> hostParts = Util.splitAndReverse(host);
             int hostSize = hostParts.size();
             int maskSize = maskParts.size();
-            if(hostSize != maskSize) {
+            if(maskSize > 1 && hostSize != maskSize) {
                 return false;
             }
 

diff --git a/android/capacitor/src/test/java/com/getcapacitor/util/HostMaskTest.java b/android/capacitor/src/test/java/com/getcapacitor/util/HostMaskTest.java
@@ -17,8 +17,8 @@ public void testParser() {
 
     @Test
     public void testAny() {
-        HostMask mask = HostMask.Any.parse("*", "*.example.org", "example.org");
-        assertTrue(mask.matches("org"));
+        HostMask mask = HostMask.Any.parse("*.example.org", "example.org");
+        assertFalse(mask.matches("org"));
         assertTrue(mask.matches("example.org"));
         assertTrue(mask.matches("www.example.org"));
         assertFalse(mask.matches("imap.mail.example.org"));
@@ -27,6 +27,17 @@ public void testAny() {
         assertFalse(mask.matches(null));
     }
 
+    @Test
+    public void testAnyWildcard() {
+        HostMask mask = HostMask.Any.parse("*");
+        assertTrue(mask.matches("org"));
+        assertTrue(mask.matches("example.org"));
+        assertTrue(mask.matches("www.example.org"));
+        assertTrue(mask.matches("imap.mail.example.org"));
+        assertTrue(mask.matches("another.org"));
+        assertTrue(mask.matches("www.another.org"));
+        assertFalse(mask.matches(null));
+    }
 
     @Test
     public void testSimple() {
@@ -46,7 +57,7 @@ public void testSimpleExample1() {
     @Test
     public void testSimpleExample2() {
         HostMask mask = HostMask.Simple.parse("*");
-        assertFalse("Single star does not match with 2nd level domain", mask.matches("example.org"));
+        assertTrue("Single star matches everything", mask.matches("example.org"));
     }
 
     @Test

diff --git a/ios/Capacitor/Capacitor/CAPBridgeViewController.swift b/ios/Capacitor/Capacitor/CAPBridgeViewController.swift
@@ -424,6 +424,10 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr
   }
 
   func matchHost(host: String, pattern: String) -> Bool {
+    if pattern == "*" {
+      return true
+    }
+
     var host = host.split(separator: ".")
     var pattern = pattern.split(separator: ".")