Fix show() on non-UTC Kerberos

secdev · Feb 6, 2024 · ff96859 · ff96859
1 parent eae1567
commit ff96859
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/scapy/modules/ticketer.py b/scapy/modules/ticketer.py
@@ -368,7 +368,7 @@ def save(self, fname=None):
         with open(self.fname, "wb") as fd:
             return fd.write(bytes(self.ccache))
 
-    def show(self):
+    def show(self, utc=False):
         """
         Show the content of a CCache
         """
@@ -382,7 +382,10 @@ def _to_str(x):
             if x is None:
                 return "None"
             else:
-                x = datetime.fromtimestamp(x)
+                x = datetime.fromtimestamp(
+                    x,
+                    tz=timezone.utc if utc else None
+                )
             return x.strftime("%d/%m/%y %H:%M:%S")
 
         for i, cred in enumerate(self.ccache.credentials):

diff --git a/test/scapy/layers/kerberos.uts b/test/scapy/layers/kerberos.uts
@@ -914,7 +914,7 @@ with mock.patch('scapy.libs.rfc3961.os.urandom', side_effect=fake_random):
 = Ticketer++ - Call show()
 
 with ContextManagerCaptureOutput() as cmco:
-    t.show()
+    t.show(utc=True)
     outp = cmco.get_output().strip()
 
 print(outp)