Changeset 6943 for TI12-security/trunk/MyProxyWebService/myproxy/server/wsgi/app.py

Timestamp:

07/06/10 15:11:20 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 5: MyProxy? Logon HTTPS Interface

• Working myproxy-ws-get-trustroots.sh http client shell script.

File:

• TI12-security/trunk/MyProxyWebService/myproxy/server/wsgi/app.py (modified) (4 diffs)

TI12-security/trunk/MyProxyWebService/myproxy/server/wsgi/app.py

@@ -25 +25 @@
     """
     PARAM_PREFIX = 'myproxy.'
+    LOGON_PARAM_PREFIX = 'logon.'
     GET_TRUSTROOTS_PARAM_PREFIX = 'getTrustRoots.'
     HTTPBASICAUTH_REALM_OPTNAME = 'httpbasicauth.realm'
@@ -44 +45 @@
         
         # HTTP Basic auth middleware - a container for MyProxy logon
+        logonPrefix = prefix + cls.LOGON_PARAM_PREFIX
         httpBasicAuthMWare = HttpBasicAuthMiddleware.filter_app_factory(app, 
-                                                                global_conf, 
-                                                                prefix=prefix, 
-                                                                **app_conf)
+                                                            global_conf, 
+                                                            prefix=logonPrefix, 
+                                                            **app_conf)
         
         # MyProxy get trust roots middleware
@@ -54 +56 @@
                                                     httpBasicAuthMWare, 
                                                     global_conf, 
-                                                    prefix=getTrustRootsPrefix)
+                                                    prefix=getTrustRootsPrefix,
+                                                    **app_conf)
         
         # Middleware to hold a MyProxy client and expose interface in environ
@@ -66 +69 @@
         httpBasicAuthMWare.authnFuncEnvironKeyName = app.logonFuncEnvironKeyName
         
-        # Mirror callback function setting in HTTP Basic Auth middleware so
-        # that it correctly picks up the authentication function
+        # Set Get trust roots middleware to use the MyProxyClient environ key
+        # name set by MyProxyClientMiddleware
+        getTrustRootsMWare.clientEnvironKeyName = app.clientEnvironKeyName
+        
+        # Pick up HTTP Basic Auth realm setting
         realmOptName = prefix + cls.HTTPBASICAUTH_REALM_OPTNAME
         httpBasicAuthMWare.realm = app_conf[realmOptName]