Changeset 2146


Ignore:
Timestamp:
12/02/07 15:43:50 (12 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/ndg/security/server/ca/server-config.tac: fixes to imports
and instantiate self.ca as SimpleCA type.

python/ndg.security.server/ndg/security/server/ca/Makefile,
python/ndg.security.server/ndg/security/server/ca/CertificateAuthority_services_server.py: fixed import from CertificateAuthority? -> ca

python/conf/simpleCAProperties.xml,
python/ndg.security.test/ndg/security/test/ca/simpleCAProperties.xml: fixed path setting
and added PKI settings to test version.

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

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/conf/simpleCAProperties.xml

    r2145 r2146  
    3232    <!-- Directory for temporary files generated during processing --> 
    3333    <certTmpDir>/tmp<certTmpDir/> 
    34     <caCertFile></caCertFile> 
    3534    <!-- Executable for checking the CA pass-phrase set --> 
    3635    <chkCAPassPhraseExe>openssl</chkCAPassPhraseExe> 
    3736    <!-- Executable for signing certificate request --> 
    3837    <signExe>grid-ca-sign</signExe> 
    39     <!-- Set ':' paths for executables --> 
    40     <path>$GLOBUS_LOCATION/bin</> 
     38    <!-- Set ':' paths for executables  
     39    /usr/bin and /bin are required by grep and ? used in grid-ca-sign script  
     40    --> 
     41    <path>$GLOBUS_LOCATION/bin:/usr/bin:/bin</path> 
    4142</simpleCAProp> 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/ca/CertificateAuthority_services_server.py

    r2136 r2146  
    55################################################## 
    66 
    7 from ndg.security.common.CertificateAuthority.CertificateAuthority_services import * 
     7from ndg.security.common.ca.CertificateAuthority_services import * 
    88from ZSI.ServiceContainer import ServiceSOAPBinding 
    99 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/ca/Makefile

    r2145 r2146  
    2323REPL1=return self.request, result 
    2424ORIG2=from CertificateAuthority_services import 
    25 REPL2=from ndg.security.common.CertificateAuthority.CertificateAuthority_services import 
     25REPL2=from ndg.security.common.ca.CertificateAuthority_services import 
    2626 
    2727generateStubs: ${WSDL_FILE} 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/ca/server-config.tac

    r2145 r2146  
    2222 
    2323from CertificateAuthority_services_server import CertificateAuthorityService 
    24 from ndg.security.server.CertificateAuthority import CertificateAuthority 
     24from ndg.security.server.ca import SimpleCA 
    2525from ndg.security.common.wsSecurity import WSSecurityHandlerChainFactory, \ 
    2626        WSSecurityHandler, SignatureHandler 
     
    3636          
    3737        # Initialize SimpleCA class  
    38         self.ca = CertificateAuthority() 
     38        self.ca = SimpleCA() 
    3939         
    4040    def soap_issueCert(self, ps, **kw): 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/ca/simpleCAProperties.xml

    r2145 r2146  
    33        <portNum>5800</portNum> 
    44    <useSSL>Yes</useSSL> <!-- leave blank to use http --> 
    5     <sslCertFile></sslCertFile> 
    6     <sslKeyFile></sslKeyFile> 
    7     <caCertFile></caCertFile> 
    8     <certFile></certFile> 
    9     <keyFile></keyFile> 
    10     <keyPwd></keyPwd> 
     5    <sslCertFile>$NDGSEC_CA_UNITTEST_DIR/srv-cert.pem</sslCertFile> 
     6    <sslKeyFile>$NDGSEC_CA_UNITTEST_DIR/srv-key.pem</sslKeyFile> 
     7    <caCertFile>$NDGSEC_CA_UNITTEST_DIR/cacert.pem</caCertFile> 
     8    <certFile>$NDGSEC_CA_UNITTEST_DIR/srv-cert.pem</certFile> 
     9    <keyFile>$NDGSEC_CA_UNITTEST_DIR/srv-key.pem</keyFile> 
     10    <keyPwd/> 
    1111    <!--  
    1212    Set the certificate used to verify the signature of messages from the  
     
    1919        required if cert request is passed into sign method 
    2020        --> 
    21     <openSSLConfigFilePath/> 
     21    <openSSLConfigFilePath>$GRID_SECURITY_DIR/globus-user-ssl.conf</> 
    2222    <certLifetimeDays>365<certLifetimeDays/> 
    2323    <!-- 
     
    2626    <!-- Directory for temporary files generated during processing --> 
    2727    <certTmpDir>/tmp<certTmpDir/> 
    28     <caCertFile/> 
    2928    <!-- Executable for checking the CA pass-phrase set --> 
    3029    <chkCAPassPhraseExe>openssl</chkCAPassPhraseExe> 
    3130    <!-- Executable for signing certificate request --> 
    3231    <signExe>grid-ca-sign<signExe/> 
    33     <!-- Set ':' paths for executables --> 
    34     <path>$GLOBUS_LOCATION/bin<path/> 
     32    <!-- Set ':' paths for executables  
     33    /usr/bin and /bin are required by grep and ? used in grid-ca-sign script  
     34    --> 
     35    <path>$GLOBUS_LOCATION/bin:/usr/bin:/bin<path/> 
    3536</simpleCAProp> 
Note: See TracChangeset for help on using the changeset viewer.