Changeset 2866


Ignore:
Timestamp:
31/08/07 17:02:05 (12 years ago)
Author:
pjkersha
Message:

ndg.security.server/ndg/security/server/AttAuthority/server-config.tac:
moved to ndg.security.server/ndg/security/server/conf/attAuthority.tac to
simplifier config for deployment.

ndg.security.server/ndg/security/server/ca/server-config.tac: likewise moved
to ndg.security.server/ndg/security/server/conf/ca.tac

ndg.security.server/ndg/security/server/SessionMgr/server-config.tac: moved
to ndg.security.server/ndg/security/server/conf/sessionMgr.tac

ndg.security.server/ndg/security/server/SessionMgr/init.py: fix to error
message for SessionMgr?.connect2UserSession.

ndg.security.test/ndg/security/test/AttAuthority/siteAServer.sh,
ndg.security.test/ndg/security/test/AttAuthority/siteBServer.sh,
ndg.security.test/ndg/security/test/SessionMgr/server.sh: AA unit test
script to start service - simplified for new location of .tac file in conf/

ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py,
ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg: fix
to test6cGetAttCertWithExtAttCertListUsingSessID - save AC from
test6GetAttCertUsingSessID test and use here.

Location:
TI12-security/trunk/python
Files:
3 added
3 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/__init__.py

    r2827 r2866  
    915915        else: 
    916916            raise SessionMgrError,\ 
    917                                 '"sessID" or "proxyCert" keywords must be set' 
     917                                '"sessID" or "userCert" keywords must be set' 
    918918                         
    919919        try: 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteAServer.sh

    r2058 r2866  
    1616export NDGSEC_AA_UNITTEST_DIR=${PWD} 
    1717 
    18 if [ -d ../../server/AttAuthority ]; then 
    19         SRV_DIR=../../server/AttAuthority 
     18EXEC=twistd  
     19OPTIONS="--pidfile=twistd-$$.pid -noy" 
     20TACFILE=attAuthority.tac 
    2021 
    21 elif [ -d ../../../../../ndg.security.server/ndg/security/server/AttAuthority ]; then 
    22         SRV_DIR=../../../../../ndg.security.server/ndg/security/server/AttAuthority 
    23 fi 
     22CONFIG=${NDGSEC_DIR}/conf/${TACFILE} 
    2423 
    25 cd $SRV_DIR  
    26 exec ./start-container.sh "$@" 
     24set - ${EXEC} ${OPTIONS} ${CONFIG} "$@" 
     25exec "$@" 
    2726 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteBServer.sh

    r2058 r2866  
    1616export NDGSEC_AA_UNITTEST_DIR=${PWD} 
    1717 
    18 if [ -d ../../server/AttAuthority ]; then 
    19         SRV_DIR=../../server/AttAuthority 
     18EXEC=twistd  
     19OPTIONS="--pidfile=twistd-$$.pid -noy" 
     20TACFILE=attAuthority.tac 
    2021 
    21 elif [ -d ../../../../../ndg.security.server/ndg/security/server/AttAuthority ]; then 
    22         SRV_DIR=../../../../../ndg.security.server/ndg/security/server/AttAuthority 
    23 fi 
     22CONFIG=${NDGSEC_DIR}/conf/${TACFILE} 
    2423 
    25 cd $SRV_DIR  
    26 exec ./start-container.sh "$@" 
     24set - ${EXEC} ${OPTIONS} ${CONFIG} "$@" 
     25exec "$@" 
    2726 
     27 
     28 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py

    r2746 r2866  
    224224            attAuthorityURI=self.cfg['test6GetAttCertUsingSessID']['aauri']) 
    225225         
    226         print "Attribute Certificate:\n%s" % attCert   
     226        print "Attribute Certificate:\n%s" % attCert  
     227        attCert.filePath = \ 
     228            self.cfg['test6GetAttCertUsingSessID']['acoutfilepath']  
     229        attCert.write() 
    227230 
    228231 
     
    263266 
    264267    def test6cGetAttCertWithExtAttCertListUsingSessID(self): 
    265         """test6GetAttCertUsingSessID: make an attribute request using 
     268        """test6cGetAttCertUsingSessID: make an attribute request using 
    266269        a session ID as authentication credential""" 
    267270         
     
    272275        aaURI = \ 
    273276            self.cfg['test6cGetAttCertWithExtAttCertListUsingSessID']['aauri'] 
    274              
     277         
     278        # Use output from test6GetAttCertUsingSessID! 
     279        extACFilePath = \ 
     280    self.cfg['test6cGetAttCertWithExtAttCertListUsingSessID']['extacfilepath']    
     281        extAttCert = open(extACFilePath).read() 
     282         
    275283        attCert = self.clnt.getAttCert(sessID=self.sessID,  
    276284                                       attAuthorityURI=aaURI, 
    277                                        extAttCertList=['AC1', 'AC2', 'AC3']) 
     285                                       extAttCertList=[extAttCert]) 
    278286           
    279287        print "Attribute Certificate:\n%s" % attCert   
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/server.sh

    r2063 r2866  
    33# NERC Data Grid Project 
    44#                                                                                 
    5 # Session Manager client unit test - start server 
     5# Attribute Authority client unit test - start server 
    66# 
    7 #@author P J Kershaw 25/01/07 
     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_SM_PROPFILEPATH=${PWD}/sessionMgrProperties.xml 
    1416export NDGSEC_SM_UNITTEST_DIR=${PWD} 
    1517 
    16 srvDir1=../../server/SessionMgr 
    17 srvDir2=../../../../../ndg.security.server/ndg/security/server/SessionMgr 
     18EXEC=twistd  
     19OPTIONS="--pidfile=twistd-$$.pid -noy" 
     20TACFILE=sessionMgr.tac 
    1821 
    19 if [ -d $srvDir1 ]; then 
    20         SRV_DIR=$srvDir1 
     22CONFIG=${NDGSEC_DIR}/conf/${TACFILE} 
    2123 
    22 elif [ -d $srvDir2 ]; then 
    23         SRV_DIR=$srvDir2 
    24 fi 
     24set - ${EXEC} ${OPTIONS} ${CONFIG} "$@" 
     25exec "$@" 
    2526 
    26 cd $SRV_DIR  
    27 exec ./start-container.sh "$@" 
    28  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg

    r2827 r2866  
    5656username = raphaelTest 
    5757#username = gabriel 
    58 #passphrase =  
     58passphrase =  
    5959 
    6060[test3ConnectNoCreateServerSess]          
    6161username = raphaelTest 
    6262#username = gabriel 
    63 #passphrase =  
     63passphrase =  
    6464 
    6565[test6GetAttCertUsingSessID] 
    6666aaURI = http://localhost:5000/AttributeAuthority 
     67acOutFilePath = ac-out.xml 
    6768 
    6869[test6aGetAttCertRefusedUsingSessID] 
     
    7475[test6cGetAttCertWithExtAttCertListUsingSessID] 
    7576aaURI = http://localhost:5100/AttributeAuthority 
     77# Use output from test6GetAttCertUsingSessID! 
     78extACFilePath = ac-out.xml 
    7679 
    7780[test7GetAttCertUsingProxyCert] 
    78 #aaURI = https://localhost:5000/AttributeAuthority 
    79 aaURI = http://glue.badc.rl.ac.uk/services/ndg/security/AttributeAuthority 
     81aaURI = http://localhost:5000/AttributeAuthority 
     82#aaURI = http://glue.badc.rl.ac.uk/services/ndg/security/AttributeAuthority 
Note: See TracChangeset for help on using the changeset viewer.