CA-369899: Add NTP options DHCP|Default|Manual|None

XSConsoleAuth.py

@@ -25,6 +25,13 @@
 
 import XenAPI
 
+
+if sys.version_info >= (3, 0):
+    getTimeStamp = time.monotonic
+else:
+    getTimeStamp = time.time
+
+
 class Auth:
     instance = None
 
@@ -68,7 +75,7 @@ def IsTestMode(self):
 
     def AuthAge(self):
         if self.isAuthenticated:
-            retVal = time.time() - self.authTimestampSeconds
+            retVal = getTimeStamp() - self.authTimestampSeconds
         else:
             raise Exception("Cannot get age - not authenticated")
         return retVal
@@ -77,7 +84,7 @@ def KeepAlive(self):
         if self.isAuthenticated:
             if self.AuthAge() <= State.Inst().AuthTimeoutSeconds():
                 # Auth still valid, so update timestamp to now
-                self.authTimestampSeconds = time.time()
+                self.authTimestampSeconds = getTimeStamp()
 
     def LoggedInUsername(self):
         if (self.isAuthenticated):
@@ -126,7 +133,7 @@ def ProcessLogin(self, inUsername, inPassword):
         if self.testingHost is not None:
             # Store password when testing only
             self.loggedInPassword = inPassword
-        self.authTimestampSeconds = time.time()
+        self.authTimestampSeconds = getTimeStamp()
         self.isAuthenticated = True
         XSLog('User authenticated successfully')
 

XSConsoleConstants.py

@@ -0,0 +1,2 @@
+# Default NTP domains are <int>.[centos|xenserver].pool.ntp.org
+DEFAULT_NTP_DOMAINS = [".centos.pool.ntp.org", ".xenserver.pool.ntp.org"]

XSConsoleData.py

@@ -15,7 +15,8 @@
 
 import XenAPI
 import datetime
-import subprocess, re, shutil, sys, tempfile, socket, os
+import time
+import subprocess, re, shutil, sys, tempfile, socket, os, stat
 from pprint import pprint
 from simpleconfig import SimpleConfigFile
 
@@ -486,9 +487,32 @@ def UpdateFromHostname(self):
             self.ScanHostname(output.split("\n"))
 
     def UpdateFromNTPConf(self):
-        (status, output) = getstatusoutput("/bin/cat /etc/chrony.conf")
-        if status == 0:
-            self.ScanNTPConf(output.split("\n"))
+        if not 'ntp' in self.data:
+            self.data['ntp'] = {}
+
+        if os.path.isfile("/etc/chrony.conf"):
+            with open("/etc/chrony.conf", "r") as confFile:
+                self.ScanNTPConf(confFile.read().splitlines())
+
+        self.data['ntp']['method'] = ""
+        chronyPerm = os.stat("/etc/dhcp/dhclient.d/chrony.sh").st_mode
+        if (
+            chronyPerm & stat.S_IXUSR
+            and chronyPerm & stat.S_IXGRP
+            and chronyPerm & stat.S_IXOTH
+        ):
+            self.data['ntp']['method'] = "DHCP"
+        elif self.data['ntp']['servers']:
+            self.data['ntp']['method'] = "Manual"
+
+            servers = self.data['ntp']['servers']
+            if len(servers) == 4 and all(
+                inDefaultNTPDomains(server)
+                for server in self.data['ntp']['servers']
+            ):
+                self.data['ntp']['method'] = "Default"
+        else:
+            self.data['ntp']['method'] = "Disabled"
 
     def StringToBool(self, inString):
         return inString.lower().startswith('true')
@@ -528,17 +552,107 @@ def SaveToNTPConf(self):
         # Double-check authentication
         Auth.Inst().AssertAuthenticated()
 
-        file = None
         try:
