Changeset 6578 for TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/soap/client.py

Timestamp:

16/02/10 16:11:08 (11 years ago)

Author:

pjkersha

Message:

• Important fix for SOAP client used with SAML SOAP binding: set text/xml content type.
• Refactored SAML SOAP binding query clients.

File:

• TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/soap/client.py (modified) (4 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/soap/client.py

@@ -137 +137 @@
     def __init__(self):
         self.__fileobject = None
-
-    def _getFileobject(self):
+        
+    @property
+    def fileobject(self):
+        "urllib2 file object returned from request"
         return self.__fileobject
-
-    fileobject = property(fget=_getFileobject,
-                          doc="urllib2 file object returned from request")
 
     
 class UrlLib2SOAPClient(SOAPClientBase):
     """urllib2 based SOAP Client"""
+    DEFAULT_HTTP_HEADER = {'Content-type': 'text/xml'}
     
     def __init__(self):
@@ -154 +154 @@
         self.__openerDirector.add_handler(urllib2.HTTPHandler())
         self.__timeout = None
+        self.__httpHeader = UrlLib2SOAPClient.DEFAULT_HTTP_HEADER.copy()
+
+    def _getHttpHeader(self):
+        return self.__httpHeader
+
+    def _setHttpHeader(self, value):
+        if not isinstance(value, dict):
+            raise TypeError('Expecting dict type for "httpHeader" attribute; '
+                            'got %r instead' % type(value))
+        self.__httpHeader = value
+
+    httpHeader = property(_getHttpHeader, _setHttpHeader, 
+                          doc="Set HTTP header fields in this dict object")
 
     def _getTimeout(self):
@@ -203 +216 @@
             
         soapRequestStr = soapRequest.envelope.serialize()
-        
-        if log.level <= logging.DEBUG:
+
+        if log.getEffectiveLevel() <= logging.DEBUG:
             from ndg.security.common.utils.etree import prettyPrint
             log.debug("SOAP Request:")
@@ -211 +224 @@
 
         soapResponse = UrlLib2SOAPResponse()
-        response = self.openerDirector.open(soapRequest.url, 
+        urllib2Request = urllib2.Request(soapRequest.url) 
+        for i in self.httpHeader.items():
+            urllib2Request.add_header(*i)
+            
+        response = self.openerDirector.open(urllib2Request, 
                                             soapRequestStr, 
                                             *arg)
         if response.code != httplib.OK:
-            output = response.read()
             excep = HTTPException("Response for request to [%s] is: %d %s" % 
                                   (soapRequest.url,