Changeset 6945 for TI12-security/trunk/MyProxyWebService

Timestamp:

07/06/10 16:38:38 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 5: MyProxy? Logon HTTPS Interface

• working unit tests with shell script clients called from the unit tests

Location:

TI12-security/trunk/MyProxyWebService/myproxy/server/test

Files:

• myproxy-ws-get-trustroots.sh (modified) (4 diffs)
• myproxy-ws-logon.sh (modified) (1 diff)
• myproxywsgi.ini (modified) (1 diff)
• test_myproxywsgi.cfg (modified) (2 diffs)
• test_myproxywsgi_with_paster.py (modified) (4 diffs)

TI12-security/trunk/MyProxyWebService/myproxy/server/test/myproxy-ws-get-trustroots.sh

@@ -2 +2 @@
 #
 # Client script for web service interface to MyProxy get-trustroots based on 
-# openssl and curl.  Get trust roots retrieves the CA certificate issuer(s) of
-# the MyProxy server's SSL certificate
+# curl and base64 commands.  Get trust roots retrieves the CA certificate 
+# issuer(s) of the MyProxy server's SSL certificate
 #
 # @author P J Kershaw 07/06/2010
@@ -13 +13 @@
 # $Id$
 cmdname=$(basename $0)
-cmdline_opt=`getopt -o hU:b --long help,uri:,bootstrap: -n "$cmdname" -- "$@"`
+cmdline_opt=`getopt -o hU:b --long help,uri:,bootstrap -n "$cmdname" -- "$@"`
 
 usage="Usage: $cmdname [-U MyProxy Web Service URI][-b]\n
@@ -59 +59 @@
     ca_arg="--capath $cadir"
 else
+    echo Bootstrapping MyProxy server root of trust.
     ca_arg="--insecure"
 fi
 
 # Post request to MyProxy web service
-echo curl $uri $ca_arg -w " %{http_code}" -s -S
-response=$(curl $uri $ca_arg -w " %{http_code}" -s -S)
+response=$(curl $uri --sslv3 $ca_arg -w " %{http_code}" -s -S)
 responsemsg=$(echo "$response"|sed '$s/ *\([^ ]* *\)$//')
 responsecode=$(echo $response|awk '{print $NF}')
@@ -79 +79 @@
     echo "$filecontent" > $cadir/$filename
 done
+
+echo Trust roots have been installed in $cadir.

TI12-security/trunk/MyProxyWebService/myproxy/server/test/myproxy-ws-logon.sh

@@ -90 +90 @@
 # Post request to MyProxy web service passing username/password for HTTP Basic
 # auth based authentication.  
-response=$(curl $uri -u $username:$password --data-urlencode "certificate_request=$(cat $certreqfilepath)" --capath $cadir -w " %{http_code}" -s -S)
+response=$(curl $uri --sslv3 -u $username:$password --data-urlencode "certificate_request=$(cat $certreqfilepath)" --capath $cadir -w " %{http_code}" -s -S)
 responsemsg=$(echo "$response"|sed '$s/ *\([^ ]* *\)$//')
 responsecode=$(echo $response|awk '{print $NF}')

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

@@ -25 +25 @@
 myproxy.getTrustRoots.path = /get-trustroots
 #myproxy.client.hostname = localhost
-myproxy.client.hostname = gabriel.badc.rl.ac.uk
 myproxy.client.caCertDir = /etc/grid-security/certificates

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

@@ -1 +1 @@
 #
-# MyProxy Logon Application in file for unit tests.
+# MyProxy Logon Application config file for unit tests.
 #
 # Author: P J Kershaw
@@ -16 +16 @@
 password = mypassword
 uri = https://localhost:10443/logon
+
+[MyProxyLogonAppWithPasterTestCase.test02LogonScript]
+username: pjk
+password = mypassword
+uri = https://localhost:10443/logon
+
+[MyProxyLogonAppWithPasterTestCase.test02GetTrustRootsScript]
+uri = https://localhost:10443/get-trustroots
+

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

@@ -30 +30 @@
     """
     THIS_DIR = path.dirname(__file__)
+    CA_DIRNAME = 'ca'
+    CA_DIR = path.join(THIS_DIR, CA_DIRNAME)
+    CA_ENV_VARNAME = 'X509_CERT_DIR'
     INI_FILENAME = 'myproxywsgi.ini'
     INI_FILEPATH = path.join(THIS_DIR, INI_FILENAME)  
@@ -38 +41 @@
 
     SERVICE_PORTNUM = 10443
-    SCRIPT_CMD = 'myproxy-ws-logon.sh'
+    LOGON_SCRIPT_CMD = 'myproxy-ws-logon.sh'
+    LOGON_SCRIPT_USER_OPTNAME = '--username'
+    LOGON_SCRIPT_STDIN_PASS_OPTNAME = '--stdin_pass'
+    
     SCRIPT_URI_OPTNAME = '--uri'
-    SCRIPT_USER_OPTNAME = '--username'
-    SCRIPT_STDIN_PASS = '--stdin_pass'
+    
+    GET_TRUSTROOTS_SCRIPT_CMD = 'myproxy-ws-get-trustroots.sh'
+    GET_TRUSTROOTS_SCRIPT_BOOTSTRAP_OPTNAME = '--bootstrap'
     
     def __init__(self, *arg, **kw):
@@ -58 +65 @@
                         withLoggingConfig=False)
     
-    def test01Script(self):
-        # Test wget/openssl based client script access
-        username = self.cfg.get('test01Logon', 'username')
-        try: 
-            password = self.cfg.get('test01Logon', 'password')
-        except NoOptionError:
-            password = getpass('test01Logon password: ')
-
-        uri = self.cfg.get('test01Logon', 'uri')
+    def test01GetTrustRootsScriptWithBootstrap(self):
+        # Test curl/base64 based client script
+        optName = 'MyProxyLogonAppWithPasterTestCase.test02GetTrustRootsScript'
+        uri = self.cfg.get(optName, 'uri')
         
         cmd = (
-            self.__class__.SCRIPT_CMD, 
+            self.__class__.GET_TRUSTROOTS_SCRIPT_CMD, 
             "%s=%s" % (self.__class__.SCRIPT_URI_OPTNAME, uri),
-            "%s=%s" % (self.__class__.SCRIPT_USER_OPTNAME, username),
-            self.__class__.SCRIPT_STDIN_PASS
+            "%s" % self.__class__.GET_TRUSTROOTS_SCRIPT_BOOTSTRAP_OPTNAME
+        )
+                
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                env={self.__class__.CA_ENV_VARNAME:
+                                     self.__class__.CA_DIR})
+        stdoutdata, stderrdata = proc.communicate()
+        self.failIf(len(stderrdata) > 0, "An error message was returned: %s" % 
+                    stderrdata)
+        print("stdout = %s" % stdoutdata)
+    
+    def test02LogonScript(self):
+        # Test curl/openssl based client script access
+        optName = 'MyProxyLogonAppWithPasterTestCase.test02LogonScript'
+        username = self.cfg.get(optName, 'username')
+        try: 
+            password = self.cfg.get(optName, 'password')
+        except NoOptionError:
+            password = getpass(optName + ' password: ')
+
+        uri = self.cfg.get(optName, 'uri')
+        
+        cmd = (
+            self.__class__.LOGON_SCRIPT_CMD, 
+            "%s=%s"%(self.__class__.SCRIPT_URI_OPTNAME, uri),
+            "%s=%s"%(self.__class__.LOGON_SCRIPT_USER_OPTNAME, username),
+            self.__class__.LOGON_SCRIPT_STDIN_PASS_OPTNAME
         )
                 
@@ -78 +106 @@
         p2 = subprocess.Popen(cmd, stdin=p1.stdout, stdout=subprocess.PIPE,
                               stderr=subprocess.PIPE,
-                              env={'X509_CERT_DIR':self.__class__.THIS_DIR})
+                              env={self.__class__.CA_ENV_VARNAME:
+                                   self.__class__.CA_DIR})
         stdoutdata, stderrdata = p2.communicate()
         self.failIf(len(stderrdata) > 0, "An error message was returned: %s" %