-            file = open("/etc/chrony.conf", "w")
-            for other in self.ntp.othercontents([]):
-                file.write(other+"\n")
-            for server in self.ntp.servers([]):
-                file.write("server "+server+" iburst\n")
+            with open("/etc/chrony.conf", "w") as confFile:
+                for other in self.ntp.othercontents([]):
+                    confFile.write(other + "\n")
+                for server in self.ntp.servers([]):
+                    confFile.write("server " + server + " iburst\n")
         finally:
-            if file is not None: file.close()
             self.UpdateFromNTPConf()
 
+        # Force chronyd to update the time
+        if self.data['ntp']['method'] != "Disabled":
+            # Prompt chrony to update the time immediately
+            getoutput("chronyc makestep")
+            # Write the system time (set by the single shot NTP) to the HW clock
+            getoutput("hwclock -w")
+
+    def AddDHCPNTP(self):
+        # Double-check authentication
+        Auth.Inst().AssertAuthenticated()
+
+        oldPermissions = os.stat("/etc/dhcp/dhclient.d/chrony.sh").st_mode
+        newPermissions = oldPermissions | (stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+        os.chmod("/etc/dhcp/dhclient.d/chrony.sh", newPermissions)
+
+        interfaces = self.GetDHClientInterfaces()
+        for interface in interfaces:
+            ntpServer = self.GetDHCPNTPServer(interface)
+
+            with open("/var/lib/dhclient/chrony.servers.%s" % interface, "w") as chronyFile:
+                chronyFile.write("%s iburst prefer\n" % ntpServer)
+
+        # Ensure chrony is enabled
+        self.EnableService("chronyd")
+        self.EnableService("chrony-wait")
+
+    def ResetDefaultNTPServers(self):
+        # Double-check authentication
+        Auth.Inst().AssertAuthenticated()
+
+        Data.Inst().NTPServersSet(
+            ["%d%s" % (i, DEFAULT_NTP_DOMAINS[0]) for i in range(4)]
+        )
+
+    def GetDHClientInterfaces(self):
+        try:
+            leases = [filename for filename in os.listdir("/var/lib/xcp") if "leases" in filename]
+        except OSError:
+            return []
+
+        pattern = "dhclient-(.*).leases"
+        interfaces = []
+        for dhclientFile in leases:
+            match = re.match(pattern, dhclientFile)
+            if match:
+                interfaces.append(match.group(1))
+
+        return interfaces
+
+    def GetDHCPNTPServer(self, interface):
+        expectedLeaseFile = "/var/lib/xcp/dhclient-%s.leases" % interface
+        if not os.path.isfile(expectedLeaseFile):
+            return None
+
+        with open(expectedLeaseFile, "r") as leaseFile:
+            data = leaseFile.read().splitlines()
+
+        ntpServerLines = [line for line in data if "ntp-servers" in line]
+
+        # Extract <ip-addr> from "  option ntp-servers <ip-addr>;"
+        try:
+            ntpServer = ntpServerLines[-1].split()[-1][:-1]
+        except:
+            ntpServer = None
+
+        return ntpServer
+
+    def RemoveDHCPNTP(self):
+        # Double-check authentication
+        Auth.Inst().AssertAuthenticated()
+
+        oldPermissions = os.stat("/etc/dhcp/dhclient.d/chrony.sh").st_mode
+        newPermissions = oldPermissions & ~(stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+        os.chmod("/etc/dhcp/dhclient.d/chrony.sh", newPermissions)
+
+        getstatusoutput("rm -f /var/lib/dhclient/chrony.servers.*")
+
+    def SetTimeManually(self, date):
+        # Double-check authentication
+        Auth.Inst().AssertAuthenticated()
+
+        self.NTPServersSet([])
+        self.RemoveDHCPNTP()
+        self.SaveToNTPConf()
+
+        self.DisableService("chrony-wait")
+        self.DisableService("chronyd")
+
+        timestring = date.strftime("%Y-%m-%d %H:%M:00")
+        getstatusoutput("date --set='%s'" % timestring)
+        getstatusoutput("hwclock --utc --systohc")
+
     def SaveToResolveConf(self):
         # Double-check authentication
         Auth.Inst().AssertAuthenticated()
@@ -724,9 +838,6 @@ def ScanHostname(self, inLines):
         self.data['sysconfig']['network']['hostname'] = inLines[0]
 
     def ScanNTPConf(self, inLines):
-        if not 'ntp' in self.data:
-            self.data['ntp'] = {}
-
         self.data['ntp']['servers'] = []
         self.data['ntp']['othercontents'] = []
 
@@ -953,6 +1064,12 @@ def DisableManagement(self):
             # Network reconfigured so this link is potentially no longer valid
             self.session = Auth.Inst().CloseSession(self.session)
 
+    def AdjustNTPForStaticNetwork(self):
+        self.RemoveDHCPNTP()
+        if not self.data['ntp']['servers']: # No NTP servers after removing DHCP
+            self.ResetDefaultNTPServers()
+            self.SaveToNTPConf()
+
     def LocalHostEnable(self):
         Auth.Inst().AssertAuthenticatedOrPasswordUnset()
         self.RequireSession()
@@ -1131,10 +1248,6 @@ def StopService(self, service):
         if status != 0:
             raise Exception(output)
 
-    def NTPStatus(self):
-        status, output = getstatusoutput("/usr/bin/ntpstat")
-        return output
-
     def SetVerboseBoot(self, inVerbose):
         if inVerbose:
             name = 'noisy'

XSConsoleDialoguePane.py

@@ -190,10 +190,10 @@ def AddStatusField(self, inName, inValue):
         self.AddBodyFieldObj(TextField(str(inName), self.brightColour, Field.FLOW_RIGHT))
         self.AddBodyFieldObj(WrappedTextField(str(inValue), self.baseColour, Field.FLOW_RETURN))
 
-    def AddInputField(self, inName, inValue, inLabel, inLengthLimit = None):
+    def AddInputField(self, inName, inValue, inLabel, inLengthLimit = None, inputWidth=INPUT_FIELD_DEFAULT_WIDTH, flow=Field.FLOW_RETURN):
         self.AddBodyFieldObj(TextField(str(inName), self.brightColour, Field.FLOW_RIGHT))
         self.AddInputFieldObj(InputField(str(inValue), self.highlightColour, self.selectedColour,
-            Field.FLOW_RETURN, inLengthLimit), inLabel)
+            flow, inLengthLimit, width=inputWidth), inLabel)
 
     def AddPasswordField(self, inName, inValue, inLabel, inLengthLimit = None):
         self.AddBodyFieldObj(TextField(str(inName), self.brightColour, Field.FLOW_RIGHT))

