Changeset 3832 for TI12-security

Timestamp:

30/04/08 17:09:59 (12 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:

• AttAuthority/AttAuthority_services.py (modified) (6 diffs)
• AttAuthority/Makefile (modified) (1 diff)
• SessionMgr/Makefile (modified) (1 diff)
• SessionMgr/SessionMgr_services.py (modified) (6 diffs)
• zsi_utils (added)
• zsi_utils/__init__.py (added)
• zsi_utils/urllib2client.py (added)

TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/AttAuthority_services.py

@@ -8 +8 @@
 import urlparse, types
 from ZSI.TCcompound import ComplexType, Struct
-from ZSI import client
+from ndg.security.common.zsi_utils import urllib2client as client
 import ZSI
 from ZSI.generate.pyclass import pyclass_type
@@ -29 +29 @@
         # no ws-addressing
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x407731ac>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a3dec>
     def getAttCert(self, userId,userCert,userAttCert):
 
@@ -46 +46 @@
         return attCert,msg
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077362c>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a812c>
     def getHostInfo(self):
 
@@ -64 +64 @@
         return hostname,aaURI,aaDN,loginURI,loginServerDN,loginRequestServerDN
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077b3cc>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a8d8c>
     def getTrustedHostInfo(self, role):
 
@@ -78 +78 @@
         return trustedHosts
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077b56c>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a8f2c>
     def getAllHostsInfo(self):
 
@@ -91 +91 @@
         return hosts
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4077b6ec>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84b20cc>
     def getX509Cert(self):
 

TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/Makefile

@@ -17 +17 @@
 OPTS=-be -f
 
+STUB_FILE=AttAuthority_services.py
+TMP_FILE=AttAuthority_services.tmp
+
+ORIG1=from ZSI import client
+REPL1=from ndg.security.common.zsi_utils import urllib2client as client
+
 generateStubs: ${WSDL_FILE}
+        @echo Generate stub ...
         ${CMD} ${OPTS} ${WSDL_FILE}
+        @echo Make substitutions for HTTP Proxy custom Client Binding class fix ...
+        cat ${STUB_FILE}|sed  s/"${ORIG1}"/"${REPL1}"/g > ${TMP_FILE}
+        @mv ${TMP_FILE} ${STUB_FILE}
+        @echo Done.
+        

TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/Makefile

@@ -17 +17 @@
 OPTS=-be -f
 
+STUB_FILE=SessionMgr_services.py
+TMP_FILE=SessionMgr_services.tmp
+
+ORIG1=from ZSI import client
+REPL1=from ndg.security.common.zsi_utils import urllib2client as client
+
 generateStubs: ${WSDL_FILE}
+        @echo Generate stub ...
         ${CMD} ${OPTS} ${WSDL_FILE}
+        @echo Make substitutions for HTTP Proxy custom Client Binding class fix ...
+        cat ${STUB_FILE}|sed  s/"${ORIG1}"/"${REPL1}"/g > ${TMP_FILE}
+        @mv ${TMP_FILE} ${STUB_FILE}
+        @echo Done.
+        

TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services.py

@@ -8 +8 @@
 import urlparse, types
 from ZSI.TCcompound import ComplexType, Struct
-from ZSI import client
+from ndg.security.common.zsi_utils import urllib2client as client
 import ZSI
 from ZSI.generate.pyclass import pyclass_type
@@ -29 +29 @@
         # no ws-addressing
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x407533cc>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a844c>
     def getSessionStatus(self, userDN,sessID):
 
@@ -44 +44 @@
         return isAlive
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075382c>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84a874c>
     def connect(self, username,passphrase,createServerSess):
 
@@ -63 +63 @@
         return userCert,userPriKey,issuingCert,sessID
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075a66c>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84af46c>
     def disconnect(self, userCert,sessID):
 
@@ -77 +77 @@
         return 
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075a80c>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84af60c>
     def getAttCert(self, userCert,sessID,attAuthorityURI,attAuthorityCert,reqRole,mapFromTrustedHosts,rtnExtAttCertList,extAttCert,extTrustedHost):
 
@@ -101 +101 @@
         return attCert,msg,extAttCertOut
 
-    # op: <ZSI.wstools.WSDLTools.Message instance at 0x4075a98c>
+    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84af78c>
     def getX509Cert(self):