[Git][NTPsec/ntpsec][master] 2 commits: Added hexstr2octets() function and tests

[Ian Bruene]

Ian Bruene pushed to branch master at NTPsec / ntpsec


Commits:
a359137a by Ian Bruene at 2017-11-24T14:43:42-06:00
Added hexstr2octets() function and tests

- - - - -
e1065408 by Ian Bruene at 2017-11-24T14:43:42-06:00
Leap second data de-dumified

- - - - -


3 changed files:

- ntpclients/ntpsnmpd
- pylib/util.py
- tests/pylib/test_util.py


Changes:

=====================================
ntpclients/ntpsnmpd
=====================================
--- a/ntpclients/ntpsnmpd
+++ b/ntpclients/ntpsnmpd
@@ -460,15 +460,34 @@ class DataSource:  # This may be broken up in future to be less NTP-specific
 
     def cbr_statusDateTime(self, oid):
         # NtpDateTime
-        data = self.session.readvar(0, ["reftime"])
+        data = self.safeReadvar(0, ["reftime"])
+        if data is None:
+            return ax.Varbind(ax.VALUE_NULL, oid)
         txt = data["reftime"]
         txt = txt[2:]  # Strip '0x'
         txt = "".join(txt.split("."))  # Strip '.'
-        return ax.Varbind(ax.VALUE_OCTET_STR, oid, txt)
+        value = ntp.util.hexstr2octets(txt)
+        return ax.Varbind(ax.VALUE_OCTET_STR, oid, value)
 
-    def cbr_statusLeapSecond(self, oid):  # DUMMY
+    def cbr_statusLeapSecond(self, oid):  # I am not confident in this yet
         # NtpDateTime
-        return ax.Varbind(ax.VALUE_OCTET_STR, oid, "blah")
+        DAY = 86400
+        fmt = "%.8x%.8x"
+        data = self.safeReadvar(0, ["reftime"])
+        hasleap = self.safeReadvar(0, ["leap"])
+        if (data is None) or (hasleap is None):
+            return ax.Varbind(ax.VALUE_NULL, oid)
+        data = data["reftime"]
+        hasleap = hasleap["leap"]
+        if hasleap in (1, 2):
+            seconds = int(data.split(".")[0], 0)
+            days = seconds // DAY
+            scheduled = (days * DAY) + (DAY - 1)  # 23:59:59 of $CURRENT_DAY
+            formatted = fmt % (scheduled, 0)
+        else:
+            formatted = fmt % (0, 0)
+        value = ntp.util.hexstr2octets(formatted)
+        return ax.Varbind(ax.VALUE_OCTET_STR, oid, value)
 
     def cbr_statusLeapSecDirection(self, oid):
         # range of int32


=====================================
pylib/util.py
=====================================
--- a/pylib/util.py
+++ b/pylib/util.py
@@ -122,6 +122,15 @@ def rfc3339(t):
     return rep
 
 
+def hexstr2octets(hexstr):
+    if (len(hexstr) % 2) != 0:
+        hexstr = hexstr[:-1]  # slice off the last char
+    values = []
+    for index in range(0, len(hexstr), 2):
+        values.append(chr(int(hexstr[index:index+2], 16)))
+    return "".join(values)
+
+
 def slicedata(data, slicepoint):
     "Breaks a sequence into two pieces at the slice point"
     return data[:slicepoint], data[slicepoint:]


=====================================
tests/pylib/test_util.py
=====================================
--- a/tests/pylib/test_util.py
+++ b/tests/pylib/test_util.py
@@ -107,6 +107,14 @@ class TestPylibUtilMethods(unittest.TestCase):
         else:
             self.assertEqual(f(1480999786.025), "2016-12-06T04:49:46.025Z")
 
+    def test_hexstr2octets(self):
+        f = ntp.util.hexstr2octets
+
+        # Test
+        self.assertEqual(f("f00dface"), "\xF0\x0D\xFA\xCE")
+        # Test odd length
+        self.assertEqual(f("cafebabe1"), "\xCA\xFE\xBA\xBE")
+
     def test_slicedata(self):
         f = ntp.util.slicedata
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/930f7596b427573d91b6eb47895bd30a5f5c0ed6...e10654087779db4135435edc8a10508231c9ce14

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/930f7596b427573d91b6eb47895bd30a5f5c0ed6...e10654087779db4135435edc8a10508231c9ce14
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20171124/0daa0ad5/attachment.html>