Changeset 2175 for TI12-security

Timestamp:

16/02/07 13:38:31 (13 years ago)

Author:

pjkersha

Message:

python/ndg.security.common/ndg/security/common/AttCert.py:

• added userId element to Attribute Certificate XML
• made get/set methods private and instead use within property definitions

File:

• TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttCert.py (modified) (7 diffs)

TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttCert.py

@@ -116 +116 @@
             "issuerName":         '',
             "issuerSerialNumber": 0,
+            "userId":             '',
             "validity":           {"notBefore": '', "notAfter": ''},
             "attributes":         {"roleSet": []},
@@ -121 +122 @@
         }
 
-        # Holder and issuer X500DN objects - instanciated in read method
+        # Holder and issuer X500DN objects - instantiated in read method
         self.__issuerDN = None
         self.__holderDN = None
@@ -309 +310 @@
     #
     #_________________________________________________________________________    
-    def setVersion(self, version):
+    def __setVersion(self, version):
         """Set the version number to be written to file."""        
         self.__dat['version'] = version
     
     #_________________________________________________________________________    
-    def getVersion(self):
+    def __getVersion(self):
         """Get version number as set in file."""
         return self.__dat['version']
-    
-    #_________________________________________________________________________    
-    def setHolder(self, holder):
+
+    version = property(fget=__getVersion,
+                       fset=__setVersion, 
+                       doc="Attribute Certificate version")
+    
+    #_________________________________________________________________________    
+    def __setHolder(self, holder):
         """Set holder's Distinguished Name string."""
+        if not isinstance(holder, basestring):
+            raise AttributeError, "holder DN must be a string"
+
         self.__dat['holder'] = holder
     
     #_________________________________________________________________________    
-    def getHolder(self):
+    def __getHolder(self):
         """Get holder's Distinguished Name string."""
         return self.__dat['holder']
 
-    #_________________________________________________________________________    
-    def getHolderDN(self):
+    holder = property(fget=__getHolder,
+                      fset=__setHolder, 
+                      doc="Attribute Certificate holder DN")
+
+    #_________________________________________________________________________    
+    def __getHolderDN(self):
          """Get the holder's Distinguished Name as an X500DN instance"""
          return self.__holderDN
-    
-    #_________________________________________________________________________    
-    def setIssuer(self, issuer):
+     
+    holderDN = property(fget=__getHolder,
+                        doc="Attribute Certificate holder DN as X500DN type")
+    
+    #_________________________________________________________________________    
+    def __setIssuer(self, issuer):
         """Set issuer's Distinguished Name."""
+        if not isinstance(issuer, basestring):
+            raise AttributeError, "issuer DN must be a string"
+        
         self.__dat['issuer'] = issuer
     
     #_________________________________________________________________________    
-    def getIssuer(self):
+    def __getIssuer(self):
         """Get the issuer's Distinguished Name string"""
         return self.__dat['issuer']
 
-    #_________________________________________________________________________    
-    def getIssuerDN(self):
+    issuer = property(fget=__getIssuer, 
+                      fset=__setIssuer,
+                      doc="Certificate Issuer DN")
+
+    #_________________________________________________________________________    
+    def __getIssuerDN(self):
          """Get the issuer's Distinguished Name as an X500DN instance"""
          return self.__issuerDN
-        
-    #_________________________________________________________________________    
-    def setIssuerName(self, issuerName):
+     
+    issuerDN = property(fget=__getIssuerDN,
+                        doc="Attribute Certificate issuer DN as X500DN type")
+        
+    #_________________________________________________________________________    
+    def __setUserId(self, userId):
+        """Set the name of the userId
+        @type userId: string
+        @param userId: user identifier"""
+        if not isinstance(userId, basestring):
+            raise AttributeError, "userId must be a string"
+        
+        self.__dat['userId'] = issuerName
+    
+    #_________________________________________________________________________    
+    def __getUserId(self):
+        """@rtype: string
+        @return: the user idenitifier"""
+        return self.__dat['userId']
+
+    userId = property(fget=__getUserId, 
+                      fset=__setUserId,
+                      doc="Certificate Issuer DN")
+        
+    #_________________________________________________________________________    
+    def __setIssuerName(self, issuerName):
         """Set the name of the issuer"""
+        if not isinstance(issuerName, basestring):
+            raise AttributeError, "issuerName must be a string"
+        
         self.__dat['issuerName'] = issuerName
     
     #_________________________________________________________________________    
-    def getIssuerName(self):
+    def __getIssuerName(self):
         """@return the name of the issuer"""
         return self.__dat['issuerName']
-    
-    #_________________________________________________________________________    
-    def setIssuerSerialNumber(self, serialNumber):
+
+    issuerName = property(fget=__getIssuerName, 
+                          fset=__setIssuerName,
+                          doc="Certificate Issuer name")
+   
+    #_________________________________________________________________________    
+    def __setIssuerSerialNumber(self, serialNumber):
         """@param serialNumber: the issuer serial number"""
+        if not isinstance(issuerSerialNumber, int):
+            raise AttributeError, "issuerSerialNumber must be an integer"
+
         self.__dat['issuerSerialNumber'] = serialNumber
     
     #_________________________________________________________________________    
-    def getIssuerSerialNumber(self):
+    def __getIssuerSerialNumber(self):
         """@return the issuer serial number"""
         return self.__dat['issuerSerialNumber']
+    
+    issuerSerialNumber = property(fget=__getIssuerSerialNumber, 
+                                  fset=__setIssuerSerialNumber,
+                                  doc="Certificate Issuer Serial Number")
 
 
@@ -664 +723 @@
         <issuerSerialNumber>""" + str(self.__dat['issuerSerialNumber']) +\
             """</issuerSerialNumber> 
+        <userId>""" + self.__dat['userId'] + """</userId>
         <validity>
             <notBefore>""" + self.__dat['validity']['notBefore'] + \
@@ -783 +843 @@
 
 
-
-
     #_________________________________________________________________________    
     def datetime2timeStr(self, dtVal):
@@ -808 +866 @@
         return dtVal.strftime("%Y %m %d %H %M %S")
 
-    
 
     #_________________________________________________________________________    
@@ -825 +882 @@
                 "Error converting time string into datetime object: %s" % e
         
-
-
 
     #_________________________________________________________________________