Ignore:
Timestamp:
29/01/07 13:34:04 (13 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/ndg/security/server/AttAuthority/server-config.tac:

  • soap_getAttCert - no need to convert X509 cert object verifyingCert from

WSSecurityHandler.signatureHandler, it now X509Cert type.

  • instantiation of WSSecurityHandler.signatureHandler - updated cert and private key

file path keyword names.

python/ndg.security.server/ndg/security/server/AttAuthority/init.py:
Fixed bug in AttAuthority?.init - readProperties doesn't take filePath keyword.

python/ndg.security.server/ndg/security/server/SessionMgr/init.py:

  • added epydoc keywords to header

python/ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py:
updated keywords for call to AttAuthorityClient?.init to use new
WSSecurityHandler.signatureHandler ones.

python/ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg and
python/ndg.security.test/ndg/security/test/MyProxy/myProxyClientTest.cfg: modified
settings.

python/ndg.security.common/ndg/security/common/AttAuthority/init.py:
AttAuthorityClient? -

  • get rid of PKI keyword settings and set using

WSSecurityHandler.signatureHandler ones directly instead.

  • added signatureHandler property and associated getSignatureHandler method.

python/ndg.security.common/ndg/security/common/XMLSec.py: remove old commented out code
that used dom element getAttributeNodeNS method.

python/ndg.security.common/ndg/security/common/wsSecurity.py: modified SignatureHandler?
so that X.509 cert and private key settings are properties. X.509 certs are handled as
ndg.security.common.X509.X509Cert types.

python/ndg.security.common/ndg/security/common/SessionMgr/init.py:

WSSecurityHandler.signatureHandler ones.

  • disconnect input proxyCert renamed userCert. proxyCert will be included in WSSE

header. userCert is the user certificate corresponding to the issuer of the proxy.

python/ndg.security.common/ndg/security/common/X509.py:

  • fixed bug in init so that self.filePath is not part of if filePath indent.
  • added getM2CryptoX509 access method for getM2CryptoX509 property.
  • X509Cert.init call in X509CertRead changed to include filePath keyword explicitly.
Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py

    r2051 r2072  
    3636 
    3737        # Instantiate WS proxy 
    38         self.clnt = AttAuthorityClient(uri=self.cfg['setUp']['uri'],  
    39                    clntCertFilePath=self.cfg['setUp']['usercertfilepath'], 
    40                    clntPriKeyFilePath=self.cfg['setUp']['userprikeyfilepath'], 
    41                    tracefile=sys.stderr) 
     38        self.clnt = AttAuthorityClient(uri=self.cfg['setUp']['uri'], 
     39               signingCertFilePath=self.cfg['setUp']['usercertfilepath'], 
     40               signingPriKeyFilePath=self.cfg['setUp']['userprikeyfilepath'], 
     41               tracefile=sys.stderr) 
     42                    
    4243    
    4344     
     
    123124         
    124125        # Make client to site B Attribute Authority     
    125         clnt = AttAuthorityClient(\ 
    126    uri=self.cfg['test6GetMappedAttCert']['uri'],  
    127    clntCertFilePath=self.cfg['test6GetMappedAttCert']['usercertfilepath'], 
    128    clntPriKeyFilePath=self.cfg['test6GetMappedAttCert']['userprikeyfilepath'], 
    129    tracefile=sys.stderr) 
     126        clnt = AttAuthorityClient( 
     127uri=self.cfg['test6GetMappedAttCert']['uri'],  
     128signingCertFilePath=self.cfg['test6GetMappedAttCert']['usercertfilepath'], 
     129signingPriKeyFilePath=self.cfg['test6GetMappedAttCert']['userprikeyfilepath'], 
     130tracefile=sys.stderr) 
    130131     
    131132        # Make attribute certificate request 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/MyProxy/myProxyClientTest.cfg

    r2070 r2072  
    1212[test1Store] 
    1313username: sstljakTestUser 
    14 #username: gabriel 
     14username: gabriel 
    1515passphrase: 
    1616certFile: ./userCert.pem 
     
    2121 
    2222[test2GetDelegation] 
    23 username: sstljakTestUser 
    24 #username: gabriel 
     23#username: sstljakTestUser 
     24username: gabriel 
    2525passphrase: 
    2626 
    2727[test3Info] 
    28 #username: sstljakTestUser 
    29 username: gabriel 
     28username: sstljakTestUser 
     29#username: gabriel 
    3030ownerCertFile: ./proxy-cert.pem 
    3131ownerKeyFile: ./proxy-key.pem 
     
    3333 
    3434[test4ChangePassphrase] 
    35 #username: sstljakTestUser 
    36 username: gabriel 
     35username: sstljakTestUser 
     36#username: gabriel 
    3737ownerCertFile: ./proxy-cert.pem 
    3838ownerKeyFile: ./proxy-key.pem 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg

    r2070 r2072  
    2323# Password protecting client private key - if omitted it will be prompted for 
    2424# from tty 
    25 clntprikeypwd =  
     25#clntprikeypwd =  
    2626 
    2727clntcertfilepath = ./clnt-cert.pem 
     
    3434  
    3535[test2CookieConnect]          
    36 username = sstljakTestUser 
    37 #username = gabriel 
     36#username = sstljakTestUser 
     37username = gabriel 
    3838#passphrase =  
    3939 
    4040[test3ProxyCertConnect]          
    41 username = sstljakTestUser 
    42 #username = gabriel 
     41#username = sstljakTestUser 
     42username = gabriel 
    4343#passphrase =  
    4444 
Note: See TracChangeset for help on using the changeset viewer.