Changeset 7155

Timestamp:

02/07/10 10:14:50 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 2: XACML-Security Integration

• migrating to ndg.saml and ndg.soap imports now that SAML WSGI middleware has moved to ndg.saml egg.

Location:

TI12-security/trunk/NDGSecurity/python

Files:

• .pydevproject (modified) (1 diff)
• Tests/esg_integration/test_soapauthzdecisioninterface.py (modified) (1 diff)
• Tests/etreewss/client/echoClientTest.cfg (modified) (1 diff)
• Tests/etreewss/server/wssecurity.cfg (modified) (1 diff)
• Tests/ndgsecuredpylons/secured.ini (modified) (2 diffs)
• ndg_security_common/ndg/security/common/X509.py (modified) (1 diff)
• ndg_security_common/ndg/security/common/authz/pip/esginterface.py (modified) (2 diffs)
• ndg_security_common/ndg/security/common/saml_utils/binding (deleted)
• ndg_security_common/ndg/security/common/soap.py (deleted)
• ndg_security_server/ndg/security/server/myproxy/certificate_extapp/saml_attribute_assertion.py (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/authz/__init__.py (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/saml (deleted)
• ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_samlattributeauthorityclient.py (modified) (1 diff)
• ndg_security_test/ndg/security/test/unit/saml/test_samlinterface.py (modified) (1 diff)
• ndg_security_test/ndg/security/test/unit/soap (deleted)

TI12-security/trunk/NDGSecurity/python/.pydevproject

@@ -14 +14 @@
 <path>/home/pjkersha/workspace/MyProxyClient</path>
 <path>/home/pjkersha/workspace/AuthKit/trunk</path>
-<path>/home/pjkersha/workspace/NDG_XACML</path>
+<path>/home/pjkersha/workspace/ndg_soap</path>
+<path>/home/pjkersha/workspace/ndg_xacml</path>
 </pydev_pathproperty>
 </pydev_project>

TI12-security/trunk/NDGSecurity/python/Tests/esg_integration/test_soapauthzdecisioninterface.py

@@ -20 +20 @@
 from ndg.saml.xml.etree import ResponseElementTree
 from ndg.security.common.utils.etree import prettyPrint
-from ndg.security.common.saml_utils.binding.soap.authzdecisionquery import ( 
+from ndg.saml.saml2.binding.soap.client.authzdecisionquery import ( 
                                         AuthzDecisionQuerySslSOAPBinding)
 

TI12-security/trunk/NDGSecurity/python/Tests/etreewss/client/echoClientTest.cfg

@@ -13 +13 @@
 signingPriKeyPwd = 
 signingCertFilePath = $NDGSEC_WSSECLNT_UNITTEST_DIR/clnt.crt
-caCertFilePathList = $NDGSEC_WSSECLNT_UNITTEST_DIR/ndg-test-ca.crt
+caCertFilePathList = $NDGSEC_WSSECLNT_UNITTEST_DIR/d573507a.0
 
 [test1Echo]

TI12-security/trunk/NDGSecurity/python/Tests/etreewss/server/wssecurity.cfg

@@ -50 +50 @@
 
 # Provide a space separated list of file paths
-caCertFilePathList=$NDGSEC_WSSESRV_UNITTEST_DIR/ndg-test-ca.crt
+caCertFilePathList=$NDGSEC_WSSESRV_UNITTEST_DIR/d573507a.0
 
 # Set the ValueType for the BinarySecurityToken added to the WSSE header for a

TI12-security/trunk/NDGSecurity/python/Tests/ndgsecuredpylons/secured.ini

@@ -77 +77 @@
 # List of CA certificates used to verify the signatures of 
 # Attribute Certificates retrieved
-pip.caCertFilePathList=%(testConfigDir)s/ca/ndg-test-ca.crt
+pip.caCertFilePathList=%(testConfigDir)s/ca/d573507a.0
 
 #
@@ -99 +99 @@
 
 # For signature verification.  Provide a space separated list of file paths
-pip.wssecurity.caCertFilePathList=%(testConfigDir)s/ca/ndg-test-ca.crt
+pip.wssecurity.caCertFilePathList=%(testConfigDir)s/ca/d573507a.0
 
 # ValueType for the BinarySecurityToken added to the WSSE header

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

@@ -19 +19 @@
 
 # Handle not before and not after strings
-from time import strftime
 from time import strptime
 from datetime import datetime

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

@@ -19 +19 @@
 from ndg.security.common.utils.configfileparsers import \
                                             CaseSensitiveConfigParser
-from ndg.security.common.saml_utils.binding.soap.attributequery import \
+from ndg.saml.saml2.binding.soap.client.attributequery import \
                                             AttributeQuerySslSOAPBinding
 from ndg.security.common.X509 import X509Cert
@@ -50 +50 @@
         @type cfg: basestring /ConfigParser derived type
         @param cfg: configuration file path or ConfigParser type object
-        @rtype: ndg.security.common.saml_utils.binding.soap.SOAPBinding
+        @rtype: ndg.saml.saml2.binding.soap.client.SOAPBinding
         @return: new instance of this class
         '''

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/myproxy/certificate_extapp/saml_attribute_assertion.py

@@ -39 +39 @@
 from ndg.saml.xml.etree import AssertionElementTree, ResponseElementTree
    
-from ndg.security.common.saml_utils.binding.soap.attributequery import \
+from ndg.saml.saml2.binding.soap.client.attributequery import \
                                                 AttributeQuerySslSOAPBinding
 from ndg.security.common.saml_utils.esg import (EsgSamlNamespaces,

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/wsgi/authz/__init__.py

@@ -23 +23 @@
 from ndg.security.common.utils.classfactory import importClass
 from ndg.security.common.X509 import X509Cert
-from ndg.security.common.saml_utils.binding.soap.attributequery import \
+from ndg.saml.saml2.binding.soap.client.attributequery import \
                                                 AttributeQuerySslSOAPBinding
 

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/attributeauthorityclient/test_samlattributeauthorityclient.py

@@ -24 +24 @@
                                  XSStringAttributeValue)
 
-from ndg.security.common.saml_utils.binding.soap import SOAPBinding
-from ndg.security.common.saml_utils.binding.soap.attributequery import (
+from ndg.saml.saml2.binding.soap.client import SOAPBinding
+from ndg.saml.saml2.binding.soap.client.attributequery import (
                                         AttributeQuerySOAPBinding, 
                                         AttributeQuerySslSOAPBinding)

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/saml/test_samlinterface.py

@@ -32 +32 @@
 from ndg.security.common.soap.etree import SOAPEnvelope
 from ndg.security.common.utils.etree import QName, prettyPrint
-from ndg.security.common.saml_utils.binding.soap.subjectquery import (
+from ndg.saml.saml2.binding.soap.client.subjectquery import (
     SubjectQuerySOAPBinding, ResponseIssueInstantInvalid, 
     AssertionIssueInstantInvalid, AssertionConditionNotBeforeInvalid,