Changeset 1312

Timestamp:

25/07/06 15:20:19 (15 years ago)

Author:

pjkersha

Message:

NDG/AttAuthority.py and NDG/Session.py: revised readProperties methods for better error handling and to handle
null field settings.

Location:

TI12-security/trunk/python

Files:

• NDG/AttAuthority.py (modified) (9 diffs)
• NDG/Session.py (modified) (1 diff)
• dist/NDG-Security-0.72.tar.gz (modified) (previous)

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

@@ -488 +488 @@
         
         except Exception, e:
-            raise AttAuthorityError("New Attribute Certificate \"%s\": %s" % \
-                                    (attCert.filePath, e))
-
-    
-
-
+            raise AttAuthorityError, "New Attribute Certificate \"%s\": %s" %\
+                                    (attCert.filePath, e)
+       
+        
+    #_________________________________________________________________________     
     def readProperties(self, propFilePath=None):
 
@@ -503 +502 @@
         if propFilePath is not None:
             if not isinstance(propFilePath, basestring):
-                raise AttAuthorityError("Input Properties file path " + \
-                                        "must be a valid string.")
+                raise AttAuthorityError, "Input Properties file path " + \
+                                        "must be a valid string."
             
             self.__propFilePath = propFilePath
@@ -513 +512 @@
             
         except IOError, ioErr:
-            raise AttAuthorityError(\
+            raise AttAuthorityError, \
                                 "Error parsing properties file \"%s\": %s" % \
-                                (ioErr.filename, ioErr.strerror))
+                                (ioErr.filename, ioErr.strerror)
 
         
         aaProp = tree.getroot()
-
-        # Copy properties from file as member variables
-        prop = dict([(elem.tag, elem.text) for elem in aaProp])
-
-
-        # Check for missing properties
-        propKeys = prop.keys()
-        missingKeys = [key for key in AttAuthority.__validKeys \
-                       if key not in propKeys]
+        if aaProp is None:
+            raise AttAuthorityError, \
+            "Parsing properties file \"%s\": root element is not defined" % \
+            self.__propFilePath
+
+
+        # Copy properties from file into a dictionary
+        self.__prop = {}
+        missingKeys = []
+        try:
+            for elem in aaProp:
+                if elem.tag in self.__class__.__validKeys:
+                
+                    if elem.tag != 'keyPwd' and elem.text: 
+                        self.__prop[elem.tag] = \
+                                        os.path.expandvars(elem.text.strip())
+                    else:
+                        self.__prop[elem.tag] = elem.text
+                else:
+                    missingKeys.append(elem.tag)
+                
+        except Exception, e:
+            raise AttAuthorityError, \
+                "Error parsing tag \"%s\" in properties file \"%s\": %s" % \
+                (elem.tag, self.__propFilePath, e)
+ 
         if missingKeys != []:
-            raise AttAuthorityError("The following properties are " + \
-                                    "missing from the properties file: " + \
-                                    ', '.join(missingKeys))
-
-        # Strip white space - apart from fields where may be required
-        for key in prop:
-            if key != 'keyPwd' and prop[key]: 
-                prop[key] = prop[key].strip()
-                
-            # Check for environment variables in file paths
-            tagCaps = key.upper()
-            if 'FILE' in tagCaps or 'PATH' in tagCaps or 'DIR' in tagCaps:
-                prop[key] = os.path.expandvars(prop[key])
- 
+            raise AttAuthorityError, "The following properties are " + \
+                                     "missing from the properties file: " + \
+                                     ', '.join(missingKeys)
  
         # Ensure Certificate time parameters are converted to numeric type
-        prop['attCertLifeTime'] = float(prop['attCertLifeTime'])
-        prop['attCertNotBeforeOff'] = float(prop['attCertNotBeforeOff'])
-          
-        self.__prop = prop
+        self.__prop['attCertLifeTime'] = float(self.__prop['attCertLifeTime'])
+        self.__prop['attCertNotBeforeOff'] = \
+                                    float(self.__prop['attCertNotBeforeOff'])
 
         
@@ -556 +560 @@
 
         except OSError, osError:
