Changeset 6574 for TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test

Timestamp:

15/02/10 12:33:41 (11 years ago)

Author:

pjkersha

Message:

Changes for addition of AuthzDecisionQuery? WSGI interface (Authorisation service)

Location:

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/wsgi/saml

Files:

• __init__.py (modified) (1 diff)
• attribute-interface.ini (moved) (moved from TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/wsgi/saml/test.ini) (1 diff)
• authz-decision-interface.ini (added)
• test_soapattributeinterface.py (modified) (3 diffs)
• test_soapauthzdecisioninterface.py (added)

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

@@ -9 +9 @@
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
 __revision__ = '$Id: $'
+import unittest
+import os
+import paste.fixture
+from paste.deploy import loadapp
+
+
+class TestApp(object):
+    def __init__(self, global_conf, **app_conf):
+        pass
+    
+    def __call__(self, environ, start_response):
+        response = "404 Not Found"
+        start_response(response,
+                       [('Content-length', str(len(response))),
+                        ('Content-type', 'text/plain')])
+                            
+        return [response]
+
+
+class SOAPAttributeInterfaceMiddlewareTestCase(unittest.TestCase):
+    HERE_DIR = os.path.dirname(os.path.abspath(__file__))
+    CONFIG_FILENAME = 'test.ini'
+    
+    def __init__(self, *args, **kwargs):
+        wsgiapp = loadapp(
+            'config:%s' % \
+                SOAPAttributeInterfaceMiddlewareTestCase.CONFIG_FILENAME, 
+            relative_to=SOAPAttributeInterfaceMiddlewareTestCase.HERE_DIR)
+        
+        self.app = paste.fixture.TestApp(wsgiapp)
+         
+        unittest.TestCase.__init__(self, *args, **kwargs)

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/wsgi/saml/attribute-interface.ini

@@ -21 +21 @@
 
 [filter:SAMLSoapAttributeInterfaceFilter]
-paste.filter_app_factory = ndg.security.server.wsgi.saml:SOAPAttributeInterfaceMiddleware.filter_app_factory
+paste.filter_app_factory = ndg.security.server.wsgi.saml.attributeinterface:SOAPAttributeInterfaceMiddleware.filter_app_factory
 prefix = saml.
 saml.pathMatchList = /attributeauthority/saml

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

@@ -10 +10 @@
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
 __revision__ = '$Id: $'
-import unittest
-import os
 from uuid import uuid4
 from datetime import datetime
-
-import paste.fixture
-from paste.deploy import loadapp
-
 from cStringIO import StringIO
 
@@ -27 +21 @@
 
 from ndg.security.common.soap.etree import SOAPEnvelope
-from ndg.security.common.utils.etree import prettyPrint
 from ndg.security.common.saml_utils.esg import EsgSamlNamespaces
-  
-    
-class TestApp(object):
-    def __init__(self, global_conf, **app_conf):
-        pass
-    
-    def __call__(self, environ, start_response):
-        response = "404 Not Found"
-        start_response(response,
-                       [('Content-length', str(len(response))),
-                        ('Content-type', 'text/plain')])
-                            
-        return [response]
 
 
 class SOAPAttributeInterfaceMiddlewareTestCase(unittest.TestCase):
-    
-    def __init__(self, *args, **kwargs):
-        here_dir = os.path.dirname(os.path.abspath(__file__))
-        wsgiapp = loadapp('config:test.ini', relative_to=here_dir)
-        self.app = paste.fixture.TestApp(wsgiapp)
-         
-        unittest.TestCase.__init__(self, *args, **kwargs)
-
+    CONFIG_FILENAME = 'attribute-interface.ini'
+    
     def _createAttributeQuery(self, 
                         issuer="/O=Site A/CN=Authorisation Service",
@@ -246 +220 @@
         self.assert_(samlResponse.status.statusCode.value == \
                      StatusCode.UNKNOWN_PRINCIPAL_URI)
-           
+
+ 
 if __name__ == "__main__":
     unittest.main()