Ignore:
Timestamp:
03/01/07 16:41:07 (14 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/ndg/security/server/SessionMgr/init.py: started refactoring of connect, addUser
and reqAuthorisation methods to allow for new ZSI code, doc-lit. WSDL, WS-Security and new MyProxy? client.

python/ndg.security.server/ndg/security/server/MyProxy.py,
python/ndg.security.test/ndg/security/test/MyProxy/myProxyClientTest.cfg and
python/ndg.security.test/ndg/security/test/MyProxy/MyProxyClientTest.py: changed store method to include explicit
passphrase argument.

python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py: moved from test/ into a dedicated
module directory.

python/ndg.security.test/ndg/security/test/XMLSecDoc/*: unit test for new XMLSecDoc class which implements
enveloped signature using M2Crypto, ZSI and DOM rather than pyXMLSec as before.

python/Tests/MyProxyClient/m2CryptoMyPxClnt.py: allow client post connection check - i.e. commented out:
conn.clientPostConnectionCheck = None

python/ndg.security.common/ndg/security/common/XMLMsg.py: no longer needed with new version of ZSI + use of
WS-Security.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
5 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/MyProxy/MyProxyClientTest.py

    r1940 r1945  
    3737    def test1Store(self): 
    3838        '''test1Store: upload X509 cert and private key to repository''' 
    39         ownerPassphrase = self.cfg['test1Store']['ownerpassphrase'] or \ 
     39             
     40        passphrase = self.cfg['test1Store'].get('passphrase') or \ 
     41            getpass.getpass(prompt="\ntest1Store cred. pass-phrase: ") 
     42             
     43        ownerPassphrase = self.cfg['test1Store'].get('ownerpassphrase') or \ 
    4044            getpass.getpass(prompt="\ntest1Store cred. owner pass-phrase: ") 
    4145             
    4246        try: 
    4347            self.clnt.store(self.cfg['test1Store']['username'], 
    44                         self.cfg['test1Store']['ownercertfile'], 
    45                         self.cfg['test1Store']['ownerkeyfile'], 
     48                        passphrase, 
     49                        self.cfg['test1Store']['certfile'], 
     50                        self.cfg['test1Store']['keyfile'], 
    4651                        ownerCertFile=self.cfg['test1Store']['ownercertfile'], 
    4752                        ownerKeyFile=self.cfg['test1Store']['ownerkeyfile'], 
     
    7378    def test3Info(self): 
    7479        '''test3Info: Retrieve information about a given credential''' 
    75         ownerpassphrase = self.cfg['test3Info']['ownerpassphrase'] or \ 
     80         
     81        # ownerpassphrase can be omitted from the congif file in which case 
     82        # the get call below would return None 
     83        ownerpassphrase = self.cfg['test3Info'].get('ownerpassphrase') or \ 
    7684            getpass.getpass(prompt="\ntest3Info owner creds pass-phrase: ") 
    7785 
    78         ownerpassphrase = (ownerpassphrase == 'None') and None 
    79          
    8086        try: 
    8187            credExists, errorTxt, fields = self.clnt.info( 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/MyProxy/myProxyClientTest.cfg

    r1881 r1945  
    1212[test1Store] 
    1313username: sstljakTestUser 
     14passphrase: 
    1415certFile: ./userCert.pem 
    1516keyFile: ./userKey.pem 
Note: See TracChangeset for help on using the changeset viewer.