XSConsoleFields.py

@@ -44,17 +44,18 @@ def Width(self):
     def Height(self):
         return 1
 
+INPUT_FIELD_DEFAULT_WIDTH = 40  # Declared for use in constructor
 class InputField(Field):
-    MIN_WIDTH = 40 # Minimum width for input fields
+    MIN_WIDTH = 5  # Minimum width for input fields
 
-    def __init__(self, text, colour, selectedColour, flow, lengthLimit):
+    def __init__(self, text, colour, selectedColour, flow, lengthLimit, width=INPUT_FIELD_DEFAULT_WIDTH):
         ParamsToAttr()
         self.activated = False
         self.cursorPos = len(self.text)
         self.hideText = False
         self.selected = True
         self.scrollPos = 0
-        self.width = self.MIN_WIDTH
+        self.UpdateWidth(width)
         if self.lengthLimit is None:
             self.lengthLimit = 4096
 

XSConsoleStandard.py

@@ -18,6 +18,7 @@
 from XSConsoleAuth import *
 from XSConsoleBases import *
 from XSConsoleConfig import *
+from XSConsoleConstants import *
 from XSConsoleData import *
 from XSConsoleDataUtils import *
 from XSConsoleDialogueBases import *

XSConsoleTerm.py

@@ -30,6 +30,13 @@
 from XSConsoleRootDialogue import *
 from XSConsoleState import *
 
