docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

relax PORT_SPEC regex so it accept and ignore square brackets 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-03-04 11:37:07 +01:00 committed by Nicolas De loof
parent 55f405e04a
commit 563124163a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/utils/ports.py
View File

@ -3,7 +3,7 @@ import re
PORT_SPEC = re.compile( PORT_SPEC = re.compile(
"^" # Match full string "^" # Match full string
"(" # External part "(" # External part
r"((?P<host>[a-fA-F\d.:]+):)?" # Address r"(\[?(?P<host>[a-fA-F\d.:]+)\]?:)?" # Address
r"(?P<ext>[\d]*)(-(?P<ext_end>[\d]+))?:" # External range r"(?P<ext>[\d]*)(-(?P<ext_end>[\d]+))?:" # External range
")?" ")?"
r"(?P<int>[\d]+)(-(?P<int_end>[\d]+))?" # Internal range r"(?P<int>[\d]+)(-(?P<int_end>[\d]+))?" # Internal range

6
tests/unit/utils_test.py
View File

@ -541,6 +541,12 @@ class PortsTest(unittest.TestCase):
assert internal_port == ["2000"] assert internal_port == ["2000"]
assert external_port == [("2001:abcd:ef00::2", "1000")] assert external_port == [("2001:abcd:ef00::2", "1000")]
def test_split_port_with_ipv6_square_brackets_address(self):
internal_port, external_port = split_port(
"[2001:abcd:ef00::2]:1000:2000")
assert internal_port == ["2000"]
assert external_port == [("2001:abcd:ef00::2", "1000")]
def test_split_port_invalid(self): def test_split_port_invalid(self):
with pytest.raises(ValueError): with pytest.raises(ValueError):
split_port("0.0.0.0:1000:2000:tcp") split_port("0.0.0.0:1000:2000:tcp")