Changeset 4262 for TI12-security


Ignore:
Timestamp:
01/10/08 15:33:44 (11 years ago)
Author:
pjkersha
Message:

change references ndg.security.common.zsi_utils -> " " ".zsi

Location:
TI12-security/trunk/python
Files:
1 added
1 deleted
10 edited
1 moved

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/Tests/etreewss/client/echoClientTest.py

    r4129 r4262  
    2020mkPath = lambda file: jnPath(os.environ['NDGSEC_WSSECLNT_UNITTEST_DIR'], file) 
    2121 
    22 from ndg.security.common.zsi_utils.elementtreeproxy import ElementTreeProxy 
     22from ndg.security.common.zsi.elementtreeproxy import ElementTreeProxy 
    2323 
    2424import logging 
  • TI12-security/trunk/python/Tests/etreewss/server/echoServer.py

    r4129 r4262  
    1818 
    1919from ndg.security.common.wssecurity.etree import SignatureHandler 
    20 from ndg.security.common.zsi_utils.elementtreeproxy import ElementTreeProxy 
     20from ndg.security.common.zsi.elementtreeproxy import ElementTreeProxy 
    2121 
    2222from os.path import expandvars as xpdVars 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/__init__.py

    r4129 r4262  
    3838    HostCheck 
    3939 
    40 from ndg.security.common.zsi_utils.httpproxy import ProxyHTTPConnection 
     40from ndg.security.common.zsi.httpproxy import ProxyHTTPConnection 
    4141 
    4242import logging 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/__init__.py

    r4129 r4262  
    2828from ndg.security.common.m2CryptoSSLUtility import HTTPSConnection, \ 
    2929    HostCheck 
    30 from ndg.security.common.zsi_utils.httpproxy import ProxyHTTPConnection 
     30from ndg.security.common.zsi.httpproxy import ProxyHTTPConnection 
    3131from SessionMgr_services import SessionMgrServiceLocator 
    3232 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/__init__.py

    r4131 r4262  
    3030    'X509', 
    3131    'XMLSec', 
    32     'zsi_utils' 
     32    'zsi' 
    3333    ] 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/utils/ClassFactory.py

    r4245 r4262  
    6464                           
    6565                sys.path.append(moduleFilePath) 
     66 
     67#            from paste.util.import_string import eval_import 
     68#            mod = eval_import(moduleName) 
    6669             
    6770            # Import module name specified in properties file 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/etree.py

    r4233 r4262  
    6262 
    6363# Check SoapWriter.dom attribute is ElementTreeProxy type 
    64 from ndg.security.common.zsi_utils.elementtreeproxy import ElementTreeProxy 
     64from ndg.security.common.zsi.elementtreeproxy import ElementTreeProxy 
    6565 
    6666from ndg.security.common.X509 import X509Cert, X509CertParse, X509CertRead, \ 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/sessionmanager/__init__.py

    r4256 r4262  
    1 """ZSI Server side SOAP Binding for Attribute Authority Web Service 
     1"""ZSI Server side SOAP Binding for Session Manager Web Service 
    22 
    33NERC Data Grid Project""" 
    44__author__ = "P J Kershaw" 
    5 __date__ = "11/06/08" 
     5__date__ = "01/10/08" 
    66__copyright__ = "(C) 2008 STFC & NERC" 
    77__license__ = \ 
     
    1616 
    1717 
    18 from ndg.security.server.zsi.attributeauthority.SessionMgr_services_server \ 
     18from ndg.security.server.zsi.sessionmanager.SessionMgr_services_server \ 
    1919    import SessionMgrService as _SessionMgrService 
    2020 
     
    118118         
    119119        response.IsAlive = self.sm.getSessionStatus(userDN=request.UserDN, 
    120                                                      sessID=request.SessID) 
     120                                                    sessID=request.SessID) 
    121121                  
    122122        return response 
     
    155155        # Cert used in signature is prefered over userCert input element -  
    156156        # userCert may have been omitted. 
    157         result = self.sm.getAttCert(\ 
     157        result = self.sm.getAttCert( 
    158158                            userCert=userCert or request.UserCert, 
    159159                            sessID=request.SessID, 
     
    164164                            extAttCertList=request.ExtAttCert, 
    165165                            extTrustedHostList=request.ExtTrustedHost) 
    166  
    167166 
    168167        if result[0]: 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/wsgi/session-manager.ini

    r4260 r4262  
    3030# Directory containing CA cert.s to verify SSL peer cert against - ignored if  
    3131# useSSL is blank  
    32 sessionmanager.sslCACertDir: $NDGSEC_AACLNT_UNITTEST_DIR//certs/ca 
     32sessionmanager.sslCACertDir: $NDGSEC_AACLNT_UNITTEST_DIR/certs/ca 
    3333  
    3434# Domain defaults to the server host - any more generic setting could be a  
     
    5050 
    5151 
    52 [filter:AttributeAuthorityFilter] 
     52[filter:SessionManagerFilter] 
    5353paste.filter_app_factory = ndg.security.server.wsgi.soap:SOAPBindingMiddleware 
    54 ServiceSOAPBindingClass = ndg.security.server.zsi.attributeauthority.AttributeAuthorityWS 
     54ServiceSOAPBindingClass = ndg.security.server.zsi.sessionmanager.SessionManagerWS 
    5555ServiceSOAPBindingPropPrefix = SessionManager 
    5656SessionManager.propPrefix = sessionmanager 
     
    8484# Certificate associated with private key used to sign a message.  The sign  
    8585# method will add this to the BinarySecurityToken element of the WSSE header.   
    86 #signingCertFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/sm.crt 
    87 signingCertFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/java-ca-server.crt 
     86signingCertFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/sm.crt 
     87#signingCertFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/java-ca-server.crt 
    8888 
    8989# PEM encoded private key file 
    90 #signingPriKeyFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/sm.key 
    91 signingPriKeyFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/java-ca-server.key 
     90signingPriKeyFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/sm.key 
     91#signingPriKeyFilePath=$NDGSEC_AACLNT_UNITTEST_DIR/java-ca-server.key 
    9292 
    9393# Set the ValueType for the BinarySecurityToken added to the WSSE header for a 
     
    112112 
    113113# Provide a space separated list of file paths 
    114 caCertFilePathList=$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/java-ca.crt 
     114caCertFilePathList=$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt  
     115#caCertFilePathList=$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/java-ca.crt 
    115116 
    116117 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/wsgi/sessionManagerServerApp.py

    r4260 r4262  
    11#!/usr/bin/env python 
    2 """NDG Security Attribute Authority test harness for unit test site 'A' 
     2"""NDG Security Session Manager test harness for client unit tests 
    33 
    44NERC Data Grid Project 
     
    88""" 
    99__author__ = "P J Kershaw" 
    10 __date__ = "24/09/08" 
     10__date__ = "29/09/08" 
    1111__copyright__ = "(C) 2008 STFC & NERC" 
    1212__contact__ = "P.J.Kershaw@rl.ac.uk" 
     
    1616def infoApp(environ, start_response): 
    1717    start_response('200 OK', [('Content-type', 'text/plain')]) 
    18     return "NDG Security Attribute Authority Unit Tests: Site A Server" 
     18    return "NDG Security Session Manager for Client Unit Tests" 
    1919 
    2020def app_factory(global_config, **local_conf): 
     
    3030    os.environ['NDGSEC_AA_PROPFILEPATH'] = \ 
    3131                        os.path.join(os.environ['NDGSEC_AACLNT_UNITTEST_DIR'], 
    32 #                                     "siteAAttAuthority.cfg") 
    33                                      "siteAAttAuthorityProperties.xml") 
     32#                                     "sessionMgr.cfg") 
     33                                     "sessionMgrProperties.xml") 
    3434 
    35 # To start the Site A Attribute Authority run  
     35# To start the Site A Session Manager run  
    3636# $ paster serve site-a.ini or run this file as a script 
    3737# $ ./siteAServerApp.py [port #] 
     
    4444        port = int(sys.argv[1]) 
    4545    else: 
    46         port = 5000 
     46        port = 5500 
    4747         
    4848    cfgFilePath = os.path.join(os.path.dirname(os.path.abspath(__file__)), 
    49                                'site-a.ini') 
     49                               'session-manager.ini') 
    5050         
    5151    from paste.httpserver import serve 
Note: See TracChangeset for help on using the changeset viewer.