-            raise AttAuthorityError(\
-                "Invalid directory path Attribute Certificates store: " + \
-                osError.strerror)
-
+            raise AttAuthorityError, \
+                "Invalid directory path Attribute Certificates store: %s" % \
+                osError.strerror
        
         
-        
+    #_________________________________________________________________________     
     def readMapConfig(self, mapConfigFilePath=None):
         """Parse Map Configuration file.
@@ -700 +703 @@
                     self.__localRole2RemoteRole[trustedHost][localRole] = \
                                                                 [remoteRole]                  
- 
-
-           
+       
+        
+    #_________________________________________________________________________     
     def usrIsRegistered(self, usrDN):
         """Check a particular user is registered with the Data Centre that the
         Attribute Authority represents"""
         return self.__usrRoles.usrIsRegistered(usrDN)
-        
-
-
-
-
+       
+        
+    #_________________________________________________________________________     
     def getRoles(self, dn):
         """Get the roles available to the registered user identified usrDN.
@@ -724 +725 @@
         except Exception, e:
             raise AttAuthorityError("Getting user roles: %s" % e)
-
-
-
-    
+       
+        
+    #_________________________________________________________________________     
     def __getHostInfo(self):
         """Return the host that this Attribute Authority represents: its ID,
@@ -737 +737 @@
     hostInfo = property(fget=__getHostInfo, 
                         doc="Return information about this host")
-
-
-
-    
+       
+        
+    #_________________________________________________________________________     
     def getTrustedHostInfo(self, role=None):
         """Return a dictionary of the hosts that have trust relationships
@@ -801 +800 @@
                          
         return trustedHostInfo
-
-
-
-
+       
+        
+    #_________________________________________________________________________     
     def mapRemoteRoles2LocalRoles(self, trustedHost, trustedHostRoles):
         """Map roles of trusted hosts to roles for this data centre
@@ -829 +827 @@
                 
         return localRoles
-
-
-
-
+       
+        
+    #_________________________________________________________________________     
     def __newAttCertFilePath(self):
         """Create a new unique attribute certificate file path"""

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

@@ -561 +561 @@
 
         if propElem is None:
-            raise SessionMgrError("Root element for parsing is not defined")
-
-        for elem in propElem:
-            if elem.tag == 'myProxyProp':
-                self.__myPx.readProperties(propElem=elem)
-
-            elif elem.tag == 'credReposProp':
-                self.__credRepos.readProperties(propElem=elem,
+            raise SessionMgrError, \
+            "Parsing properties file \"%s\": root element is not defined" % \
+            propFilePath
+
+
+        missingKeys = []
+        try:
+            for elem in propElem:
+                if elem.tag == 'myProxyProp':
+                    self.__myPx.readProperties(propElem=elem)
+    
+                elif elem.tag == 'credReposProp':
+                    self.__credRepos.readProperties(propElem=elem,
                                                 dbPPhrase=credReposPPhrase)
-            elif elem.tag in self.__validKeys:
-                try:
+                elif elem.tag in self.__validKeys:
                     # Check for environment variables in file paths
-                    tagCaps = elem.tag.upper()
-                    if 'FILE' in tagCaps or \
-                       'PATH' in tagCaps or \
-                       'DIR' in tagCaps:
-                        elem.text = os.path.expandvars(elem.text)
-                        
-                    self.__prop[elem.tag] = elem.text
+                    self.__prop[elem.tag] = os.path.expandvars(elem.text)
                     
                     # Strip white space but not in the case of pass-phrase 
-                    # field as pass-phrase might contain leading or trailing 
-                    # white space
+                    # field as pass-phrase might contain leading or 
+                    # trailing white space
                     if elem.tag != 'keyPPhrase' and \
                        isinstance(self.__prop[elem.tag], basestring):
-                        self.__prop[elem.tag].strip()
-                        
-                except Exception, e:
-                    raise SessionMgrError(\
-                        "Error parsing properties file tag: \"%s\": %s" % \
-                        (elem.tag, e))
-                
-            else:
-                raise SessionMgrError(\
-                    "\"%s\" is not a valid properties file tag" % elem.tag)
+                        self.__prop[elem.tag].strip()                                            
+                else:
+                    missingKeys.append(elem.tag)
+                
+        except Exception, e:
+            raise SessionMgrError, \
+                "Error parsing tag \"%s\" in properties file \"%s\": %s" % \
+                (elem.tag, propFilePath, e)
+
+
+        if missingKeys != []:
+            raise SessionMgrError, "The following properties are " + \
+                                   "missing from the properties file: " + \
+                                   ', '.join(missingKeys)