feature #2800 CORS: support moz-extension (#2804) (#2810)

Co-authored-by: takeseem <takeseem@users.noreply.github.com>

Author: tsegismont

vertx-web/src/main/java/io/vertx/ext/web/impl/Origin.java

@@ -83,6 +83,7 @@ private Origin(String protocol, String host, String port, String resource) {
         defaultPort = DEFAULT_HTTPS_PORT;
         break;
       case "chrome-extension":
+      case "moz-extension":
         this.protocol = protocol;
         defaultPort = "-1";
         break;
@@ -96,6 +97,10 @@ private Origin(String protocol, String host, String port, String resource) {
       if (!isValidChromeExtensionId(host, 0)) {
         throw new IllegalStateException("Illegal Chrome Extension id: " + host);
       }
+    } else if ("moz-extension".equals(protocol)) {
+      if (!isValidMozExtensionId(host, 0)) {
+        throw new IllegalStateException("Illegal Moz Extension id: " + host);
+      }
     } else {
       // hosts are either domain names, dot separated or ipv6 like
       // https://tools.ietf.org/html/rfc1123
@@ -230,6 +235,8 @@ public static boolean isValid(String text) {
           break;
         case "chrome-extension":
           return isValidChromeExtensionId(text, sep0 + 3);
+        case "moz-extension":
+          return isValidMozExtensionId(text, sep0 + 3);
         default:
           return false;
       }
@@ -282,6 +289,19 @@ private static boolean isValidChromeExtensionId(String text, int offset) {
     return valid;
   }
 
+  private static boolean isValidMozExtensionId(String text, int offset) {
+    boolean valid = text.length() - offset == 36;
+    for (int i = offset, pos = 0; valid && i < text.length(); i++, pos++) {
+      char c = text.charAt(i);
+      if (pos == 8 || pos == 13 || pos == 18 || pos == 23) {
+        valid = c == '-';
+      } else {
+        valid = (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z');
+      }
+    }
+    return valid;
+  }
+
   private static boolean check(String host, String port) {
     if (host == null) {
       return false;

vertx-web/src/test/java/io/vertx/ext/web/tests/handler/CORSHandlerTest.java

@@ -25,10 +25,7 @@
 import io.vertx.ext.web.tests.WebTestBase;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -747,4 +744,12 @@ public void testAcceptChromeExtensionOrigin() throws Exception {
     router.route().handler(context -> context.response().end());
     testRequest(HttpMethod.GET, "/", req -> req.headers().add("origin", "chrome-extension://gmbgaklkmjakoegficnlkhebmhkjfich"), resp -> checkHeaders(resp, "*", null, null, null), 200, "OK", null);
   }
+
+  @Test
+  public void testAcceptMozExtensionOrigin() throws Exception {
+    router.route().handler(CorsHandler.create().addOriginWithRegex("moz-extension://.*"));
+    router.route().handler(context -> context.response().end());
+    String origin = "moz-extension://" + UUID.randomUUID();
+    testRequest(HttpMethod.GET, "/", req -> req.headers().add("origin", origin), resp -> checkHeaders(resp, origin, null, null, null), 200, "OK", null);
+  }
 }

vertx-web/src/test/java/io/vertx/ext/web/tests/impl/OriginTests.java

@@ -8,6 +8,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 import java.util.Arrays;
+import java.util.UUID;
 
 import static org.junit.Assert.*;
 
@@ -25,7 +26,8 @@ public static Iterable<Object[]> data() {
         {"http://[::1]"},
         {"http://my-site.com"},
         {"http://my-site.123.com"},
-        {"chrome-extension://gmbgaklkmjakoegficnlkhebmhkjfich"}
+        {"chrome-extension://gmbgaklkmjakoegficnlkhebmhkjfich"},
+        {"moz-extension://" + UUID.randomUUID()}
       });
     }
 
@@ -55,6 +57,8 @@ public static Iterable<Object[]> data() {
         {"http://1[::1]:8080"},
         {"chrome-extension://gmbg0klkmjakoegficnlkhebmhkjfich"},
         {"chrome-extension://gmbgaklkmjako"},
+        {"moz-extension://" + UUID.randomUUID().toString().replace('-', 'z')},
+        {"moz-extension://" + UUID.randomUUID().toString().substring(1)},
       });
     }