Changeset 3832


Ignore:
Timestamp:
30/04/08 17:09:59 (11 years ago)
Author:
pjkersha
Message:

Use extended version of ZSI.client.Binding to enable SOAP clients to see through HTTP proxies. Re-tested AA and SM unit tests.

ndg.security.common/ndg/security/common/zsi_utils/urllib2client.py: urllib2 version of ZSI.client.Binding class to enable clients to talk through HTTP proxies. This manifests in calls from RAL to other partner site services.

ndg.security.common/ndg/security/common/SessionMgr/Makefile,
ndg.security.common/ndg/security/common/AttAuthority/Makefile:
When generating stub substitute ZSI.client import with urllib2client for reasons of above.

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

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services.py

    r3044 r3832  
    88import urlparse, types 
    99from ZSI.TCcompound import ComplexType, Struct 
    10 from ZSI import client 
     10from ndg.security.common.zsi_utils import urllib2client as client 
    1111import ZSI 
    1212from ZSI.generate.pyclass import pyclass_type 
     
    2929        # no ws-addressing 
    3030 
    31     # op: <ZSI.wstools.WSDLTools.Message instance at 0x407731ac> 
     31    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a3dec> 
    3232    def getAttCert(self, userId,userCert,userAttCert): 
    3333 
     
    4646        return attCert,msg 
    4747 
    48     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077362c> 
     48    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a812c> 
    4949    def getHostInfo(self): 
    5050 
     
    6464        return hostname,aaURI,aaDN,loginURI,loginServerDN,loginRequestServerDN 
    6565 
    66     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077b3cc> 
     66    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a8d8c> 
    6767    def getTrustedHostInfo(self, role): 
    6868 
     
    7878        return trustedHosts 
    7979 
    80     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077b56c> 
     80    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a8f2c> 
    8181    def getAllHostsInfo(self): 
    8282 
     
    9191        return hosts 
    9292 
    93     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077b6ec> 
     93    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84b20cc> 
    9494    def getX509Cert(self): 
    9595 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/Makefile

    r2036 r3832  
    1717OPTS=-be -f 
    1818 
     19STUB_FILE=AttAuthority_services.py 
     20TMP_FILE=AttAuthority_services.tmp 
     21 
     22ORIG1=from ZSI import client 
     23REPL1=from ndg.security.common.zsi_utils import urllib2client as client 
     24 
    1925generateStubs: ${WSDL_FILE} 
     26        @echo Generate stub ... 
    2027        ${CMD} ${OPTS} ${WSDL_FILE} 
     28        @echo Make substitutions for HTTP Proxy custom Client Binding class fix ... 
     29        cat ${STUB_FILE}|sed  s/"${ORIG1}"/"${REPL1}"/g > ${TMP_FILE} 
     30        @mv ${TMP_FILE} ${STUB_FILE} 
     31        @echo Done. 
     32         
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/Makefile

    r2510 r3832  
    1717OPTS=-be -f 
    1818 
     19STUB_FILE=SessionMgr_services.py 
     20TMP_FILE=SessionMgr_services.tmp 
     21 
     22ORIG1=from ZSI import client 
     23REPL1=from ndg.security.common.zsi_utils import urllib2client as client 
     24 
    1925generateStubs: ${WSDL_FILE} 
     26        @echo Generate stub ... 
    2027        ${CMD} ${OPTS} ${WSDL_FILE} 
     28        @echo Make substitutions for HTTP Proxy custom Client Binding class fix ... 
     29        cat ${STUB_FILE}|sed  s/"${ORIG1}"/"${REPL1}"/g > ${TMP_FILE} 
     30        @mv ${TMP_FILE} ${STUB_FILE} 
     31        @echo Done. 
     32         
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services.py

    r3145 r3832  
    88import urlparse, types 
    99from ZSI.TCcompound import ComplexType, Struct 
    10 from ZSI import client 
     10from ndg.security.common.zsi_utils import urllib2client as client 
    1111import ZSI 
    1212from ZSI.generate.pyclass import pyclass_type 
     
    2929        # no ws-addressing 
    3030 
    31     # op: <ZSI.wstools.WSDLTools.Message instance at 0x407533cc> 
     31    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a844c> 
    3232    def getSessionStatus(self, userDN,sessID): 
    3333 
     
    4444        return isAlive 
    4545 
    46     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075382c> 
     46    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a874c> 
    4747    def connect(self, username,passphrase,createServerSess): 
    4848 
     
    6363        return userCert,userPriKey,issuingCert,sessID 
    6464 
    65     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075a66c> 
     65    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84af46c> 
    6666    def disconnect(self, userCert,sessID): 
    6767 
     
    7777        return  
    7878 
    79     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075a80c> 
     79    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84af60c> 
    8080    def getAttCert(self, userCert,sessID,attAuthorityURI,attAuthorityCert,reqRole,mapFromTrustedHosts,rtnExtAttCertList,extAttCert,extTrustedHost): 
    8181 
     
    101101        return attCert,msg,extAttCertOut 
    102102 
    103     # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075a98c> 
     103    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84af78c> 
    104104    def getX509Cert(self): 
    105105 
Note: See TracChangeset for help on using the changeset viewer.