Changeset 7780


Ignore:
Timestamp:
15/12/10 16:38:05 (9 years ago)
Author:
pjkersha
Message:

Complete - task 20: Check for MyProxy? Logon bash script bug

  • added ability to get trust roots script to set CA dir explicitly.
Location:
TI12-security/trunk/MyProxyWebService/myproxy/ws
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/MyProxyWebService/myproxy/ws/client/myproxy-ws-get-trustroots.sh

    r7768 r7780  
    1313# $Id$ 
    1414cmdname=$(basename $0) 
    15 cmdline_opt=`getopt -o hU:b --long help,uri:,bootstrap -n "$cmdname" -- "$@"` 
     15cmdline_opt=`getopt -o hU:bc: --long help,uri:,bootstrap,ca-directory: -n "$cmdname" -- "$@"` 
    1616 
    17 usage="Usage: $cmdname [-U MyProxy Web Service URI][-b]\n 
     17usage="Usage: $cmdname [-h][-U get trust roots URI][-b][-c CA directory]\n 
    1818\n 
    1919   Options\n 
    20        -h | --help\t\t\t\tDisplays usage\n 
    21        -U | --uri\t\t<uri>\t\tMyProxy web service URI\n 
    22        -b | --bootstrap\t\tbootstrap trust in the MyProxy Server\n 
     20       -h | --help\t\t\t\tDisplays usage and quits.\n 
     21       -U | --uri <uri>\t\t\tMyProxy web service URI\n 
     22       -b | --bootstrap\t\t\tbootstrap trust in the MyProxy Server\n 
     23       -c | --ca-directory <directory path>\tDirectory to store the trusted\n 
     24       \t\t\t\t\tCA (Certificate Authority) certificates.  Defaults to\n  
     25       \t\t\t\t\t${HOME}/.globus/certificates or\n 
     26       \t\t\t\t\t/etc/grid-security/certificates if running as root.\n 
    2327" 
    2428 
     
    3539        -U|--uri) uri=$2 ; shift 2 ;; 
    3640        -b|--bootstrap) bootstrap=1 ; shift 1 ;; 
     41        -c|--ca-directory) cadir=$2 ; shift 2 ;; 
    3742         --) shift ; break ;; 
    3843        *) echo "Error parsing command line" ; exit 1 ;; 
     
    4752 
    4853# Set-up destination trust root directory 
    49 if [ ${X509_CERT_DIR} ]; then 
     54if [ $cadir ]; then 
     55    if [ ! -d $cadir ]; then 
     56        mkdir -p $cadir 
     57    fi 
     58     
     59elif [ ${X509_CERT_DIR} ]; then 
    5060    cadir=${X509_CERT_DIR} 
    5161     
  • TI12-security/trunk/MyProxyWebService/myproxy/ws/client/myproxy-ws-logon.sh

    r7774 r7780  
    1212# $Id$ 
    1313cmdname=$(basename $0) 
    14 cmdline_opt=`getopt -o hU:l:So: --long help,uri:,username:,stdin_pass,out:: -n "$cmdname" -- "$@"` 
     14cmdline_opt=`getopt -o hU:l:So:c: --long help,uri:,username:,stdin_pass,out:ca-directory: -n "$cmdname" -- "$@"` 
    1515 
    1616usage="Usage: $cmdname [-U MyProxy Web Service URI][-l username] ...\n 
     
    2222       -S | --stdin_pass\t\t\tpass password from stdin rather prompt from tty\n 
    2323       -o | --out\t\t<filepath>\tLocation of delegated proxy (default to stdout)\n 
     24       -c | --ca-directory <directory path>\tDirectory containing the trusted\n 
     25       \t\t\t\t\tCA (Certificate Authority) certificates.  These are used to\n 
     26       \t\t\t\t\tverify the identity of the MyProxy Web Service.  Defaults to\n  
     27       \t\t\t\t\t${HOME}/.globus/certificates or\n 
     28       \t\t\t\t\t/etc/grid-security/certificates if running as root.\n 
    2429" 
    2530 
  • TI12-security/trunk/MyProxyWebService/myproxy/ws/test/httpbasicauth.ini

    r6997 r7780  
    1313 
    1414[app:TestApp] 
    15 paste.app_factory = myproxy.server.test.test_httpbasicauth:TestApp 
     15paste.app_factory = myproxy.ws.test.test_httpbasicauth:TestApp 
    1616 
    1717[filter:AuthenticateFuncFilter] 
    18 paste.filter_app_factory = myproxy.server.test.test_httpbasicauth:TestHttpBasicAuthCallBackAppMiddleware 
     18paste.filter_app_factory = myproxy.ws.test.test_httpbasicauth:TestHttpBasicAuthCallBackAppMiddleware 
    1919 
    2020[filter:HttpBasicAuthFilter] 
    21 paste.filter_app_factory = myproxy.server.wsgi.httpbasicauth:HttpBasicAuthMiddleware.filter_app_factory 
     21paste.filter_app_factory = myproxy.ws.server.wsgi.httpbasicauth:HttpBasicAuthMiddleware.filter_app_factory 
    2222prefix = httpbasicauth. 
    2323httpbasicauth.authnFuncEnvKeyName = HTTPBASICAUTH_FUNC 
  • TI12-security/trunk/MyProxyWebService/myproxy/ws/test/myproxywsgi.ini

    r7768 r7780  
    1818 
    1919[app:main] 
    20 paste.app_factory = myproxy.server.wsgi.app:MyProxyApp.app_factory 
     20paste.app_factory = myproxy.ws.server.wsgi.app:MyProxyApp.app_factory 
    2121prefix = MyProxy. 
    2222 
Note: See TracChangeset for help on using the changeset viewer.