Ignore:
Timestamp:
08/03/07 17:12:22 (13 years ago)
Author:
pjkersha
Message:

ndg.security.server/setup.py:

ndg.security.server/setup.cfg:

  • removed EasyInstall? and build sections
  • reinstated tag_build - set to '_dews' - and tag_svn_revision

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

  • removed socket import and added os
  • added M2Crypto SSL support - works with Python client unit tests (required setting SSL v2 and 3 support)

but problems with WebSphere? client

ndg.security.server/ndg/security/server/AttAuthority/init.py,
ndg.security.server/ndg/security/server/conf/attAuthorityProperties.xml,
ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml,
ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml:

  • added sslKeyPwd setting for properties

ndg.security.server/ndg/security/server/MyProxy.py:

  • ensure cnHostPfx is reinitialised to if equal to None

ndg.security.common/setup.py:

  • added M2Crypto, ZSI and 4Suite to dependencies
  • revised dependency links to use NDG site, http://ndg.nerc.ac.uk/dist and ZSI sourceforge link taken

from pyGridWare settings. Latter won't work for PyXML but does work from command line ??

ndg.security.common/ndg/security/common/wsSecurity.py:

  • IMPORTANT FIX * - removed strip() from signed info digest calc - NOT needed and caused some problems

with verify.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
5 edited

Legend:

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

    r2178 r2251  
    4040               signingPriKeyFilePath=self.cfg['setUp']['userprikeyfilepath'], 
    4141               tracefile=sys.stderr) 
    42                     
    43     
     42             
    4443     
    4544    def test1GetX509Cert(self): 
    4645        '''test1GetX509Cert: retrieve Attribute Authority's X.509 cert.''' 
    47         #import pdb;pdb.set_trace() 
    4846        resp = self.clnt.getX509Cert() 
    4947        print "Attribute Authority X.509 cert.:\n" + resp 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg

    r2214 r2251  
    1010# ! SiteBMapConfig.xml trusted site A aaURI setting must agree with this  
    1111# setting for test6GetMappedAttCert 
    12 uri = http://localhost:5000/AttributeAuthority 
    13 uri = http://glue.badc.rl.ac.uk:41000/AttributeAuthority 
     12#uri = http://localhost:5000/AttributeAuthority 
     13uri = https://localhost:5000/AttributeAuthority 
    1414 
    1515# X.509 certificate for Attribute Authority - to verify the signature of 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml

    r2181 r2251  
    33    <name>Site A</name> 
    44    <portNum>5000</portNum> 
    5     <useSSL></useSSL> <!-- leave blank to use http --> 
    6     <sslCertFile></sslCertFile> 
    7     <sslKeyFile></sslKeyFile> 
     5    <useSSL>True</useSSL> <!-- leave blank to use http --> 
     6    <sslCertFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</sslCertFile> 
     7    <sslKeyFile>$NDGSEC_AA_UNITTEST_DIR/aa-key.pem</sslKeyFile> 
     8    <sslKeyPwd>Junk</sslKeyPwd> 
     9    <certFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</certFile> 
    810    <keyFile>$NDGSEC_AA_UNITTEST_DIR/aa-key.pem</keyFile> 
    911    <keyPwd>Junk</keyPwd> 
    10     <certFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</certFile> 
    1112    <caCertFile>$NDGSEC_AA_UNITTEST_DIR/cacert.pem</caCertFile> 
    1213    <!--  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml

    r2181 r2251  
    66    <sslCertFile></sslCertFile> 
    77    <sslKeyFile></sslKeyFile> 
     8    <sslKeyPwd>Junk</sslKeyPwd> 
     9    <certFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</certFile> 
     10    <caCertFile>$NDGSEC_AA_UNITTEST_DIR/cacert.pem</caCertFile> 
    811    <keyFile>$NDGSEC_AA_UNITTEST_DIR/aa-key.pem</keyFile> 
    912    <keyPwd>Junk</keyPwd> 
    10     <certFile>$NDGSEC_AA_UNITTEST_DIR/aa-cert.pem</certFile> 
    11     <caCertFile>$NDGSEC_AA_UNITTEST_DIR/cacert.pem</caCertFile> 
    1213    <!--  
    1314    Set the certificate used to verify the signature of messages from the  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/MyProxy/myProxyProperties.xml

    r2017 r2251  
    2020        Set "host/" prefix to host cert CN as is default with globus 
    2121        --> 
    22         <serverCNprefix>host/</serverCNprefix>   
     22        <serverCNprefix></serverCNprefix>        
    2323        <!-- 
    2424        Nb. GRID_SECURITY_DIR environment variable if set, overrides this setting 
Note: See TracChangeset for help on using the changeset viewer.