t/encoding.t

-
 use Test::Nginx::Socket 'no_plan';
 
 run_tests();
@@ -9,18 +8,24 @@ __DATA__
 --- main_config
     env X509_VOMS_DIR=t/vomsdir;
     env X509_CERT_DIR=t/trust-anchors;
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
     server {
         error_log logs/error.log debug;
         listen 8443 ssl;
-        ssl_certificate ../../certs/nginx_voms_example.cert.pem;
-        ssl_certificate_key ../../certs/nginx_voms_example.key.pem;
-        ssl_client_certificate ../../trust-anchors/igi-test-ca.pem;
+        ssl_certificate ../../certs/star_test_example.cert.pem;
+        ssl_certificate_key ../../certs/star_test_example.key.pem;
+        ssl_client_certificate ../../trust-anchors/igi_test_ca.pem;
         ssl_verify_depth 10;
         ssl_verify_client on;
-	location = / {
+        location = / {
             default_type text/plain;
-            echo $voms_generic_attributes;
+            return 200 "$voms_generic_attributes\n";
         }
     }
 --- config
@@ -33,5 +38,5 @@ __DATA__
 --- request
 GET / 
 --- response_body
-n=nickname v=newland86 q=test.vo,n=title v=assegnista%25di%25ricerca%40CNAF q=test.vo
+n=nickname v=sd q=test.vo,n=title v=assegnista%25di%25ricerca%40CNAF q=test.vo
 --- error_code: 200

t/expired.t

@@ -6,18 +6,25 @@ run_tests();
 __DATA__
 
 === TEST 1: https with x509 client authentication, expired client certificate
+--- main_config
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
     server {
         error_log logs/error.log debug;
         listen 8443 ssl;
-        ssl_certificate ../../certs/nginx_voms_example.cert.pem;
-        ssl_certificate_key ../../certs/nginx_voms_example.key.pem;
-        ssl_client_certificate ../../trust-anchors/igi-test-ca.pem;
+        ssl_certificate ../../certs/star_test_example.cert.pem;
+        ssl_certificate_key ../../certs/star_test_example.key.pem;
+        ssl_client_certificate ../../trust-anchors/igi_test_ca.pem;
         ssl_verify_depth 10;
         ssl_verify_client on;
-	location = / {
+        location = / {
             default_type text/plain;
-            echo $ssl_client_s_dn;
+            return 200 "$ssl_client_s_dn\n";
         }
     }
 --- config

t/expired_ac.t

@@ -9,19 +9,24 @@ __DATA__
 --- main_config
     env X509_VOMS_DIR=t/vomsdir;
     env X509_CERT_DIR=t/trust-anchors;
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
     server {
         error_log logs/error.log debug;
         listen 8443 ssl;
-        ssl_certificate ../../certs/nginx_voms_example.cert.pem;
-        ssl_certificate_key ../../certs/nginx_voms_example.key.pem;
-        ssl_client_certificate ../../trust-anchors/igi-test-ca.pem;
+        ssl_certificate ../../certs/star_test_example.cert.pem;
+        ssl_certificate_key ../../certs/star_test_example.key.pem;
+        ssl_client_certificate ../../trust-anchors/igi_test_ca.pem;
         ssl_verify_depth 10;
         ssl_verify_client on;
-	location = / {
+        location = / {
             default_type text/plain;
-            echo $voms_fqans;
-            echo $voms_user;
+            return 200 "$voms_fqans\n$voms_user\n";
         }
     }
 --- config
@@ -32,7 +37,7 @@ __DATA__
         proxy_ssl_certificate_key ../../certs/1.key.pem;
     }
 --- request
-GET / 
+GET /
 --- response_body_like eval
 qr/\n\n/
 --- error_log

t/my-echo-test.t

-use Test::Nginx::Socket 'no_plan';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: hello, world
-This is just a simple demonstration of the echo directive provided by ngx_http_echo_module.
---- config
-location = /hello {
-    echo "hello, world!";
-}
---- request
-GET /hello
---- response_body
-hello, world!
---- error_code: 200

t/my-simple-test.t

-
-use Test::Nginx::Socket 'no_plan';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: hello world
-
---- config
-location = /hello {
-    return 200 "hello world\n";
-}
-
---- request
-GET /hello
-
---- response_body
-hello world

t/no_ac.t

-
 use Test::Nginx::Socket 'no_plan';
 
 run_tests();
 
 __DATA__
 
-=== TEST 1: https with x509 client authentication, valid proxy certificate with no VOMS attributes 
+=== TEST 1: HTTPS with X.509 client authentication, valid proxy certificate with no VOMS attributes
 --- main_config
     env X509_VOMS_DIR=t/vomsdir;
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
     server {
         error_log logs/error.log debug;
         listen 8443 ssl;
-        ssl_certificate ../../certs/nginx_voms_example.cert.pem;
-        ssl_certificate_key ../../certs/nginx_voms_example.key.pem;
-        ssl_client_certificate ../../trust-anchors/igi-test-ca.pem;
+        ssl_certificate ../../certs/star_test_example.cert.pem;
+        ssl_certificate_key ../../certs/star_test_example.key.pem;
+        ssl_client_certificate ../../trust-anchors/igi_test_ca.pem;
         ssl_verify_depth 10;
         ssl_verify_client on;
-	location = / {
+        location = / {
             default_type text/plain;
-            echo $voms_fqans;
-            echo $voms_user;
+            return 200 "$voms_fqans\n$voms_user\n";
         }
     }
 --- config
@@ -31,7 +35,7 @@ __DATA__
         proxy_ssl_certificate_key ../../certs/0.key.pem;
     }
 --- request
-GET / 
+GET /
 --- response_body_like eval
 qr/\n\n/
 --- error_log

t/no_ssl.t

@@ -7,14 +7,19 @@ __DATA__
 
 === TEST 1: HTTP connection, no SSL
 --- main_config
-    env X509_VOMS_DIR=t/vomsdir;
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
     server {
         error_log logs/error.log debug;
         listen 8443;
         location = / {
             default_type text/plain;
-            echo $voms_user;
+            return 200 "$voms_user\n";
         }
     }
 --- config
@@ -23,7 +28,7 @@ __DATA__
         proxy_pass http://localhost:8443/;
     }
 --- request
-GET / 
+GET /
 --- response_body_like eval
 qr/\n/
 --- error_log

t/no_ta.t

-
 use Test::Nginx::Socket 'no_plan';
 
 run_tests();
 
 __DATA__
 
-=== TEST 1: Valid proxy, wrong client trust-anchor 
+=== TEST 1: Valid proxy, wrong client trust-anchor
 --- main_config
     env X509_VOMS_DIR=t/vomsdir;
     env X509_CERT_DIR=t/trust-anchors;
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
     server {
         error_log logs/error.log debug;
         listen 8443 ssl;
-        ssl_certificate ../../certs/nginx_voms_example.cert.pem;
-        ssl_certificate_key ../../certs/nginx_voms_example.key.pem;
-        ssl_client_certificate ../../trust-anchors/igi-test-ca-2.pem;
+        ssl_certificate ../../certs/star_test_example.cert.pem;
+        ssl_certificate_key ../../certs/star_test_example.key.pem;
+        ssl_client_certificate ../../trust-anchors/igi_test_ca2.pem;
         ssl_verify_depth 10;
         ssl_verify_client on;
-	location = / {
+        location = / {
             default_type text/plain;
-            echo $voms_fqans;
+            return 200 "$voms_fqans\n";
         }
     }
 --- config
@@ -31,7 +36,7 @@ __DATA__
         proxy_ssl_certificate_key ../../certs/3.key.pem;
     }
 --- request
-GET / 
+GET /
 --- error_code: 400
 
 

t/openssl.conf

+
+config_diagnostics     = 1
+
+[ ca ]
+
+default_ca             = ${ENV::CA_NAME}
+
+.include conf.d

t/proxies.d/1.conf

+-voms=test.vo
+-cert=certs/test0.cert.pem
+-key=certs/test0.key.pem
+-hostcert=certs/star_test_example.cert.pem
+-hostkey=certs/star_test_example.key.pem
+-certdir=trust-anchors
+-uri=voms.example:15000
+-fqan="/test.vo"
+-pastproxy=24:0
+-hours=100
+-pastac=24:0
+-vomslife=12

t/proxies.d/2.conf

+-voms=test.vo
+-cert=certs/test0.cert.pem
+-key=certs/test0.key.pem
+-hostcert=certs/star_test_example.cert.pem
+-hostkey=certs/star_test_example.key.pem
+-certdir=trust-anchors
+-uri=voms.example:15000
+-fqan="/test.vo"
+-pastproxy=24:0
+-hours=12
+-pastac=24:0
+-vomslife=12

t/proxies.d/3.conf

+-voms=test.vo
+-cert=certs/test0.cert.pem
+-key=certs/test0.key.pem
+-hostcert=certs/star_test_example.cert.pem
+-hostkey=certs/star_test_example.key.pem
+-certdir=trust-anchors
+-uri=voms.example:15000
+-fqan=/test.vo/exp1
+-fqan=/test.vo/exp2
+-fqan=/test.vo/exp3/Role=PIPPO
+-ga=nickname=sd
+-ga=nickname=cnaf
+-hours=12
+-vomslife=12
+-newserial=abcdef

t/proxies.d/4.conf

+-voms=test.vo
+-cert=certs/test0.cert.pem
+-key=certs/test0.key.pem
+-hostcert=certs/star_test_example.cert.pem
+-hostkey=certs/star_test_example.key.pem
+-certdir=trust-anchors
+-uri=voms.example:15000
+-fqan=/test.vo
+-ga=nickname=sd
+-ga=title=assegnista%di%ricerca@CNAF
+-hours=12
+-vomslife=12

t/proxies.d/5.conf

+-voms=test.vo
+-cert=certs/test0.cert.pem
+-key=certs/test0.key.pem
+-hostcert=certs/untrusted_voms.cert.pem
+-hostkey=certs/untrusted_voms.key.pem
+-certdir=trust-anchors
+-uri=voms.example:15000
+-fqan=/test.vo/exp1
+-fqan=/test.vo/exp2
+-fqan=/test.vo/exp3/Role=PIPPO
+-ga=nickname=sd
+-ga=nickname=cnaf
+-hours=12
+-vomslife=12

t/setup.sh

+#!/bin/bash
+
+set -e
+
+if [ ! -e "openssl.conf" ]; then
+  >&2 echo "The configuration file 'openssl.conf' doesn't exist in this directory"
+  exit 1
+fi
+
+base_dir=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
+certs_dir="${base_dir}"/certs
+ta_dir="${base_dir}"/trust-anchors
+vomsdir="${base_dir}"/vomsdir
+
+rm -rf "${certs_dir}"
+mkdir -p "${certs_dir}"
+rm -rf "${ta_dir}"
+mkdir -p "${ta_dir}"
+rm -rf "${vomsdir}"
+mkdir -p "${vomsdir}"
+
+[ -d "igi_test_ca2" ] && remove_ca.sh igi_test_ca2
+export CA_NAME=igi_test_ca2
+make_ca.sh
+make_crl.sh
+install_ca.sh igi_test_ca2 "${ta_dir}"
+
+make_cert.sh untrusted_voms
+cp igi_test_ca2/certs/untrusted_voms.* "${certs_dir}"
+
+[ -d "igi_test_ca" ] && remove_ca.sh igi_test_ca
+export CA_NAME=igi_test_ca
+make_ca.sh
+make_crl.sh
+install_ca.sh igi_test_ca "${ta_dir}"
+
+export X509_CERT_DIR="${ta_dir}"
+
+make_cert.sh test0
+cp igi_test_ca/certs/test0.* "${certs_dir}"
+
+make_cert.sh star_test_example
+cp igi_test_ca/certs/star_test_example.* "${certs_dir}"
+mkdir -p "${vomsdir}"/test.vo
+openssl x509 -in "${certs_dir}"/star_test_example.cert.pem -noout -subject -issuer -nameopt compat \
+  | sed -e 's/subject=//' -e 's/issuer=//' > "${vomsdir}"/test.vo/voms.example.lsc
+
+# test 1
+echo | voms-proxy-init -cert "${certs_dir}"/test0.p12 --valid 10:0 --out "${certs_dir}"/0.pem --pwstdin
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/0.pem > "${certs_dir}"/0.key.pem
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/0.pem > "${certs_dir}"/0.cert.pem
+
+# test 3
+cat "${certs_dir}"/test0.cert.pem "${ta_dir}"/igi_test_ca.pem > "${certs_dir}"/test0+ca.pem
+
+# long-lived proxy certificate, with an expired AC
+proxy_name=1
+voms-proxy-fake --debug -conf proxies.d/${proxy_name}.conf -out "${certs_dir}"/${proxy_name}.pem
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.cert.pem
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.key.pem
+chmod 600 "${certs_dir}"/${proxy_name}.key.pem
+
+# expired proxy certificate
+proxy_name=2
+voms-proxy-fake --debug -conf proxies.d/${proxy_name}.conf -out "${certs_dir}"/${proxy_name}.pem
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.cert.pem
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.key.pem
+chmod 600 "${certs_dir}"/${proxy_name}.key.pem
+
+# valid proxy certificate with valid AC
+proxy_name=3
+voms-proxy-fake --debug -conf proxies.d/${proxy_name}.conf -out "${certs_dir}"/${proxy_name}.pem
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.cert.pem
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.key.pem
+chmod 600 "${certs_dir}"/${proxy_name}.key.pem
+
+# proxy with VOMS generic attributes containing special characters
+proxy_name=4
+voms-proxy-fake --debug -conf proxies.d/${proxy_name}.conf -out "${certs_dir}"/${proxy_name}.pem
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.cert.pem
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.key.pem
+chmod 600 "${certs_dir}"/${proxy_name}.key.pem
+
+# proxy with valid VOMS attributes, untrusted AC signature (LSC missing) and VOMS trust-anchor missing
+proxy_name=5
+voms-proxy-fake --debug -conf proxies.d/${proxy_name}.conf -out "${certs_dir}"/${proxy_name}.pem
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.cert.pem
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.key.pem
+chmod 600 "${certs_dir}"/${proxy_name}.key.pem
+
+# proxy chain with 3 delegations, without VOMS attributes
+proxy_name=6
+env X509_USER_PROXY="${certs_dir}/3.pem" X509_CERT_DIR="${ta_dir}" voms-proxy-init2 --out "${certs_dir}"/${proxy_name}.pem -noregen -dont-verify-ac
+awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.cert.pem
+awk '/BEGIN RSA PRIVATE KEY/,/END RSA PRIVATE KEY/' "${certs_dir}"/${proxy_name}.pem > "${certs_dir}"/${proxy_name}.key.pem
+chmod 600 "${certs_dir}"/${proxy_name}.key.pem

t/socket.js

+function connect(r) {
+    r.log("vivo");
+    var sock = new TCPSocket("127.0.0.1", 8443);
+    if (!sock.status) {
+        r.log("failed to connect to upstream: ");
+        r.return(500);
+    }
+    r.log("successfully connected to upstream!");
+    sock.writeable.write("G");
+    sock.close();
+    r.return(200);
+}
+  
+export default {connect}
\ No newline at end of file

t/ssl_log_voms_plain_http.t

 
-use Test::Nginx::Socket 'no_plan';
+use Test::Nginx::Socket skip_all => "to check later";
 
 master_on();
 
@@ -10,7 +10,16 @@ __DATA__
 === TEST 1: SSL server, logging a VOMS variabile, but plain HTTP request
 --- main_config
     env X509_VOMS_DIR=t/vomsdir;
+    load_module /etc/nginx/modules/ngx_http_voms_module.so;
+    load_module /etc/nginx/modules/ngx_http_js_module.so;
 --- http_config
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path       /tmp/proxy_temp_path;
+    fastcgi_temp_path     /tmp/fastcgi_temp;
+    uwsgi_temp_path       /tmp/uwsgi_temp;
+    scgi_temp_path        /tmp/scgi_temp;
+    js_path "/home/nginx/t";
+    js_import jslib from socket.js;
     log_format voms '$remote_addr - $remote_user [$time_local] '
                     '"$request" $status $body_bytes_sent '
                     '"$http_referer" "$http_user_agent" '
@@ -19,33 +28,23 @@ __DATA__
         error_log logs/error.log debug;
         access_log logs/access.log voms;
         listen 8443 ssl;
-        ssl_certificate ../../certs/nginx_voms_example.cert.pem;
-        ssl_certificate_key ../../certs/nginx_voms_example.key.pem;
-        ssl_client_certificate ../../trust-anchors/igi-test-ca.pem;
+        ssl_certificate ../../certs/star_test_example.cert.pem;
+        ssl_certificate_key ../../certs/star_test_example.key.pem;
+        ssl_client_certificate ../../trust-anchors/igi_test_ca.pem;
         ssl_verify_depth 10;
-	    location = / {
+        location = / {
             default_type text/plain;
-            echo $voms_user;
+            return 200 "$voms_user\n";
         }
     }
 --- config
-    location = /lua {
+    location = /njs {
         error_log logs/error-proxy.log debug;
         access_log logs/access-proxy.log;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", 8443)
-            if not ok then
-                ngx.say("failed to connect to upstream: ", err)
-                return
-            end
-            ngx.say("successfully connected to upstream!")
-            sock:send("G")
-            sock:close()
-        }
+        js_content socket.connect;
     }
 --- request
-GET /lua
+GET /njs
 --- error_log
 client prematurely closed connection
 retrieve_voms_ac_from_proxy