diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-28 10:00:33 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-28 10:01:59 +0100 |
| commit | 350180a60b9d80b189db51d8e643c9798192a812 (patch) | |
| tree | 9c08943aaf33e2cdae082a6aaf8e03ea04bbe191 | |
| parent | 3e4ac30427fe2af7a304f7e73eb9ecdb27b1ae99 (diff) | |
| download | vyos-1x-350180a60b9d80b189db51d8e643c9798192a812.tar.gz vyos-1x-350180a60b9d80b189db51d8e643c9798192a812.zip | |
validators: fqdn: T3370: support "private" or "local" domain names
(cherry picked from commit 04724ed189553ce43f8504f68fef8024ef5796de)
| -rw-r--r-- | interface-definitions/dns-domain-name.xml.in | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dhcp-server.py | 1 | ||||
| -rwxr-xr-x | src/validators/fqdn | 7 |
3 files changed, 4 insertions, 6 deletions
diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index 3b5843b53..ff632e1d1 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -44,7 +44,7 @@ <properties> <help>System domain name</help> <constraint> - <regex>[A-Za-z0-9][-.A-Za-z0-9]*</regex> + <validator name="fqdn"/> </constraint> </properties> </leafNode> diff --git a/smoketest/scripts/cli/test_service_dhcp-server.py b/smoketest/scripts/cli/test_service_dhcp-server.py index db7b2dda4..e74e22a5c 100755 --- a/smoketest/scripts/cli/test_service_dhcp-server.py +++ b/smoketest/scripts/cli/test_service_dhcp-server.py @@ -200,6 +200,7 @@ class TestServiceDHCPServer(unittest.TestCase): def test_dhcp_single_pool_static_mapping(self): shared_net_name = 'SMOKE-2' + domain_name = 'private' pool = base_path + ['shared-network-name', shared_net_name, 'subnet', subnet] # we use the first subnet IP address as default gateway diff --git a/src/validators/fqdn b/src/validators/fqdn index 347ffda42..a4027e4ca 100755 --- a/src/validators/fqdn +++ b/src/validators/fqdn @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2020 VyOS maintainers and contributors +# Copyright (C) 2020-2021 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -17,10 +17,7 @@ import re import sys - -# pattern copied from: https://www.regextester.com/103452 -pattern = "(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9]\.)+[a-zA-Z]{2,63}$)" - +pattern = '[A-Za-z0-9][-.A-Za-z0-9]*' if __name__ == '__main__': if len(sys.argv) != 2: |