Merge pull request #719 from willson-chen/fix_hostname_bug

fix bug about hostname by import fqdn

Author: Julian

.github/workflows/ci.yml

@@ -18,11 +18,17 @@ jobs:
         os: [macos-latest, ubuntu-latest, windows-latest]
         python-version:
           - name: pypy3
-            toxenv: pypy3-build
+            toxenv: pypy3-noextra-build
           - name: pypy3
-            toxenv: pypy3-tests
+            toxenv: pypy3-noextra-tests
           - name: pypy3
-            toxenv: pypy3-tests_nongpl
+            toxenv: pypy3-format-build
+          - name: pypy3
+            toxenv: pypy3-format-tests
+          - name: pypy3
+            toxenv: pypy3-format_nongpl-build
+          - name: pypy3
+            toxenv: pypy3-format_nongpl-tests
           - name: pypy3
             toxenv: demo
           - name: pypy3
@@ -44,36 +50,66 @@ jobs:
           - name: pypy3
             toxenv: docs-style
           - name: 3.6
-            toxenv: py36-build
+            toxenv: py36-noextra-build
+          - name: 3.6
+            toxenv: py36-noextra-tests
+          - name: 3.6
+            toxenv: py36-format-build
+          - name: 3.6
+            toxenv: py36-format-tests
           - name: 3.6
-            toxenv: py36-tests
+            toxenv: py36-format_nongpl-build
           - name: 3.6
-            toxenv: py36-tests_nongpl
+            toxenv: py36-format_nongpl-tests
           - name: 3.7
-            toxenv: py37-build
+            toxenv: py37-noextra-build
           - name: 3.7
-            toxenv: py37-tests
+            toxenv: py37-noextra-tests
           - name: 3.7
-            toxenv: py37-tests_nongpl
+            toxenv: py37-format-build
+          - name: 3.7
+            toxenv: py37-format-tests
+          - name: 3.7
+            toxenv: py37-format_nongpl-build
+          - name: 3.7
+            toxenv: py37-format_nongpl-tests
+          - name: 3.8
+            toxenv: py38-noextra-build
+          - name: 3.8
+            toxenv: py38-noextra-tests
           - name: 3.8
-            toxenv: py38-build
+            toxenv: py38-format-build
           - name: 3.8
-            toxenv: py38-tests
+            toxenv: py38-format-tests
           - name: 3.8
-            toxenv: py38-tests_nongpl
+            toxenv: py38-format_nongpl-build
+          - name: 3.8
+            toxenv: py38-format_nongpl-tests
         exclude:
           - os: windows-latest
             python-version:
               name: pypy3
-              toxenv: pypy3-build
+              toxenv: pypy3-noextra-build
+          - os: windows-latest
+            python-version:
+              name: pypy3
+              toxenv: pypy3-format-build
+          - os: windows-latest
+            python-version:
+              name: pypy3
+              toxenv: pypy3-format_nongpl-build
+          - os: windows-latest
+            python-version:
+              name: pypy3
+              toxenv: pypy3-noextra-tests
           - os: windows-latest
             python-version:
               name: pypy3
-              toxenv: pypy3-tests
+              toxenv: pypy3-format-tests
           - os: windows-latest
             python-version:
               name: pypy3
-              toxenv: pypy3-tests_nongpl
+              toxenv: pypy3-format_nongpl-tests
           - os: windows-latest
             python-version:
               name: pypy3
@@ -89,23 +125,51 @@ jobs:
           - os: windows-latest
             python-version:
               name: 3.6
-              toxenv: py36-tests
+              toxenv: py36-noextra-build
           - os: windows-latest
             python-version:
               name: 3.6
-              toxenv: py36-tests_nongpl
+              toxenv: py36-format-build
           - os: windows-latest
             python-version:
               name: 3.6
-              toxenv: py36-build
+              toxenv: py36-format_nongpl-build
+          - os: windows-latest
+            python-version:
+              name: 3.6
+              toxenv: py36-noextra-tests
+          - os: windows-latest
+            python-version:
+              name: 3.6
+              toxenv: py36-format-tests
+          - os: windows-latest
+            python-version:
+              name: 3.6
+              toxenv: py36-format_nongpl-tests
           - os: windows-latest
             python-version:
               name: 3.7
-              toxenv: py37-build
+              toxenv: py37-noextra-tests
+          - os: windows-latest
+            python-version:
+              name: 3.7
+              toxenv: py37-format-tests
+          - os: windows-latest
+            python-version:
+              name: 3.7
+              toxenv: py37-format_nongpl-tests
+          - os: windows-latest
+            python-version:
+              name: 3.8
+              toxenv: py38-noextra-tests
+          - os: windows-latest
+            python-version:
+              name: 3.8
+              toxenv: py38-format-tests
           - os: windows-latest
             python-version:
               name: 3.8
