Changeset 1314

Timestamp:

25/07/06 16:25:37 (15 years ago)

Author:

pjkersha

Message:

NDG/AttAuthority.py: better error handling for readMapConfig.

Location:

TI12-security/trunk/python

Files:

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

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

@@ -575 +575 @@
         if mapConfigFilePath is not None:
             if not isinstance(mapConfigFilePath, basestring):
-                raise AttAuthorityError("Input Map Configuration file path "+\
-                                        "must be a valid string.")
+                raise AttAuthorityError, \
+                "Input Map Configuration file path must be a valid string."
             
             self.__prop['mapConfigFile'] = mapConfigFilePath
 
-        
-        tree = ElementTree.parse(self.__prop['mapConfigFile'])
-        rootElem = tree.getroot()
-
+
+        try:
+            tree = ElementTree.parse(self.__prop['mapConfigFile'])
+            rootElem = tree.getroot()
+            
+        except IOError, e:
+            raise AttAuthorityError, \
+                            "Error parsing properties file \"%s\": %s" % \
+                            (e.filename, e.strerror)
+            
+        except Exception, e:
+            raise AttAuthorityError, \
+                "Error parsing Map Configuration file: \"%s\": %s" % \
+                (self.__prop['mapConfigFile'], e)
+
+            
         trustedElem = rootElem.findall('trusted')
+        if not trustedElem:   
+            raise AttAuthorityError, \
+            "\"trusted\" tag not found in Map Configuration file \"%s\"" % \
+            self.__prop['mapConfigFile']
 
         # Dictionaries: