Changeset 6605 for TI12-security/trunk/NDGSecurity

Timestamp:

22/02/10 16:37:10 (11 years ago)

Author:

pjkersha

Message:

Setting up tests for the SAML Authorisation Service.

Location:

TI12-security/trunk/NDGSecurity/python

Files:

• .pydevproject (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/authzservice.py (modified) (1 diff)
• ndg_security_server/ndg/security/server/wsgi/session.py (modified) (1 diff)
• ndg_security_test/ndg/security/test/integration/authz_lite/securedapp.ini (modified) (2 diffs)
• ndg_security_test/ndg/security/test/integration/authz_lite/securityservices.ini (modified) (3 diffs)
• ndg_security_test/ndg/security/test/unit/wsgi/saml/authz-decision-interface.ini (modified) (1 diff)
• ndg_security_test/ndg/security/test/unit/wsgi/saml/authz-service.ini (added)
• ndg_security_test/ndg/security/test/unit/wsgi/saml/test_soapauthzdecisioninterface.py (modified) (1 diff)

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

@@ -13 +13 @@
 <pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
 <path>/home/pjkersha/workspace/ndg_security_saml</path>
+<path>/home/pjkersha/workspace/AuthKit/trunk</path>
 </pydev_pathproperty>
 </pydev_project>

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

@@ -104 +104 @@
                                          cls.AUTHZ_DECISION_QUERY_IFACE_OPTNAME
                                          
-        self.authzDecisionFunc = app_conf.get(
-                                authzDecisionQueryIfaceOptName,
-                                cls.DEFAULT_AUTHZ_DECISION_QUERY_IFACE_KEYNAME)
+        authzDecisionFunc = app_conf.get(authzDecisionQueryIfaceOptName)
+        if authzDecisionFunc is not None:
+            # Use decision function set in config
+            self.authzDecisionFunc = authzDecisionFunc
+        else:
+            # Use default decision function
+            self.authzDecisionFunc = self.createAuthzDecisionFunc()
         
     @classmethod

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

@@ -292 +292 @@
                     SessionHandlerMiddleware.AUTH_TKT_SET_USER_ENVIRON_KEYNAME]
             setUser(session[SessionHandlerMiddleware.USERNAME_SESSION_KEYNAME])
+            
+            # Also reset the environment variable to prevent AuthKit from
+            # restoring the AX values in the cookie.
+            environ[SessionHandlerMiddleware.USERDATA_ENVIRON_KEYNAME] = ''      
         else:
             log.debug("SessionHandlerMiddleware.__call__: REMOTE_USER_DATA "

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite/securedapp.ini

@@ -49 +49 @@
 beaker.session.data_dir = %(here)s/authn/beaker/sessions
 
+beaker.session.cookie_domain = .localhost
 
 [filter:AuthenticationFilter]
@@ -71 +72 @@
 # suspected problem with AuthKit setting it when a HTTP Proxy is in place
 authkit.cookie.includeip = False
+
+#authkit.cookie.params.expires = 2
+authkit.cookie.params.domain = .localhost
 
 # environ key name for beaker session

TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/authz_lite/securityservices.ini

@@ -82 +82 @@
 beaker.session.cookie_expires = True
 
+beaker.session.cookie_domain = .localhost
+
 # Key name for keying into environ dictionary
 environ_key = %(beakerSessionKeyName)s
@@ -101 +103 @@
 # suspected problem with AuthKit setting it when a HTTP Proxy is in place
 cookie.includeip = False
+
+cookie.params.domain = .localhost
 
 # SSL Client Certificate based authentication is invoked if the client passed
@@ -160 +164 @@
 authkit.cookie.secret=9wvZObs9anUEhSIAnJNoY2iJq59FfYZr
 authkit.cookie.signoutpath = /logout
+authkit.cookie.params.domain = .localhost
 
 # Disable inclusion of client IP address from cookie signature due to 

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

@@ -1 +1 @@
 #
-# SSL Client AuthN WSGI Testing environment configuration
+# INI file for testing the SAML Authorisation Query interface.  It uses a
+# test stub for the Authorisation Service rather than
+# ndg.security.server.wsgi.authzservice.AuthzServiceMiddleware.  See,
+# authz-service.ini to compare
 #
 # The %(here)s variable will be replaced with the parent directory of this file

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

@@ -187 +187 @@
         self.assert_(samlResponse.assertions[0].authzDecisionStatements[0
                                             ].decision == DecisionType.PERMIT)
-        
-    def test02(self):
-        pass
- 
+
+        
+class SOAPAuthzServiceMiddlewareTestCase(
+                                SOAPAuthzDecisionInterfaceMiddlewareTestCase):
+    """Test the actual server side middleware 
+    ndg.security.server.wsgi.authzservice.AuthzServiceMiddleware
+    rather than a test stub
+    """
+    CONFIG_FILENAME = 'authz-service.ini'
+    
+    
 if __name__ == "__main__":
     unittest.main()