+
+if sys.version_info >= (3, 0):
+    getTimeStamp = time.monotonic
+else:
+    getTimeStamp = time.time
+
+
 class App:
     __instance = None
 
@@ -53,9 +60,9 @@ def Build(self, inDirs = None):
             Importer.ImportRelativeDir(dir)
 
     def Enter(self):
-        startTime = time.time()
+        startTime = getTimeStamp()
         Data.Inst().Update()
-        elapsedTime = time.time() - startTime
+        elapsedTime = getTimeStamp() - startTime
         XSLog('Loaded initial xapi and system data in %.3f seconds' % elapsedTime)
 
         doQuit = False
@@ -158,7 +165,7 @@ def NeedsRefresh(self):
     def HandleKeypress(self, inKeypress):
         handled = True
         Auth.Inst().KeepAlive()
-        self.lastWakeSeconds = time.time()
+        self.lastWakeSeconds = getTimeStamp()
         if self.layout.TopDialogue().HandleKey(inKeypress):
             State.Inst().SaveIfRequired()
             self.needsRefresh = True
@@ -180,7 +187,7 @@ def HandleKeypress(self, inKeypress):
 
     def MainLoop(self):
         doQuit= False
-        startSeconds = time.time()
+        startSeconds = getTimeStamp()
         lastDataUpdateSeconds = startSeconds
         lastScreenUpdateSeconds = startSeconds
         lastGarbageCollectSeconds = startSeconds
@@ -193,7 +200,7 @@ def MainLoop(self):
         while not doQuit:
             self.needsRefresh = False
             gotTestCommand = RemoteTest.Inst().Poll()
-            secondsNow = time.time()
+            secondsNow = getTimeStamp()
             try:
                 if gotTestCommand:
                     gotKey = None # Prevent delay whilst waiting for a keypress
@@ -205,7 +212,7 @@ def MainLoop(self):
                     XSLog('Entering sleep due to inactivity - xsconsole is now blocked waiting for a keypress')
                     self.layout.Window(Layout.WIN_MAIN).GetKeyBlocking()
                     XSLog('Exiting sleep')
-                    self.lastWakeSeconds = time.time()
+                    self.lastWakeSeconds = getTimeStamp()
                     self.needsRefresh = True
                     Layout.Inst().PopDialogue()
                 else:
@@ -234,7 +241,7 @@ def MainLoop(self):
                     gotKey = None
                     break
 
-            secondsNow = time.time()
+            secondsNow = getTimeStamp()
             secondsRunning = secondsNow - startSeconds
 
             if data.host.address('') == '' or len(data.derived.managementpifs([])) == 0:

XSConsoleUtils.py

@@ -17,6 +17,7 @@
 from pprint import pprint
 
 from XSConsoleBases import *
+from XSConsoleConstants import *
 from XSConsoleLang import *
 
 # Utils that need to access Data must go in XSConsoleDataUtils,
@@ -330,3 +331,7 @@ def SRSizeString(cls, inBytes):
     def DiskSizeString(cls, inBytes):
         return cls.BinarySizeString(inBytes)+' ('+cls.DecimalSizeString(inBytes)+')'
 
+
+def inDefaultNTPDomains(ntpServer):
+    return any(ntpServer.endswith(defaultDomain) for defaultDomain in DEFAULT_NTP_DOMAINS)
+

plugins-base/XSFeatureInterface.py

@@ -423,11 +423,15 @@ def Commit(self):
         if self.nic is None:
             self.mode = None
             data.DisableManagement()
+            data.AdjustNTPForStaticNetwork()
+            Layout.Inst().PushDialogue(InfoDialogue(Lang("Removed DHCP NTP server")))
         else:
             pif = data.host.PIFs()[self.nic]
             if self.mode.lower().startswith('static'):
                 # Comma-separated list of nameserver IPs
                 dns = ','.join(data.dns.nameservers([]))
+                data.AdjustNTPForStaticNetwork()
+                Layout.Inst().PushDialogue(InfoDialogue(Lang("Removed DHCP NTP server")))
             else:
                 dns = ''