mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-24 11:21:25 -07:00
Be stricter about parsing hostname labels
Labels must start with an alphanumeric character, may contain alphanumeric characters or hyphens, but must not end with a hyphen. We enforce those rules, but allow underscores wherever hyphens are accepted, and allow alphanumeric ranges anywhere. We relax the definition of "alphanumeric" to include Unicode characters even though such inventory hostnames cannot be used in practice unless an ansible_ssh_host is set for each of them. We still don't enforce length restrictions—the fact that we have to accept ranges makes it more complex, and it doesn't seem especially worthwhile.
This commit is contained in:
parent
065bb52109
commit
7479ab47e0
2 changed files with 28 additions and 7 deletions
|
@ -1,3 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import unittest
|
||||
|
||||
from ansible.parsing.utils.addresses import parse_address
|
||||
|
@ -21,12 +23,19 @@ class TestParseAddress(unittest.TestCase):
|
|||
'some-host:80': ['some-host', 80],
|
||||
'some.host.com:492': ['some.host.com', 492],
|
||||
'[some.host.com]:493': ['some.host.com', 493],
|
||||
'a-b.3foo_bar.com:23': ['a-b.3foo_bar.com', 23],
|
||||
u'fóöbär': [u'fóöbär', None],
|
||||
u'fóöbär:32': [u'fóöbär', 32],
|
||||
u'fóöbär.éxàmplê.com:632': [u'fóöbär.éxàmplê.com', 632],
|
||||
|
||||
# Various errors
|
||||
'': [None, None],
|
||||
'some..host': [None, None],
|
||||
'some.': [None, None],
|
||||
'[example.com]': [None, None],
|
||||
'some-': [None, None],
|
||||
'some-.foo.com': [None, None],
|
||||
'some.-foo.com': [None, None],
|
||||
}
|
||||
|
||||
range_tests = {
|
||||
|
@ -34,7 +43,11 @@ class TestParseAddress(unittest.TestCase):
|
|||
'192.0.2.[3:10]:23': ['192.0.2.[3:10]', 23],
|
||||
'abcd:ef98::7654:[1:9]': ['abcd:ef98::7654:[1:9]', None],
|
||||
'[abcd:ef98::7654:[6:32]]:2222': ['abcd:ef98::7654:[6:32]', 2222],
|
||||
u'fóöb[a:c]r.éxàmplê.com:632': [u'fóöb[a:c]r.éxàmplê.com', 632],
|
||||
'[a:b]foo.com': ['[a:b]foo.com', None],
|
||||
'foo[a:b].com': ['foo[a:b].com', None],
|
||||
'foo[a:b]:42': ['foo[a:b]', 42],
|
||||
'foo[a-b]-.com': [None, None],
|
||||
'foo[a-b]:32': [None, None],
|
||||
'foo[x-y]': [None, None],
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue