Changeset 6957

Timestamp:

09/06/10 09:47:34 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 5: MyProxy? Logon HTTPS Interface

• fixed paths to be absolute for PasteDeploy? loadapp ini file in unit tests.

Location:

TI12-security/trunk/MyProxyWebService/myproxy/server

Files:

• test/ca/3d41aba9.0 (added)
• test/myproxy_ws.py (modified) (1 diff)
• test/myproxywsgi.ini (modified) (2 diffs)
• test/test_myproxywsgi.py (modified) (1 diff)
• test/test_myproxywsgi_with_paster.py (modified) (3 diffs)
• wsgi/middleware.py (modified) (1 diff)

TI12-security/trunk/MyProxyWebService/myproxy/server/test/myproxy_ws.py

@@ -15 +15 @@
 from myproxy.server.test import PasteDeployAppServer
 
-THIS_DIR = path.dirname(__file__)
+THIS_DIR = path.abspath(path.dirname(__file__))
 INI_FILENAME = 'myproxywsgi.ini'
 INI_FILEPATH = path.join(THIS_DIR, INI_FILENAME) 

TI12-security/trunk/MyProxyWebService/myproxy/server/test/myproxywsgi.ini

@@ -19 +19 @@
 [app:main]
 paste.app_factory = myproxy.server.wsgi.app:MyProxyApp.app_factory
-prefix = myproxy.
+prefix = MyProxy.
 
 # HTTP Basic Auth authentication realm used with MyProxy logon requests.
-myproxy.httpbasicauth.realm = myproxy-realm
+MyProxy.httpbasicauth.realm = myproxy-realm
 
 # The key name in the WSGI environ dictionary which holds the MyProxy logon
 # function.  This is used by the HTTP Basic Auth middleware
-myproxy.logon.logonFuncEnvKeyName = MYPROXY_LOGON_FUNC
+MyProxy.logon.logonFuncEnvKeyName = MYPROXY_LOGON_FUNC
 
 # Path for logon requests
@@ -34 +34 @@
 # for the logon request.  The format of this option is inherited from the more
 # generic HTTP Basic Auth middleware which the MyProxyApp uses.
-myproxy.logon.rePathMatchList = /logon
+MyProxy.logon.rePathMatchList = /logon
 
 # Path for get trust roots call.  This should be a single path.  Regular 
 # expressions are not supported.
-myproxy.getTrustRoots.path = /get-trustroots
+MyProxy.getTrustRoots.path = /get-trustroots
 
 # MyProxy server which this MyProxy WSGI app is a client to.  Set here to the 
 # fully qualified domain name or else set the MYPROXY_SERVER environment
 # variable.  See the documentation for the MyProxyClient egg for details
-#myproxy.client.hostname = localhost
-myproxy.client.caCertDir = /etc/grid-security/certificates
+#MyProxy.client.hostname = localhost
+
+# CA Certificate directory to enable this application to trust the MyProxy
+# server that it fronts e.g. set to /etc/grid-security/certificates.  For these
+# tests set to local ca directory
+MyProxy.client.caCertDir = %(here)s/ca

TI12-security/trunk/MyProxyWebService/myproxy/server/test/test_myproxywsgi.py

@@ -59 +59 @@
     """Base class for common Paste Deploy related set-up"""
     INI_FILENAME = 'myproxywsgi.ini'
-    THIS_DIR = os.path.dirname(__file__)
+    THIS_DIR = os.path.abspath(os.path.dirname(__file__))
     CONFIG_FILENAME = 'test_myproxywsgi.cfg'
     CONFIG_FILEPATH = os.path.join(THIS_DIR, CONFIG_FILENAME)

TI12-security/trunk/MyProxyWebService/myproxy/server/test/test_myproxywsgi_with_paster.py

@@ -30 +30 @@
     with bash shell script clients.  For POSIX-like systems ONLY
     """
-    THIS_DIR = path.dirname(__file__)
+    THIS_DIR = path.abspath(path.dirname(__file__))
     CA_DIRNAME = 'ca'
     CA_DIR = path.join(THIS_DIR, CA_DIRNAME)
@@ -80 +80 @@
         )
                 
-        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                env={self.__class__.CA_ENV_VARNAME:
-                                     self.__class__.CA_DIR})
+        try:
+            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                                    stderr=subprocess.PIPE,
+                                    env={self.__class__.CA_ENV_VARNAME:
+                                         self.__class__.CA_DIR})
+        except OSError, e:
+            self.failIf(e.errno == 13, 'Check that the %r script is set with '
+                        'execute permissions' % 
+                        self.__class__.GET_TRUSTROOTS_SCRIPT_CMD)
+            raise
+
         stdoutdata, stderrdata = proc.communicate()
         self.failIf(len(stderrdata) > 0, "An error message was returned: %s" % 
@@ -108 +115 @@
                 
         p1 = subprocess.Popen(["echo", password], stdout=subprocess.PIPE)
-        p2 = subprocess.Popen(cmd, stdin=p1.stdout, stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE,
-                              env={self.__class__.CA_ENV_VARNAME:
-                                   self.__class__.CA_DIR})
+        try:
+            p2 = subprocess.Popen(cmd, stdin=p1.stdout, stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE,
+                                  env={self.__class__.CA_ENV_VARNAME:
+                                       self.__class__.CA_DIR})
+        except OSError, e:
+            self.failIf(e.errno == 13, 'Check that the %r script is set with '
+                        'execute permissions' % self.__class__.LOGON_SCRIPT_CMD)
+            raise
+        
         stdoutdata, stderrdata = p2.communicate()
         self.failIf(len(stderrdata) > 0, "An error message was returned: %s" % 

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

@@ -209 +209 @@
         return app
     
-    def parseConfig(self, prefix=PARAM_PREFIX, myProxyClientPrefix='',
+    def parseConfig(self, 
+                    prefix=PARAM_PREFIX, 
+                    myProxyClientPrefix=MYPROXY_CLIENT_PARAM_PREFIX,
                     **app_conf):
         """Parse dictionary of configuration items updating the relevant