Changeset 4158 for TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/__init__.py

Timestamp:

01/09/08 14:37:03 (13 years ago)

Author:

cbyrom

Message:

Create new utility module, ClassFactory? - to allow generic instantiation
of classes dynamically.

Implement use of this in the AttAuth? and SessionMgr? services + adjust
the config files for these accordingly + abstract use of MyProxy? in
SessionMgr? to generic authNService - and create packages with real
and test authN services. Adjust the SessionMgr? tests to use the
test authN service.

File:

• TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/__init__.py (modified) (5 diffs)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/__init__.py

@@ -41 +41 @@
 
 from ndg.security.common.utils.ConfigFileParsers import readAndValidateProperties
+from ndg.security.common.utils.ClassFactory import instantiateClass
 
 #_____________________________________________________________________________
@@ -130 +131 @@
         read.  Set this flag to False to override.
         """
-        log.info("Initialising service ... ")
+        log.info("Initialising service ...")
         
         # Base class initialisation
@@ -182 +183 @@
         self.__issuerSerialNumber = self.__cert.serialNumber
         
-        
         # Load host sites custom user roles interface to enable the AA to
         # assign roles in an attribute certificate on a getAttCert request
-        self.loadUserRolesInterface()
-
+        self.__userRoles = instantiateClass(self.__prop['userRolesModName'],\
+                                                 self.__prop['userRolesClassName'],\
+                                                 moduleFilePath=self.__prop.get('userRolesModFilePath'),\
+                                                 objectType=AAUserRoles, \
+                                                 classProperties=self.__prop.get('userRolesPropFile'))
 
         attCertFilePath = os.path.join(self.__prop['attCertDir'],
@@ -201 +204 @@
         '''
         # Configuration file properties are held together in a dictionary
-        self.__prop = readAndValidateProperties(self.propFilePath, validKeys=AttAuthority.__validKeys)
+        self.__prop = readAndValidateProperties(self.propFilePath, \
+                                                validKeys=AttAuthority.__validKeys)
         
         # add the WS-security properties to the main properties
@@ -220 +224 @@
             'Invalid directory path Attribute Certificates store "%s": %s' % \
                 (self.__prop['attCertDir'], osError.strerror)
-
-    #_________________________________________________________________________
-    def loadUserRolesInterface(self):
-        """Set-up user roles interface - load host sites custom AAUserRoles
-        derived class.  This class interfaces with the sites mechanism for
-        mapping user ID to the roles to which they are entitled.  This
-        could be via a user database"""
-
-        log.debug("Loading User roles interface ...")
-        try:
-            try:
-                # Module file path may be None if the new module to be loaded
-                # can be found in the existing system path            
-                if self.__prop['userRolesModFilePath'] is not None:
-                    if not os.path.exists(\
-                              self.__prop['userRolesModFilePath']):
-                        raise Exception, "File path '%s' doesn't exist" % \
-                              self.__prop['userRolesModFilePath']
-                              
-                    # Temporarily extend system path ready for import
-                    sysPathBak = sys.path[:]
-                              
-                    sys.path.append(self.__prop['userRolesModFilePath'])
-                
-                # Import module name specified in properties file
-                userRolesMod = __import__(self.__prop['userRolesModName'],
-                                          globals(),
-                                          locals(),
-                                          [self.__prop['userRolesClassName']])
-    
-                userRolesClass = eval('userRolesMod.' + \
-                                     self.__prop['userRolesClassName'])
-            finally:
-                try:
-                    sys.path[:] = sysPathBak
-                except NameError:
-                    # sysPathBak may not have been defined
-                    pass
-                                
-        except Exception, e:
-            raise AttAuthorityError,'Importing User Roles module: %s' % str(e)
-
-        # Check class inherits from AAUserRoles abstract base class
-        if not issubclass(userRolesClass, AAUserRoles):
-            raise AttAuthorityError, \
-                "User Roles class %s must be derived from AAUserRoles" % \
-                self.__prop['userRolesClassName']
-
-
-        # Instantiate custom class
-        try:
-            self.__userRoles=userRolesClass(self.__prop['userRolesPropFile'])
-            
-        except Exception, e:
-            raise AttAuthorityError, \
-                "Error instantiating User Roles interface: " + str(e)
-                
-        log.info(\
-             'Instantiated "%s" class from user roles module: "%s" in "%s"' %\
-                 (self.__prop['userRolesClassName'],
-                  self.__prop['userRolesModName'],
-                  self.__prop['userRolesModFilePath']))