Changeset 784 for TI12-security/trunk

Timestamp:

18/04/06 11:21:39 (15 years ago)

Author:

pjkersha

Message:

Fixes for CEH and PML installations...

conf/sessionMgrProperties.xml: added missing <simpleCASrvProp> tag.
NDG/SimpleCA.py: fixed bug in setProperties method - lTime var was ref'd but not set.
NDG/SessionClient.py: addUser method - move if 'errMsg' ... block out of exception handling
block for greater efficiency.
NDG/Session.py: addUser method of SessionMgr? class - fixed bug return AddUserResp? instance
instead of trying to raise an exception with it.

Location:

TI12-security/trunk/python

Files:

• NDG/Session.py (modified) (1 diff)
• NDG/SessionClient.py (modified) (1 diff)
• NDG/SimpleCA.py (modified) (1 diff)
• conf/sessionMgrProperties.xml (modified) (1 diff)

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

@@ -568 +568 @@
             
         except Exception, e:
-            raise AddUserResp(errMsg=str(e))
+            return AddUserResp(errMsg=str(e))
 
         return AddUserResp(errMsg='')

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

@@ -247 +247 @@
             addUserResp = AddUserResp(xmlTxt=resp['addUserResp'],
                                 encrPriKeyFilePath=self.__clntPriKeyFilePath,
-                                encrPriKeyPwd=clntPriKeyPwd)
+                                encrPriKeyPwd=clntPriKeyPwd)            
+        except Exception, e:
+            raise SessionClientError("Error adding new user: " + str(e))
+  
                             
-            if 'errMsg' in addUserResp and addUserResp['errMsg']:
-                raise SessionClientError(addUserResp['errMsg'])
-            
-        except Exception, e:
-            raise SessionClientError("Error adding new user: " + str(e))
+        if 'errMsg' in addUserResp and addUserResp['errMsg']:
+            raise SessionClientError(addUserResp['errMsg'])
     
         

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

@@ -222 +222 @@
                                                "%Y %m %d %H %M %S")
                 
-                return datetime(lTime[0], lTime[1], lTime[2],
-                                lTime[3], lTime[4], lTime[5])
-            except:
+                return datetime(*self.__dtCertExpiry[0:6])
+            
+            except Exception, e:
                 raise SimpleCAError("certExpiryDate has the format " + \
                                     "YYYY mm dd HH MM SS. Year, month, " + \

TI12-security/trunk/python/conf/sessionMgrProperties.xml

@@ -24 +24 @@
         </simpleCACltProp>
         <!--
+        <simpleCASrvProp>
             <certExpiryDate></certExpiryDate>
             <certLifetimeDays></certLifetimeDays>