Changeset 4381 for TI12-security/trunk

Timestamp:

29/10/08 10:36:14 (12 years ago)

Author:

pjkersha

Message:

Renamed CredWallet? -> CredentialWallet?

Location:

TI12-security/trunk/python

Files:

• ndg.security.common/ndg/security/common/SQLObject.py (modified) (2 diffs)
• ndg.security.common/ndg/security/common/__init__.py (modified) (1 diff)
• ndg.security.common/ndg/security/common/attributeauthority.py (modified) (1 diff)
• ndg.security.server/ndg/security/server/sessionmanager.py (modified) (7 diffs)
• ndg.security.test/ndg/security/test/credentialwallet/test_credentialwallet.py (modified) (9 diffs)

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

@@ -25 +25 @@
     import cElementTree as ElementTree
 
-from CredWallet import CredentialRepository as CredentialRepositoryBase
-from CredWallet import CredentialRepositoryError
+from CredentialWallet import CredentialRepository as CredentialRepositoryBase
+from CredentialWallet import CredentialRepositoryError
 
 
@@ -33 +33 @@
     """Interface to Credential Repository Database
     
-    Nb. inherits from CredWallet.CredentialRepository to ensure correct interface
+    Nb. inherits from CredentialWallet.CredentialRepository to ensure correct interface
     to the wallet"""
 

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

@@ -21 +21 @@
     'AttAuthority',
     'AttCert',
-    'CredWallet',
+    'CredentialWallet',
     'm2CryptoSSLUtility',
     'openssl',

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

@@ -4 +4 @@
 unusual place of being required by both client and server
 NDG security packages.  For the server side they are required
-as the CredWallet invoked by the Session Manager acts as a
+as the CredentialWallet invoked by the Session Manager acts as a
 client to Attribute Authorities when negotiating the required
 Attribute Certificate.

TI12-security/trunk/python/ndg.security.server/ndg/security/server/sessionmanager.py

@@ -37 +37 @@
 
 # Credential Wallet
-from ndg.security.common.CredWallet import CredWallet, CredentialRepository, \
-    CredWalletError, CredWalletAttributeRequestDenied
+from ndg.security.common.credentialwallet import CredentialWallet, CredentialRepository, \
+    CredentialWalletError, CredentialWalletAttributeRequestDenied
     
 from ndg.security.common.wssecurity import WSSecurityConfig
@@ -84 +84 @@
     
     def __init__(self, **credWalletKeys):
-        """Initialise UserSession with keywords to CredWallet"""
+        """Initialise UserSession with keywords to CredentialWallet"""
                 
         log.debug("UserSession.__init__ ...")
@@ -92 +92 @@
         self.__sessIdList = []
         self.addNewSessID()
-        self.__credWallet = CredWallet(**credWalletKeys)
+        self.__credWallet = CredentialWallet(**credWalletKeys)
 
         log.info("Created a session with ID = %s" % self.__sessIdList[-1])
 
-    def __getCredWallet(self):
+    def __getCredentialWallet(self):
         """Get Credential Wallet instance"""
         return self.__credWallet
     
-    credWallet = property(fget=__getCredWallet,
-                          doc="Read-only access to CredWallet instance")
+    credWallet = property(fget=__getCredentialWallet,
+                          doc="Read-only access to CredentialWallet instance")
 
     def __getSessIdList(self):
@@ -259 +259 @@
         'sslCACertDir':           None,
         AUTHN_KEYNAME:            authNServicePropertyDefaults, 
-        CREDWALLET_KEYNAME:       CredWallet.propertyDefaults,
+        CREDWALLET_KEYNAME:       CredentialWallet.propertyDefaults,
         CREDREPOS_KEYNAME:        credentialRepositoryPropertyDefaults
     }
@@ -556 +556 @@
                                       sections=(section,))
         
-        # Keep a copy of the config file for the CredWallet to reference so 
+        # Keep a copy of the config file for the CredentialWallet to reference so 
         # that it can retrieve WS-Security settings
         self._cfg = readPropertiesFile.cfg
@@ -1014 +1014 @@
         
         @type credWalletKw: dict
-        @param **credWalletKw: keywords to CredWallet.getAttCert
+        @param **credWalletKw: keywords to CredentialWallet.getAttCert
         """
         
@@ -1030 +1030 @@
             return attCert, None, []
             
-        except CredWalletAttributeRequestDenied, e:
+        except CredentialWalletAttributeRequestDenied, e:
             # Exception object contains a list of attribute certificates
             # which could be used to re-try to get authorisation via a mapped

TI12-security/trunk/python/ndg.security.test/ndg/security/test/credentialwallet/test_credentialwallet.py

@@ -20 +20 @@
                                                     CaseSensitiveConfigParser
 from ndg.security.common.X509 import X509CertParse
-from ndg.security.common.CredWallet import CredWallet, \
-                                            CredWalletAttributeRequestDenied
+from ndg.security.common.credentialwallet import CredentialWallet, \
+                                            CredentialWalletAttributeRequestDenied
 
 from os.path import expandvars as xpdVars
@@ -31 +31 @@
 
 
-class CredWalletTestCase(unittest.TestCase):
-    """Unit test case for ndg.security.common.CredWallet.CredWallet class.
+class CredentialWalletTestCase(unittest.TestCase):
+    """Unit test case for ndg.security.common.credentialwallet.CredentialWallet class.
     
     """
@@ -55 +55 @@
         
         try:
-            CredWallet.accessDenied = 'yes'
+            CredentialWallet.accessDenied = 'yes'
             self.fail("accessDenied class variable should be read-only")
         except Exception, e:
@@ -61 +61 @@
 
         try:
-            CredWallet.accessGranted = False
+            CredentialWallet.accessGranted = False
             self.fail("accessGranted class variable should be read-only")
         except Exception, e:
             print("PASS - accessGranted class variable is read-only")
             
-        assert(not CredWallet.accessDenied)
-        assert(CredWallet.accessGranted)
+        assert(not CredentialWallet.accessDenied)
+        assert(CredentialWallet.accessGranted)
         
         
     def test2SetAttributes(self):
         
-        credWallet = CredWallet()
+        credWallet = CredentialWallet()
         credWallet.userX509Cert = \
 '''-----BEGIN CERTIFICATE-----
@@ -113 +113 @@
     def test3GetAttCertWithUserId(self):
                     
-        credWallet = CredWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))
+        credWallet = CredentialWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))
         attCert = credWallet.getAttCert()
         
@@ -123 +123 @@
     def test4GetAttCertWithUserX509Cert(self):
                     
-        credWallet = CredWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))
+        credWallet = CredentialWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))
         
         # Set a test individual user certificate to override the client 
@@ -185 +185 @@
     def test5GetAttCertRefusedWithUserCert(self):
         
-        credWallet = CredWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))    
+        credWallet = CredentialWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))    
         credWallet.userX509CertFilePath = self.cfg.get('setUp',
                                                        'userX509CertFilePath')
@@ -197 +197 @@
         try:
             attCert = credWallet.getAttCert()
-        except CredWalletAttributeRequestDenied, e:
+        except CredentialWalletAttributeRequestDenied, e:
             print "SUCCESS - obtained expected result: %s" % e
             return
@@ -207 +207 @@
         
         # Call Site A Attribute Authority where user is registered
-        credWallet = CredWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))
+        credWallet = CredentialWallet(cfg=self.cfg.get('setUp', 'cfgFilePath'))
         attCert = credWallet.getAttCert()