[Ovirt-devel] [PATCH] update valid_hostname regex checks

[Joey Boggs]

rhbz#720956

Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
 scripts/ovirt-config-setup.py |   22 +++++++++++++---------
 scripts/ovirtfunctions.py     |   10 +++++++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py
index 8c6c8af..a8f85cf 100755
--- a/scripts/ovirt-config-setup.py
+++ b/scripts/ovirt-config-setup.py
@@ -274,8 +274,8 @@ class NodeConfigScreen():
           warn = 0
           if not self.ntp_host2.value() is None and not self.ntp_host2.value() == "":
               if not is_valid_ipv4(self.ntp_host2.value()):
-                   if not is_valid_ipv6(self.ntp_host1.value()):
-                       if not is_valid_hostname(self.ntp_host1.value()):
+                   if not is_valid_ipv6(self.ntp_host2.value()):
+                       if not is_valid_hostname(self.ntp_host2.value()):
                            warn = 1
           if warn == 1:
               self.screen.setColor("BUTTON", "black", "red")
@@ -506,11 +506,12 @@ class NodeConfigScreen():
               self.reset_screen_colors()
 
       def valid_hostname_callback(self):
-          if not is_valid_hostname(self.net_hostname.value()):
-              self.screen.setColor("BUTTON", "black", "red")
-              self.screen.setColor("ACTBUTTON", "blue", "white")
-              ButtonChoiceWindow(self.screen, "Configuration Check", "Invalid Hostname", buttons = ['Ok'])
-              self.reset_screen_colors()
+          if not self.net_hostname.value() == "":
+              if not is_valid_hostname(self.net_hostname.value()):
+                  self.screen.setColor("BUTTON", "black", "red")
+                  self.screen.setColor("ACTBUTTON", "blue", "white")
+                  ButtonChoiceWindow(self.screen, "Configuration Check", "Invalid Hostname", buttons = ['Ok'])
+                  self.reset_screen_colors()
 
       def valid_fqdn_or_ipv4(self):
           warn = 0
@@ -1143,10 +1144,13 @@ class NodeConfigScreen():
           self.menuo = self.menu_list.current()
 
       def process_network_config(self):
-          if self.net_hostname.value() != self.current_hostname and is_valid_hostname(self.net_hostname.value()):
+          if self.net_hostname.value() == "":
+              augtool("set", "/files/etc/sysconfig/network/HOSTNAME", "")
+              os.system("hostname \"" + self.net_hostname.value()+"\"")
+          elif self.net_hostname.value() != self.current_hostname and is_valid_hostname(self.net_hostname.value()):
               augtool("set", "/files/etc/sysconfig/network/HOSTNAME", self.net_hostname.value())
               os.system("hostname " + self.net_hostname.value())
-              ovirt_store_config("/etc/sysconfig/network")
+          ovirt_store_config("/etc/sysconfig/network")
           dns_servers = ""
           ntp_servers = ""
           if not self.dns_host1.value() == "":
diff --git a/scripts/ovirtfunctions.py b/scripts/ovirtfunctions.py
index ae454e5..2d6fac4 100644
--- a/scripts/ovirtfunctions.py
+++ b/scripts/ovirtfunctions.py
@@ -781,11 +781,15 @@ def is_valid_ipv6(ip_address):
         return False
 
 def is_valid_hostname(hostname):
-    regex = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
-    if re.match(regex, hostname):
+    regex_1 = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])\.)+([a-zA-Z0-9]{2,5})"
+    regex_2 = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
+    if re.match(regex_1, hostname):
         return True
     else:
-        return False
+        if re.match(regex_2, hostname):
+            return True
+        else:
+            return False
 
 def is_valid_nfs(nfs_entry):
     regex = "^([a-zA-Z0-9_\-]+)([\.][a-zA-Z0-9_\-]+)+([:][/][a-zA-Z0-9\~\(\)_\-]*)+([\.][a-zA-Z0-9\(\)_\-]+)*"
-- 
1.7.5.4