Changeset 6598 for TI12-security/trunk/NDGSecurity

Timestamp:

19/02/10 15:02:06 (11 years ago)

Author:

pjkersha

Message:

Renamed PIP modules to avoid ndg name clash.

Location:

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/pip

Files:

• esginterface.py (moved) (moved from TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/pip/esg.py) (2 diffs)
• ndginterface.py (moved) (moved from TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/pip/ndg.py) (1 diff)

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/pip/esginterface.py

@@ -14 +14 @@
 log = logging.getLogger(__name__)
 
+from os import path
+from ConfigParser import ConfigParser
+
+from ndg.security.common.utils.configfileparsers import \
+                                            CaseSensitiveConfigParser
 from ndg.security.common.saml_utils.attributeQuery import \
                                             AttributeQuerySslSOAPBinding
 from ndg.security.common.X509 import X509Cert
-from ndg.security.common.authz import SubjectBase
+from ndg.security.common.authz import Subject
 from ndg.security.common.authz.pip import (PIPBase, PIPAttributeQuery, 
                                            PIPAttributeResponse)
-
-
-class Subject(SubjectBase):
-    """Container for information about the subject of the query"""
     
 
@@ -38 +39 @@
     def __init__(self):
         '''Initialise settings for connection to an Attribute Authority'''
-        self.__attributeQueryBinding = None
-    
-    def parse(self, prefix='', **cfg):
-        self.__attributeQueryBinding = AttributeQuerySslSOAPBinding()
-        
+        self.__attributeQueryBinding = None       
 
     @classmethod

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/authz/pip/ndginterface.py

@@ -41 +41 @@
 class Subject(SubjectBase):
     '''Subject designator'''
-    namespaces = (
-        "urn:ndg:security:authz:1.0:attr:subject:userId",
+    namespaces = SubjectBase.namespaces + (
         "urn:ndg:security:authz:1.0:attr:subject:sessionId",
         "urn:ndg:security:authz:1.0:attr:subject:sessionManagerURI",
-    ) + SubjectBase.namespaces
-    (USERID_NS, SESSIONID_NS, SESSIONMANAGERURI_NS, ROLES_NS) = namespaces
+    )
+    (USERID_NS, ROLES_NS, SESSIONID_NS, SESSIONMANAGERURI_NS) = namespaces