Changeset 784 for TI12-security/trunk


Ignore:
Timestamp:
18/04/06 11:21:39 (14 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:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/NDG/Session.py

    r740 r784  
    568568             
    569569        except Exception, e: 
    570             raise AddUserResp(errMsg=str(e)) 
     570            return AddUserResp(errMsg=str(e)) 
    571571 
    572572        return AddUserResp(errMsg='') 
  • TI12-security/trunk/python/NDG/SessionClient.py

    r751 r784  
    247247            addUserResp = AddUserResp(xmlTxt=resp['addUserResp'], 
    248248                                encrPriKeyFilePath=self.__clntPriKeyFilePath, 
    249                                 encrPriKeyPwd=clntPriKeyPwd) 
     249                                encrPriKeyPwd=clntPriKeyPwd)             
     250        except Exception, e: 
     251            raise SessionClientError("Error adding new user: " + str(e)) 
     252   
    250253                             
    251             if 'errMsg' in addUserResp and addUserResp['errMsg']: 
    252                 raise SessionClientError(addUserResp['errMsg']) 
    253              
    254         except Exception, e: 
    255             raise SessionClientError("Error adding new user: " + str(e)) 
     254        if 'errMsg' in addUserResp and addUserResp['errMsg']: 
     255            raise SessionClientError(addUserResp['errMsg']) 
    256256     
    257257         
  • TI12-security/trunk/python/NDG/SimpleCA.py

    r543 r784  
    222222                                               "%Y %m %d %H %M %S") 
    223223                 
    224                 return datetime(lTime[0], lTime[1], lTime[2], 
    225                                 lTime[3], lTime[4], lTime[5]) 
    226             except: 
     224                return datetime(*self.__dtCertExpiry[0:6]) 
     225             
     226            except Exception, e: 
    227227                raise SimpleCAError("certExpiryDate has the format " + \ 
    228228                                    "YYYY mm dd HH MM SS. Year, month, " + \ 
  • TI12-security/trunk/python/conf/sessionMgrProperties.xml

    r739 r784  
    2424        </simpleCACltProp> 
    2525        <!-- 
     26        <simpleCASrvProp> 
    2627            <certExpiryDate></certExpiryDate> 
    2728            <certLifetimeDays></certLifetimeDays> 
Note: See TracChangeset for help on using the changeset viewer.