Changeset 1177 for TI12-security

Timestamp:

14/06/06 16:38:50 (14 years ago)

Author:

pjkersha

Message:

NDG/AttCert.py: changed isValidTime so that the time against which it is checked can be overridden by
setting the dtNow keyword.

NDG/CredWallet.py: reqAuthorisation - in the block for getting an existing AC, if an AC is found only use it
if it won't expire in the next couple of hours.

Location:

TI12-security/trunk/python/NDG

Files:

• AttCert.py (modified) (2 diffs)
• CredWallet.py (modified) (2 diffs)

TI12-security/trunk/python/NDG/AttCert.py

@@ -697 +697 @@
 
 
-    def isValidTime(self, raiseExcep=False):
+    def isValidTime(self, dtNow=None, raiseExcep=False):
         """Check Attribute Certificate for expiry.  Set raiseExcep to True
         to raise an exception with a message indicating the nature of the 
@@ -708 +708 @@
             raise AttCertError("Not After datetime is not set")
        
-        dtNow = datetime.utcnow()
+        if dtNow is None:
+            dtNow = datetime.utcnow()
         
         # Testing only

TI12-security/trunk/python/NDG/CredWallet.py

@@ -16 +16 @@
 # Temporary store of certificates for use with CredWallet reqAuthorisation()
 import tempfile
+
+# Check Attribute Certificate validity times
+from datetime import datetime
+from datetime import timedelta
 
 # Keyword formatting/XML message creation for Attribute Authority WS
@@ -948 +952 @@
             # Look in the wallet for an AC with the same issuer name
             if aaName in self.__credentials:
-                # Existing Attribute Certificate found in wallet - return this
-                return self.__credentials[aaName]
+                # Existing Attribute Certificate found in wallet - Check that 
+                # it will be valid for at least the next 2 hours
+                #
+                # TODO: Make this 2 hour offset a configurable parameter
+                #
+                # P J Kershaw 14/06/06
+                dtNow = datetime.utcnow() + datetime.timedelta(seconds=7200)
+                
+                if self.__credentials[aaName].isValidTime(dtNow=dtNow):                                   
+                    return self.__credentials[aaName]