Merge branch 'main' of github.com:web-push-libs/vapid into main

Author: jrconlin

python/py_vapid/__init__.py

@@ -352,7 +352,7 @@ def verify(cls, auth):
 
 def _check_sub(sub):
     pattern =(
-        r"^(mailto:.+@((localhost|[%\w]+(\.[%\w]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|\w+\.[\w\.]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$"
+        r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$"
         )
     return re.match(pattern, sub, re.IGNORECASE) is not None
 

python/py_vapid/main.py

@@ -31,7 +31,7 @@ def main():
                         default=False, action="store_true")
     parser.add_argument('--json',  help="dump as json",
                         default=False, action="store_true")
-    parser.add_argumet('--no-strict', help='Do not be strict about "sub"',
+    parser.add_argument('--no-strict', help='Do not be strict about "sub"',
                         default=False, action="store_true")
     parser.add_argument('--applicationServerKey',
                         help="show applicationServerKey value",

python/py_vapid/tests/test_vapid.py

@@ -260,7 +260,9 @@ def test_sub(self):
             'mailto:me@1234::',
             'mailto:me@1234::5678',
             'mailto:admin@example.org',
+            'mailto:admin-test-case@example-test-case.test.org',
             'https://localhost',
+            'https://exmample-test-case.test.org',
             'https://8001::',
             'https://8001:1000:0001',
             'https://1.2.3.4'
@@ -277,4 +279,4 @@ def test_sub(self):
         for val in valid:
             assert _check_sub(val) is True
         for val in invalid:
-            assert _check_sub(val) is False
+            assert _check_sub(val) is False