Changeset 2350


Ignore:
Timestamp:
30/03/07 09:57:04 (12 years ago)
Author:
pjkersha
Message:

ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml,
ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml,
ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg:
minor changes to test settings

ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py:
remove debug statements

Tests/dewsBinaryDataGet/binaryDataGet.py: set URI for command line

ndg.security.common/ndg/security/common/wsSecurity.py: if not in PEM format, remove any whitespace for
where the encoded cert has multiple line breaks.

Location:
TI12-security/trunk/python
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wsSecurity.py

    r2322 r2350  
    584584        @param parsedSOAP: object contain parsed SOAP message received from 
    585585        sender""" 
    586 #        import pdb;pdb.set_trace() 
    587 #        import xml.dom.expatbuilder 
    588 #        parsedSOAP.dom = xml.dom.expatbuilder.parse(\ 
    589 #'/home/pjkersha/Development/security/python/Tests/bmtTests/SOAPMessage_21-Mar-2007.txt') 
     586 
    590587        processorNss = \ 
    591588        { 
     
    750747                x509CertTxt=str(binSecTokNode.childNodes[0]._get_nodeValue()) 
    751748                 
    752                 # Convert parsed cert text into form that can be read 
     749                # Convert parsed cert text into PEM form that can be read 
    753750                # by X.509 string parser 
     751                # 
     752                # Check for line breaks at 64th byte as expected for PEM  
     753                # encoding 
    754754                if x509CertTxt[64] != "\n": 
     755                    # Check for other whitespace and reomve  
    755756                    # Expecting cert split into lines of length 64 bytes 
     757                    x509CertTxt = re.sub('\s', '', x509CertTxt) 
     758                     
     759                    # Split into lines of length 64 
    756760                    x509CertSpl = re.split('(.{64})', x509CertTxt) 
    757761                    x509CertTxt = '\n'.join([i for i in x509CertSpl if i]) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/AttAuthorityClientTest.py

    r2289 r2350  
    9797            raise "Error reading certificate file \"%s\": %s" % \ 
    9898                                    (ioErr.filename, ioErr.strerror) 
    99         import pdb;pdb.set_trace() 
    10099 
    101100        # Make attribute certificate request 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg

    r2289 r2350  
    1212uri = http://localhost:5000/AttributeAuthority 
    1313#uri = https://localhost:5000/AttributeAuthority 
     14#uri = http://glue.badc.rl.ac.uk/DEWS/MarineDataServer/AttributeAuthority 
    1415#uri = http://glue.badc.rl.ac.uk/DEWS/Portal/AttributeAuthority 
    1516#uri = http://glue.badc.rl.ac.uk:41000/AttributeAuthority 
     
    2223# from tty 
    2324#userprikeypwd =  
    24 #usercertfilepath = ./proxy-cert.pem 
    25 #userprikeyfilepath = ./proxy-key.pem 
     25usercertfilepath = ./proxy-cert.pem 
     26userprikeyfilepath = ./proxy-key.pem 
    2627 
    2728[test3GetTrustedHostInfo] 
     
    3637 
    3738# Test with no digital signature applied 
    38 issuingusercertfilepath = ./proxy-cert.pem 
     39#issuingusercertfilepath = ./proxy-cert.pem 
    3940# Setup for use by testGetMappedAttCert test 
    4041attCertFilePath = ./ac.xml 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml

    r2289 r2350  
    66    <sslCertFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</sslCertFile> 
    77    <sslKeyFile>$NDGSEC_AA_UNITTEST_DIR/aa-key.pem</sslKeyFile> 
    8     <sslKeyPwd>Junk</sslKeyPwd> 
    9     <useSignatureHandler></useSignatureHandler> <!-- leave blank for no signature --> 
     8    <sslKeyPwd></sslKeyPwd> 
     9    <useSignatureHandler>Yes</useSignatureHandler> <!-- leave blank for no signature --> 
    1010    <certFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</certFile> 
    1111    <keyFile>$NDGSEC_AA_UNITTEST_DIR/aa-key.pem</keyFile> 
    12     <keyPwd>Junk</keyPwd> 
     12    <keyPwd></keyPwd> 
    1313    <caCertFile>$NDGSEC_AA_UNITTEST_DIR/cacert.pem</caCertFile> 
    1414    <!--  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml

    r2289 r2350  
    66    <sslCertFile></sslCertFile> 
    77    <sslKeyFile></sslKeyFile> 
    8     <sslKeyPwd>Junk</sslKeyPwd> 
     8    <sslKeyPwd></sslKeyPwd> 
    99    <useSignatureHandler>Yes</useSignatureHandler> <!-- leave blank for no signature --> 
    1010    <certFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</certFile> 
    1111    <caCertFile>$NDGSEC_AA_UNITTEST_DIR/cacert.pem</caCertFile> 
    1212    <keyFile>$NDGSEC_AA_UNITTEST_DIR/aa-key.pem</keyFile> 
    13     <keyPwd>Junk</keyPwd> 
     13    <keyPwd></keyPwd> 
    1414    <!--  
    1515    Set the certificate used to verify the signature of messages from the  
Note: See TracChangeset for help on using the changeset viewer.