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

Timestamp:

07/06/10 15:11:20 (9 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/middleware.py (modified) (4 diffs)

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

@@ -15 +15 @@
 import socket
 import httplib
-from cStringIO import StringIO
+import base64
 
 from webob import Request
@@ -98 +98 @@
     
     # Default environ key names
-    LOGON_FUNC_ENV_KEYNAME = ('myproxy.server.wsgi.middleware.'
-                              'MyProxyClientMiddleware.logon')
+    DEFAULT_LOGON_FUNC_ENV_KEYNAME = ('myproxy.server.wsgi.middleware.'
+                                      'MyProxyClientMiddleware.logon')
     
     CERT_REQ_POST_PARAM_KEYNAME = 'certificate_request'
@@ -175 +175 @@
                     
         logonFuncEnvKeyOptName = prefix + \
-                    MyProxyClientMiddleware.LOGON_FUNC_ENV_KEYNAME_OPTNAME
+                        MyProxyClientMiddleware.LOGON_FUNC_ENV_KEYNAME_OPTNAME
 
         self.logonFuncEnvironKeyName = app_conf.get(logonFuncEnvKeyOptName,
-                                MyProxyClientMiddleware.LOGON_FUNC_ENV_KEYNAME)
+                        MyProxyClientMiddleware.DEFAULT_LOGON_FUNC_ENV_KEYNAME)
 
     def _getLogonFuncEnvironKeyName(self):
@@ -469 +469 @@
             
             # Serialise dict response
-            response = "\n".join(["%s=%s" % i for i in trustRoots.items()])
+            response = "\n".join(["%s=%s" % (k, base64.b64encode(v))
+                                  for k,v in trustRoots.items()])
             
             return response