From d0e39f690f73135a2d7075a445719a20e8cf017c Mon Sep 17 00:00:00 2001 From: "Juan B. Rodriguez" Date: Sat, 3 Mar 2018 11:53:07 -0500 Subject: Add host-name interface definition --- interface-definitions/host-name.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 interface-definitions/host-name.xml diff --git a/interface-definitions/host-name.xml b/interface-definitions/host-name.xml new file mode 100644 index 000000000..3d9c9d6c9 --- /dev/null +++ b/interface-definitions/host-name.xml @@ -0,0 +1,22 @@ + + + + + + + + + + Hostname settings + + + + + server's hostname + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 04b6669a1048813b863c4405d8e1679e1282527d Mon Sep 17 00:00:00 2001 From: "Juan B. Rodriguez" Date: Sat, 3 Mar 2018 12:01:48 -0500 Subject: Set proper help text --- interface-definitions/host-name.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface-definitions/host-name.xml b/interface-definitions/host-name.xml index 3d9c9d6c9..1452a956a 100644 --- a/interface-definitions/host-name.xml +++ b/interface-definitions/host-name.xml @@ -7,12 +7,12 @@ - Hostname settings + System host name (default: vyos) - server's hostname + System host name (default: vyos) -- cgit v1.2.3 From e309f63b8404f32336333f995e0526dc68638a7c Mon Sep 17 00:00:00 2001 From: "Juan B. Rodriguez" Date: Sat, 3 Mar 2018 14:27:11 -0500 Subject: Add system host-name script --- src/conf-mode/vyos-config-host-name.py | 87 ++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 src/conf-mode/vyos-config-host-name.py diff --git a/src/conf-mode/vyos-config-host-name.py b/src/conf-mode/vyos-config-host-name.py new file mode 100644 index 000000000..a0e70b8ea --- /dev/null +++ b/src/conf-mode/vyos-config-host-name.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2018 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 +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# + +import os +import re +import sys + +from vyos.config import Config +from vyos.util import ConfigError + +hostname_config = "/etc/hostname" +mailname_config = "/etc/mailname" + +def get_config(): + conf = Config() + conf.set_level("system") + + hostname = conf.return_value("host-name") + domain = conf.return_value("domain-name") + + return { + "hostname": hostname, + "domain": domain + } + +def verify(config): + # check for invalid host + + # pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$" ; "invalid host name $VAR(@)" + # TODO + + # pattern $VAR(@) "^.{1,63}$" ; "invalid host-name length" + length = len(config.hostname) + if length < 1 or length > 63: + raise ConfigError('invalid host-name length') + + return None + + +def generate(config): + mailname = config.hostname + if config.domain != "": + mailname += '.' + config.domain + + # update /etc/hostname + with open(hostname_config, 'w') as f: + f.write(config.hostname) + + # update /etc/mailname + with open(mailname_config, 'w') as f: + f.write(mailname) + + return None + + +def apply(config): + # set hostname for the current session + cmd = "hostname " + config.hostname + os.system(cmd) + + return None + + +if __name__ == '__main__': + try: + c = get_config() + verify(c) + generate(c) + apply(c) + except ConfigError as e: + print(e) + sys.exit(1) -- cgit v1.2.3 From 3e3c18c8120bdd41793aefa0f6added6f46b5522 Mon Sep 17 00:00:00 2001 From: "Juan B. Rodriguez" Date: Sun, 15 Apr 2018 14:01:06 -0500 Subject: Implement regex to check for hostname syntax --- src/conf-mode/vyos-config-host-name.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf-mode/vyos-config-host-name.py b/src/conf-mode/vyos-config-host-name.py index a0e70b8ea..da053d9f6 100644 --- a/src/conf-mode/vyos-config-host-name.py +++ b/src/conf-mode/vyos-config-host-name.py @@ -25,6 +25,7 @@ from vyos.util import ConfigError hostname_config = "/etc/hostname" mailname_config = "/etc/mailname" +hostname_regex = re.compile("^[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$") def get_config(): conf = Config() @@ -42,7 +43,9 @@ def verify(config): # check for invalid host # pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$" ; "invalid host name $VAR(@)" - # TODO + valid = hostname_regex.match(config.hostname) + if (!valid): + raise ConfigError('invalid host name' + config.hostname) # pattern $VAR(@) "^.{1,63}$" ; "invalid host-name length" length = len(config.hostname) -- cgit v1.2.3