-              toxenv: py38-build
+              toxenv: py38-format_nongpl-tests
           - os: windows-latest
             python-version:
               name: pypy3

docs/validate.rst

@@ -277,15 +277,15 @@ validation can be enabled by hooking in a format-checking object into an
 
 .. doctest::
 
-    >>> validate("localhost", {"format" : "hostname"})
+    >>> validate("127.0.0.1", {"format" : "ipv4"})
     >>> validate(
     ...     instance="-12",
-    ...     schema={"format" : "hostname"},
+    ...     schema={"format" : "ipv4"},
     ...     format_checker=draft7_format_checker,
     ... )
     Traceback (most recent call last):
         ...
-    ValidationError: "-12" is not a "hostname"
+    ValidationError: "-12" is not a "ipv4"
 
 .. autoclass:: FormatChecker
     :members:

jsonschema/_format.py

@@ -209,25 +209,21 @@ def is_ipv6(instance):
         return socket.inet_pton(socket.AF_INET6, instance)
 
 
-_host_name_re = re.compile(r"^[A-Za-z0-9][A-Za-z0-9\.\-]{1,255}$")
-
-
-@_checks_drafts(
-    draft3="host-name",
-    draft4="hostname",
-    draft6="hostname",
-    draft7="hostname",
-)
-def is_host_name(instance):
-    if not isinstance(instance, str):
-        return True
-    if not _host_name_re.match(instance):
-        return False
-    components = instance.split(".")
-    for component in components:
-        if len(component) > 63:
-            return False
-    return True
+try:
+    from fqdn import FQDN
+except ImportError:
+    pass
+else:
+    @_checks_drafts(
+        draft3="host-name",
+        draft4="hostname",
+        draft6="hostname",
+        draft7="hostname",
+    )
+    def is_host_name(instance):
+        if not isinstance(instance, str):
+            return True
+        return FQDN(instance).is_valid
 
 
 try:

jsonschema/tests/test_jsonschema_test_suite.py

@@ -105,11 +105,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="date-time",
             description="case-insensitive T and Z",
         )(test)
-        or skip(
-            message=bug(),
-            subject="host-name",
-            description="ends with hyphen",
-        )(test)
         or skip(
             message=bug(686),
             subject="uniqueItems",
@@ -180,11 +175,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="date-time",
             description="case-insensitive T and Z",
         )(test)
-        or skip(
-            message=bug(),
-            subject="hostname",
-            description="ends with hyphen",
-        )(test)
         or skip(
             message=bug(686),
             subject="uniqueItems",
@@ -254,11 +244,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="date-time",
             description="case-insensitive T and Z",
         )(test)
-        or skip(
-            message=bug(),
-            subject="hostname",
-            description="ends with hyphen",
-        )(test)
         or skip(
             message=bug(686),
             subject="uniqueItems",
@@ -329,11 +314,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="date-time",
             description="case-insensitive T and Z",
         )(test)
-        or skip(
-            message=bug(),
-            subject="hostname",
-            description="ends with hyphen",
-        )(test)
         or skip(
             message=bug(593),
             subject="content",

setup.cfg

@@ -32,12 +32,14 @@ install_requires =
 
 [options.extras_require]
 format =
+    fqdn
     idna
     jsonpointer>1.13
     rfc3987
     strict-rfc3339
     webcolors
 format_nongpl =
+    fqdn
     idna
     jsonpointer>1.13
     webcolors

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,37,38,py3}-{build,tests,tests_nongpl},
+    py{36,37,38,py3}-{noextra,format,format_nongpl}-{build,tests},
     demo
     readme
     safety
@@ -16,10 +16,11 @@ setenv =
 whitelist_externals =
     mkdir
 commands =
-    perf,tests: {envpython} -m pip install '{toxinidir}[format]'
-    tests_nongpl: {envpython} -m pip install '{toxinidir}[format_nongpl]'
+    noextra: {envpython} -m pip install {toxinidir}
+    format: {envpython} -m pip install '{toxinidir}[format]'
+    format_nongpl: {envpython} -m pip install '{toxinidir}[format_nongpl]'
 
-    tests,tests_nongpl: {envpython} -m twisted.trial {posargs:jsonschema}
+    tests: {envpython} -m twisted.trial {posargs:jsonschema}
     tests: {envpython} -m doctest {toxinidir}/README.rst
 
     perf: mkdir {envtmpdir}/benchmarks/
@@ -33,7 +34,7 @@ deps =
 
     perf: pyperf
 
-    tests,tests_nongpl,coverage,codecov: twisted
+    tests,coverage,codecov: twisted
 
     coverage,codecov: coverage
     codecov: codecov