Ignore:
Timestamp:
10/01/08 14:45:59 (12 years ago)
Author:
pjkersha
Message:

security/architecture/uml/ndg2-dews-security-beta.eap: update from EA upgrade

security/python/ndg.security.client/setup.cfg,
security/python/ndg.security.common/setup.cfg,
security/python/ndg.security.server/setup.cfg,
security/python/ndg.security.test/setup.cfg,
security/python/setup.cfg: new release tag for OMII-UK 1st drop

security/python/ndg.security.server/ndg/security/server/MyProxy.py: iimprove error message for cert file not found - incl. CA cert.

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/README: addtional note about ensuring MYPROXY_SERVER env for server.py shell
security/python/ndg.security.test/ndg/security/test/sessionMgrClient/server.sh: deleted - server.py replaces it

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/SessionMgrClientTest.py: working version with test certs included in SVN and unit test env var refs.

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrProperties.xml: incl. default serverCNprefix elem setting

security/python/ndg.security.test/setup.py: important fixes to ensure test data and test certs are included in package data for egg.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/README

    r3195 r3196  
    3131 
    3232export MYPROXY_SERVER=myproxyhost.somewhere.uk 
     33 
     34If you use the environment variable it must be set in the shell in which you 
     35run the test Session Manager service - see step 4). 
    3336 
    34373) Edit sessionMgrClientTest.cfg and set the username for the MyProxy account  
     
    7477$ python ./server.py 
    7578 
     79Nb. If you've specified the MyProxy server host with the MYPROXY_SERVER  
     80environment variable, make sure it's set in this shell. 
     81 
    76825) Run the tests with the command: 
    7783 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/SessionMgrClientTest.py

    r3195 r3196  
    6464                os.path.abspath(os.path.dirname(__file__)) 
    6565         
    66         self.cfg = SafeConfigParser() 
     66        configParser = SafeConfigParser() 
    6767        configFilePath = jnPath(os.environ['NDGSEC_SMCLNT_UNITTEST_DIR'], 
    6868                                "sessionMgrClientTest.cfg") 
    69         self.cfg.read(configFilePath) 
     69        configParser.read(configFilePath) 
    7070         
    7171        self.cfg = {} 
     
    9696            sslCACertList = [] 
    9797           
    98         clntCertFilePath = self.cfg['setUp']['clntcertfilepath'] 
    99         clntPriKeyFilePath = self.cfg['setUp']['clntprikeyfilepath'] 
     98        clntCertFilePath = xpdVars(self.cfg['setUp']['clntcertfilepath']) 
     99        clntPriKeyFilePath = xpdVars(self.cfg['setUp']['clntprikeyfilepath']) 
    100100         
    101101        reqBinSecTokValType = self.cfg['setUp'].get('reqbinsectokvaltype') 
     
    154154                                                        (username, self.sessID) 
    155155             
    156         creds = self.issuingCert or '' + userCert + self.userPriKey 
     156        creds = self.issuingCert or '' + self.userCert + self.userPriKey 
    157157        open(mkPath("user.creds"), "w").write(creds) 
    158158             
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrClientTest.cfg

    r3195 r3196  
    6464cacertfilepathlist = $NDGSEC_SMCLNT_UNITTEST_DIR/ca/ndg-test-ca.crt 
    6565 
    66 [test1Connect]          
     66[test1Connect]  
    6767username = testuser 
    6868#passphrase = testpassword 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrProperties.xml

    r3195 r3196  
    5151                Useful if hostname and certificate CN don't match correctly.  Globus  
    5252                host DN is set to "host/<fqdn>".  Delete this element and set from  
    53                 MYPROXY_SERVER_DN environment variable if prefered 
    54                 <serverDN></serverDN> 
     53                MYPROXY_SERVER_DN environment variable if preferred 
     54                <serverDN>/O=NDG/OU=BADC/OU=Gabriel/CN=localhost</serverDN> 
    5555                --> 
    5656                <!-- 
    57                 Set "host/" prefix to host cert CN as is default with globus 
     57                Set "host/" prefix to host cert CN as is default with globus otherwise 
     58                client SSL peer cert check fails 
    5859                --> 
     60                <serverCNprefix>host/</serverCNprefix>   
    5961                <!-- 
    6062                This directory path is used to locate the OpenSSL configuration file 
Note: See TracChangeset for help on using the changeset viewer.