particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages(kickstart): add validation for the hostname

Browse source 
The hostname is validated according to the rules of `hostname(7)`
and tests are added to validate them.
This commit is contained in:
Michael Vogt 2023-11-21 09:39:13 +01:00 • committed by Simon de Vlieger
parent 2116803e32
commit 3b7471ab7c
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stages/org.osbuild.kickstart
View file

@ -77,7 +77,8 @@ SCHEMA = r"""
},
"hostname": {
"description": "Host name for the installed system",
"type": "string"
"type": "string",
"pattern": "(?=^.{1,253}$)^[a-zA-Z0-9][a-zA-Z0-9-]{0,62}((\\.[a-zA-Z0-9][a-zA-Z0-9-]{0,62})+)?$"
},
"essid": {
"description": "The network ID for wireless networks",

20
stages/test/test_kickstart.py
View file

@ -185,6 +185,12 @@ TEST_INPUT = [
({"network": [{"device": "01:23:45:67:89:ab"}]}, "network --device=01:23:45:67:89:ab"),
({"network": [{"device": "link"}]}, "network --device=link"),
({"network": [{"device": "bootif"}]}, "network --device=bootif"),
# hostname alone can be 63 chars (see hostname(7))
({"network": [{"device": "foo", "hostname": "123456789012345678901234567890123456789012345678901234567890123"}]},
"network --device=foo --hostname=123456789012345678901234567890123456789012345678901234567890123"),
# hostname can also be written as a QFDN
({"network": [{"device": "foo", "hostname": "foo.bar.com"}]},
"network --device=foo --hostname=foo.bar.com"),
]
@ -298,6 +304,20 @@ def test_kickstart_valid(tmp_path, test_input, expected): # pylint: disable=unu
({"network": [{"device": "00:XX"}]}, " does not match "),
({"network": [{"device": "foo/bar"}]}, " does not match "),
({"network": [{"device": "foo?"}]}, " does not match "),
# see hostname(7)
({"network": [{"device": "foo",
"hostname": "1234567890123456789012345678901234567890123456789012345678901234"}]}, " does not match "),
({"network": [{"device": "foo", "hostname": "x$"}]}, " does not match "),
({"network": [{"device": "foo", "hostname": "-invalid"}]}, " does not match "),
({"network": [{"device": "foo", "hostname": "foo..bar"}]}, " does not match "),
# not more than 253 chars (63*3 + 62 + 3 dots = 254)
({"network": [{"device": "foo",
"hostname":
"123456789012345678901234567890123456789012345678901234567890123" +
".123456789012345678901234567890123456789012345678901234567890123" +
".123456789012345678901234567890123456789012345678901234567890123" +
".12345678901234567890123456789012345678901234567890123456789012"
}]}, " does not match "),
],
)
def test_schema_validation_bad_apples(test_data, expected_err):