Changeset 6730 for TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/credentialwallet.py

Timestamp:

16/03/10 08:37:55 (11 years ago)

Author:

pjkersha

Message:

• Working Credential Wallet refactored for Python 2.6
• Pruned out more old code: ZSI and Twisted SAOP/WSDL wrappers, Session Manager and WS-Security, Test 'Site B' Attribute Authority - for testing role mapping.
• Started XACML package ElementTree based parser.

File:

• TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/credentialwallet.py (modified) (4 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/credentialwallet.py

@@ -16 +16 @@
 import os
 import warnings
-import traceback
 
 # Check Attribute Certificate validity times
@@ -26 +25 @@
 from ndg.saml.saml2.core import Assertion
 
-# Access Attribute Authority's web service using ZSI - allow pass if not 
-# loaded since it's possible to make AttributeAuthority instance locally
-# without using the WS
-aaImportError = True
-try:
-    # AttributeAuthority client package resides with CredentialWallet module in 
-    # ndg.security.common
-    from ndg.security.common.attributeauthority import (
-        AttributeAuthorityClient, AttributeAuthorityClientError, 
-        AttributeRequestDenied, NoMatchingRoleInTrustedHosts)
-    aaImportError = False
-except ImportError:
-    pass
-
-# Likewise - may not want to use WS and use AttributeAuthority locally in which
-# case no need to import it
-try:
-    from ndg.security.server.attributeauthority import (AttributeAuthority, 
-        AttributeAuthorityError, AttributeAuthorityAccessDenied)
-    aaImportError = False
-except ImportError:
-    pass
-
-if aaImportError:
-    raise ImportError("Either AttributeAuthority or AttributeAuthorityClient "
-                      "classes must be present to allow interoperation with "
-                      "Attribute Authorities: %s" % traceback.format_exc())
-
-# Authentication X.509 Certificate
-from ndg.security.common.X509 import X509Cert
-from M2Crypto import X509, BIO, RSA
-
-# Authorisation - attribute certificate 
-from ndg.security.common.AttCert import AttCert, AttCertError
-from ndg.security.common.wssecurity.signaturehandler.dom import SignatureHandler
-
-# generic parser to read INI/XML properties file
-from ndg.security.common.utils.configfileparsers import \
-                                                INIPropertyFileWithValidation
-
-from ndg.security.common.utils import TypedList
 from ndg.security.common.utils.configfileparsers import (     
                                                     CaseSensitiveConfigParser,)
@@ -178 +136 @@
     __slots__ = tuple(["__%s" % n for n in __ATTRIBUTE_NAMES])
     
-    def __init__(self, type=None):
+    def __init__(self, _type=None):
         self.__type = None
-        self.type = type
+        self.type = _type
         
         self.__id = -1
@@ -700 +658 @@
     
     def __init__(self, propFilePath=None, dbPPhrase=None, **prop):
-        pass
+        """Null Credential Repository __init__ placeholder"""
 
     def addUser(self, userId):
-        pass
+        """Null Credential Repository addUser placeholder"""
                             
     def auditCredentials(self, **attCertValidKeys):
-        pass
+        """Null Credential Repository addUser placeholder"""
 
     def getCredentials(self, userId):
+        """Null Credential Repository getCredentials placeholder"""
         return []
        
     def addCredentials(self, userId, attCertList):
-        pass
+        """Null Credential Repository addCredentials placeholder"""