From 68fa90754fd0cee62af636ce37c212da07cd8c46 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 17 May 2024 12:25:17 +1200 Subject: [PATCH] python/tests/krb5: Move check_ticket_times() to kdc_base_test.py This will allow other parts of the testsuite to use this helpful function. Signed-off-by: Andrew Bartlett Reviewed-by: Jo Sutton --- python/samba/tests/krb5/authn_policy_tests.py | 30 ------------------- python/samba/tests/krb5/kdc_base_test.py | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/python/samba/tests/krb5/authn_policy_tests.py b/python/samba/tests/krb5/authn_policy_tests.py index 455ad36d479..a1a38a19449 100755 --- a/python/samba/tests/krb5/authn_policy_tests.py +++ b/python/samba/tests/krb5/authn_policy_tests.py @@ -1067,36 +1067,6 @@ class AuthnPolicyBaseTests(AuthLogTestBase, KdcTgsBaseTests): audit_event=server_policy_event, reason=server_policy_reason) - def check_ticket_times(self, - ticket_creds, - expected_life=None, - expected_renew_life=None): - ticket = ticket_creds.ticket_private - - authtime = ticket['authtime'] - starttime = ticket.get('starttime', authtime) - endtime = ticket['endtime'] - renew_till = ticket.get('renew-till', None) - - starttime = self.get_EpochFromKerberosTime(starttime) - - if expected_life is not None: - actual_end = self.get_EpochFromKerberosTime( - endtime.decode('ascii')) - actual_lifetime = actual_end - starttime - - self.assertEqual(expected_life, actual_lifetime) - - if renew_till is None: - self.assertIsNone(expected_renew_life) - else: - if expected_renew_life is not None: - actual_renew_till = self.get_EpochFromKerberosTime( - renew_till.decode('ascii')) - actual_renew_life = actual_renew_till - starttime - - self.assertEqual(expected_renew_life, actual_renew_life) - def _get_tgt(self, creds, *, armor_tgt=None, till=None, diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py index 976e80e035f..a12acad7060 100644 --- a/python/samba/tests/krb5/kdc_base_test.py +++ b/python/samba/tests/krb5/kdc_base_test.py @@ -3785,3 +3785,33 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest): self.assertEqual(0, flags) return validation + + def check_ticket_times(self, + ticket_creds, + expected_life=None, + expected_renew_life=None): + ticket = ticket_creds.ticket_private + + authtime = ticket['authtime'] + starttime = ticket.get('starttime', authtime) + endtime = ticket['endtime'] + renew_till = ticket.get('renew-till', None) + + starttime = self.get_EpochFromKerberosTime(starttime) + + if expected_life is not None: + actual_end = self.get_EpochFromKerberosTime( + endtime.decode('ascii')) + actual_lifetime = actual_end - starttime + + self.assertEqual(expected_life, actual_lifetime) + + if renew_till is None: + self.assertIsNone(expected_renew_life) + else: + if expected_renew_life is not None: + actual_renew_till = self.get_EpochFromKerberosTime( + renew_till.decode('ascii')) + actual_renew_life = actual_renew_till - starttime + + self.assertEqual(expected_renew_life, actual_renew_life) -- 2.47.3