Ignore:
Timestamp:
26/01/07 10:44:13 (13 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/ndg/security/server/AttAuthority/server-config.tac:
update to file header.

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

  • setPropFilePath val input is now a keyword
  • readProperties - removed propFilePath keyword - set from propFilePath property /

setPropFilePath method instead.

python/ndg.security.server/ndg/security/server/AttAuthority/start-container.sh:
added standard header

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

  • updated header
  • removed hard coded cert file paths
  • set port number from properties file instead.

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

  • change all refs to sessMgrWSDLuri -> sessMgrURI and encrSessMgrWSDLuri -> encrSessMgrURI. For ZSI 2.0, it's the URI of the service that is important. The URI of the WSDL is not required.
  • changed keyPPhrase property to keyPwd
  • added setPropFilePath and propFilePath property, added class variable to make up properties file path from $NDG_DIR.
  • removed propFilePath keyword from readProperties method - use setPropFilePath() / propFilePath property instead.
  • renamed reqAuthorisation method getAttCert to avoid confusion with authorisation function performed by Gatekeeper.

python/ndg.security.server/ndg/security/server/SessionMgr/start-container.sh: added
standard header

python/ndg.security.server/ndg/security/server/SessionMgr/Makefile: create server side
stubs calling wsdl2dispatch and sed to convert to correct imports and stub methods
return types for Twisted.

python/www/html/sessionMgr.wsdl,
python/ndg.security.server/ndg/security/server/SessionMgr/SessionMgr_services_server.py,
python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services.py,
python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services_types.py:

  • renamed reqAuthorisation operations to getAttCert to avoid confusion with authorisation performed by the Gatekeeper.

python/conf/sessionMgrProperties.xml: renamed property keyPPhrase -> keyPwd

python/ndg.security.client/ndg/security/client/ndgSessionClient.py: changed refs from
WSDL URI and URI for Session Manager address. For ZSI 2.0, the URI of service is needed
alone, not the WSLD address.

python/ndg.security.test/ndg/security/test/AttAuthority/siteAServer.sh,
python/ndg.security.test/ndg/security/test/AttAuthority/siteBServer.sh: updates to headers

python/ndg.security.test/ndg/security/test/AttAuthority/README and
python/ndg.security.test/ndg/security/test/SessionMgr/README: added to explain setup for
running services for clients to connect to.

python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py and
python/ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg:
refs to 'ReqAuthorisation?' changed to 'getAttCert' - see above.

python/ndg.security.test/ndg/security/test/SessionMgr/server.sh: script to start
Session Manager for client unit tests.

python/ndg.security.common/ndg/security/common/AttAuthority/README,
python/ndg.security.common/ndg/security/common/SessionMgr/README: include instruction to
use Makefile.

python/ndg.security.common/ndg/security/common/Log
python/ndg.security.common/ndg/security/common/Log/log_services_server.py
python/ndg.security.common/ndg/security/common/Log/log_services.py
python/ndg.security.common/ndg/security/common/ca/init.py
python/ndg.security.common/ndg/security/common/ca/simpleCA_services.py
python/ndg.security.common/ndg/security/common/ca/CertReq.py
python/ndg.security.common/ndg/security/common/Gatekeeper
python/ndg.security.common/ndg/security/common/Gatekeeper/TestGatekeeperResrc.py
python/ndg.security.common/ndg/security/common/Gatekeeper/Gatekeeper.py
python/ndg.security.common/ndg/security/common/Gatekeeper/gatekeeper_services.py
python/ndg.security.common/ndg/security/common/Gatekeeper/gatekeeper_services_server.py:
rearranged old Log and Gatekeeper service code into their own packages. Moved
CertReq?.py and simpleCA_services.py into ca package.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteAServer.sh

    r2041 r2058  
    55# Attribute Authority client unit test - start server 
    66# 
    7 #@author P J Kershaw 29/07/05 
     7#@author P J Kershaw 24/01/07 
    88#                                                                                 
    99#@copyright (C) 2007 CCLRC & NERC 
     
    1111#@licence: This software may be distributed under the terms of the Q Public  
    1212# License, version 1.0 or later. 
     13# 
     14# $Id:$ 
    1315export NDGSEC_AA_PROPFILEPATH=${PWD}/siteAAttAuthorityProperties.xml 
    1416export NDGSEC_AA_UNITTEST_DIR=${PWD} 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteBServer.sh

    r2041 r2058  
    55# Attribute Authority client unit test - start server 
    66# 
    7 #@author P J Kershaw 29/07/05 
     7#@author P J Kershaw 24/01/07 
    88#                                                                                 
    99#@copyright (C) 2007 CCLRC & NERC 
     
    1111#@licence: This software may be distributed under the terms of the Q Public  
    1212# License, version 1.0 or later. 
     13# 
     14# $Id:$ 
    1315export NDGSEC_AA_PROPFILEPATH=${PWD}/siteBAttAuthorityProperties.xml 
    1416export NDGSEC_AA_UNITTEST_DIR=${PWD} 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py

    r1999 r2058  
    124124 
    125125 
    126     def test6CookieReqAuthorisation(self): 
    127         """test6CookieReqAuthorisation: make an authorisation request using 
     126    def test6CookieGetAttCert(self): 
     127        """test6CookieGetAttCert: make an authorisation request using 
    128128        a cookie as authentication credential""" 
    129129 
    130         print "\n\t" + self.test6CookieReqAuthorisation.__doc__         
     130        print "\n\t" + self.test6CookieGetAttCert.__doc__         
    131131        self.test2CookieConnect() 
    132132        attCert, statusCode, extAttCertList = self.clnt.reqAuthorisation(\ 
    133133            sessID=self.sessCookie.sessionID,  
    134             attAuthorityURI=self.cfg['test6CookieReqAuthorisation']['aauri'], 
     134            attAuthorityURI=self.cfg['test6CookieGetAttCert']['aauri'], 
    135135            encrSessionMgrURI=self.sessCookie.encrSessionMgrURI) 
    136136         
     
    140140 
    141141 
    142     def test6aCookieReqAuthorisationWithExtAttCertList(self): 
    143         """test6CookieReqAuthorisation: make an authorisation request using 
     142    def test6aCookieGetAttCertWithExtAttCertList(self): 
     143        """test6CookieGetAttCert: make an authorisation request using 
    144144        a cookie as authentication credential""" 
    145145         
    146         print "\n\t" + self.test6aCookieReqAuthorisationWithExtAttCertList.__doc__         
     146        print "\n\t" + self.test6aCookieGetAttCertWithExtAttCertList.__doc__         
    147147        self.test2CookieConnect() 
    148148         
    149149        aaURI = \ 
    150             self.cfg['test6aCookieReqAuthorisationWithExtAttCertList']['aauri'] 
     150            self.cfg['test6aCookieGetAttCertWithExtAttCertList']['aauri'] 
    151151             
    152152        attCert, statusCode, extAttCertList = self.clnt.reqAuthorisation(\ 
     
    161161 
    162162 
    163     def test7ProxyCertReqAuthorisation(self): 
    164         """test7ProxyCertReqAuthorisation: make an authorisation request using 
     163    def test7ProxyCertGetAttCert(self): 
     164        """test7ProxyCertGetAttCert: make an authorisation request using 
    165165        a proxy cert as authentication credential""" 
    166         print "\n\t" + self.test7ProxyCertReqAuthorisation.__doc__ 
     166        print "\n\t" + self.test7ProxyCertGetAttCert.__doc__ 
    167167        self.test3ProxyCertConnect() 
    168168         
     
    170170        # using the proxyCert returned from connect() 
    171171         
    172         aaURI = self.cfg['test7ProxyCertReqAuthorisation']['aauri'] 
     172        aaURI = self.cfg['test7ProxyCertGetAttCert']['aauri'] 
    173173        attCert, statusCode, extAttCertList = self.clnt.reqAuthorisation(\ 
    174174                                                 proxyCert=self.proxyCert, 
     
    198198                    "test4CookieDisconnect", 
    199199                    "test5ProxyCertDisconnect", 
    200                     "test6CookieReqAuthorisation", 
    201                     "test6aCookieReqAuthorisationWithExtAttCertList", 
    202                     "test7ProxyCertReqAuthorisation", 
     200                    "test6CookieGetAttCert", 
     201                    "test6aCookieGetAttCertWithExtAttCertList", 
     202                    "test7ProxyCertGetAttCert", 
    203203                    "test8GetX509Cert", 
    204204                  )) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg

    r1999 r2058  
    77# This software may be distributed under the terms of the Q Public License, 
    88# version 1.0 or later. 
     9# 
     10# $Id:$ 
    911[setUp] 
    1012smuri = https://localhost:5700/SessionManager 
     
    4042#passphrase =  
    4143 
    42 [test6CookieReqAuthorisation] 
     44[test6CookieGetAttCert] 
    4345aaURI = https://localhost:5000/AttributeAuthority 
    4446 
    45 [test6aCookieReqAuthorisationWithExtAttCertList] 
     47[test6aCookieGetAttCertWithExtAttCertList] 
    4648aaURI = https://localhost:5000/AttributeAuthority 
    4749 
    48 [test7ProxyCertReqAuthorisation] 
     50[test7ProxyCertGetAttCert] 
    4951aaURI = https://localhost:5000/AttributeAuthority 
    5052 
Note: See TracChangeset for help on using the changeset viewer.