Changeset 7322

Timestamp:

13/08/10 15:17:22 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 2: XACML-Security Integration

• fixes to SOAP client bindings

Location:

TI12-security/trunk/ndg_saml/ndg/saml

Files:

• saml2/binding/soap/client/attributequery.py (modified) (1 diff)
• saml2/binding/soap/client/subjectquery.py (modified) (3 diffs)
• utils/m2crypto.py (modified) (2 diffs)

TI12-security/trunk/ndg_saml/ndg/saml/saml2/binding/soap/client/attributequery.py

@@ -138 +138 @@
         self.client.openerDirector.add_handler(httpsHandler)
         return super(AttributeQuerySslSOAPBinding, self).send(**kw)
-        
-    @property
-    def sslCtxProxy(self):
-        """SSL Context Proxy object used for setting up an SSL Context for
-        queries
-        """
+            
+    def _getSslCtxProxy(self):
         return self.__sslCtxProxy
+    
+    def _setSslCtxProxy(self, value):
+        if not isinstance(value, SSLContextProxy):
+            raise TypeError('Expecting %r type for "sslCtxProxy attribute; got '
+                            '%r' % type(value))
             
+        self.__sslCtxProxy = value
+            
+    sslCtxProxy = property(fget=_getSslCtxProxy, fset=_setSslCtxProxy,
+                           doc="SSL Context Proxy object used for setting up "
+                               "an SSL Context for queries")
+    
     def __setattr__(self, name, value):
         """Enable setting of SSLContextProxy attributes as if they were 

TI12-security/trunk/ndg_saml/ndg/saml/saml2/binding/soap/client/subjectquery.py

@@ -78 +78 @@
     
     def __init__(self, **kw):
-        '''Create SOAP Client for SAML Subject Query'''       
+        '''Create SOAP Client for a SAML Subject Query'''       
         self.__clockSkewTolerance = timedelta(seconds=0.)
         self.__verifyTimeConditions = True
@@ -90 +90 @@
         self.__query = self.__class__.QUERY_TYPE()
         self.__query.version = SAMLVersion(SAMLVersion.VERSION_20)
-        self.__query.id = str(uuid4())
         
         # These properties access the __query instance
@@ -244 +243 @@
         classes may overload to specify as required"""
         self.__query.issueInstant = datetime.utcnow()
+        
+        # Set ID here to ensure it's unique for each new call
+        self.__query.id = str(uuid4())
 
     def _verifyTimeConditions(self, response):

TI12-security/trunk/ndg_saml/ndg/saml/utils/m2crypto.py

@@ -48 +48 @@
         'userid':                   'UID'
     }
-    PARSER_RE_STR = '/(%s)=' % '|'.join(__shortNameLUT.keys() + 
-                                        __shortNameLUT.values())
-    
-    PARSER_RE = re.compile(PARSER_RE_STR)
+    SLASH_PARSER_RE_STR = '/(%s)=' % '|'.join(__shortNameLUT.keys() + 
+                                              __shortNameLUT.values())    
+    SLASH_PARSER_RE = re.compile(SLASH_PARSER_RE_STR)
+
+    COMMA_PARSER_RE_STR = '[,]?\s*(%s)=' % '|'.join(__shortNameLUT.keys() + 
+                                                    __shortNameLUT.values())    
+    COMMA_PARSER_RE = re.compile(COMMA_PARSER_RE_STR)
     
     def __init__(self, dn=None, m2CryptoX509Name=None, separator=None):
@@ -249 +252 @@
             self.__separator = self.parseSeparator(dn)
 
+        if self.__separator == '/':
+            parserRe = self.__class__.SLASH_PARSER_RE
+            
+        elif self.__separator == ',':
+            parserRe = self.__class__.COMMA_PARSER_RE
+        else:
+            raise X500DNError("DN field separator %r not recognised" % 
+                              self.__separator)
+            
         try:
-            dnFields = X500DN.PARSER_RE.split(dn)
+            dnFields = parserRe.split(dn)
             if len(dnFields) < 2:
                 raise X500DNError("Error parsing DN string: \"%s\"" % dn)