merge 5.6p1

1 files changed, 185 insertions, 36 deletions

diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 7a58e7b75..a41a9a9c0 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cert-userkey.sh,v 1.3 2010/03/04 10:38:23 djm Exp $
+#       $OpenBSD: cert-userkey.sh,v 1.6 2010/06/29 23:59:54 djm Exp $
 #       Placed in the Public Domain.
 
 tid="certified user keys"
@@ -18,8 +18,128 @@ for ktype in rsa dsa ; do
                 fail "ssh-keygen of cert_user_key_${ktype} failed"
         ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I \
             "regress user key for $USER" \
-            -n $USER $OBJ/cert_user_key_${ktype} ||
+            -n ${USER},mekmitasdigoat $OBJ/cert_user_key_${ktype} ||
                 fail "couldn't sign cert_user_key_${ktype}"
+        cp $OBJ/cert_user_key_${ktype} $OBJ/cert_user_key_${ktype}_v00
+        cp $OBJ/cert_user_key_${ktype}.pub $OBJ/cert_user_key_${ktype}_v00.pub
+        ${SSHKEYGEN} -q -t v00 -s $OBJ/user_ca_key -I \
+            "regress user key for $USER" \
+            -n ${USER},mekmitasdigoat $OBJ/cert_user_key_${ktype}_v00 ||
+                fail "couldn't sign cert_user_key_${ktype}_v00"
+done
+
+# Test explicitly-specified principals
+for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+        for privsep in yes no ; do
+                _prefix="${ktype} privsep $privsep"
+
+                # Setup for AuthorizedPrincipalsFile
+                rm -f $OBJ/authorized_keys_$USER
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo "UsePrivilegeSeparation $privsep"
+                        echo "AuthorizedPrincipalsFile " \
+                            "$OBJ/authorized_principals_%u"
+                        echo "TrustedUserCAKeys $OBJ/user_ca_key.pub"
+                ) > $OBJ/sshd_proxy
+
+                # Missing authorized_principals
+                verbose "$tid: ${_prefix} missing authorized_principals"
+                rm -f $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # Empty authorized_principals
+                verbose "$tid: ${_prefix} empty authorized_principals"
+                echo > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+        
+                # Wrong authorized_principals
+                verbose "$tid: ${_prefix} wrong authorized_principals"
+                echo gregorsamsa > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # Correct authorized_principals
+                verbose "$tid: ${_prefix} correct authorized_principals"
+                echo mekmitasdigoat > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+
+                # authorized_principals with bad key option
+                verbose "$tid: ${_prefix} authorized_principals bad key opt"
+                echo 'blah mekmitasdigoat' > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # authorized_principals with command=false
+                verbose "$tid: ${_prefix} authorized_principals command=false"
+                echo 'command="false" mekmitasdigoat' > \
+                    $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+
+                # authorized_principals with command=true
+                verbose "$tid: ${_prefix} authorized_principals command=true"
+                echo 'command="true" mekmitasdigoat' > \
+                    $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost false >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+
+                # Setup for principals= key option
+                rm -f $OBJ/authorized_principals_$USER
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo "UsePrivilegeSeparation $privsep"
+                ) > $OBJ/sshd_proxy
+
+                # Wrong principals list
+                verbose "$tid: ${_prefix} wrong principals key option"
+                (
+                        echon 'cert-authority,principals="gregorsamsa" '
+                        cat $OBJ/user_ca_key.pub
+                ) > $OBJ/authorized_keys_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # Correct principals list
+                verbose "$tid: ${_prefix} correct principals key option"
+                (
+                        echon 'cert-authority,principals="mekmitasdigoat" '
+                        cat $OBJ/user_ca_key.pub
+                ) > $OBJ/authorized_keys_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+        done
 done
 
 basic_tests() {
@@ -35,7 +155,7 @@ basic_tests() {
                 extra_sshd="TrustedUserCAKeys $OBJ/user_ca_key.pub"
         fi
         
-        for ktype in rsa dsa ; do 
+        for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
                 for privsep in yes no ; do
                         _prefix="${ktype} privsep $privsep $auth"
                         # Simple connect
@@ -102,45 +222,50 @@ test_one() {
         result=$2
         sign_opts=$3
         auth_choice=$4
+        auth_opt=$5
 
         if test "x$auth_choice" = "x" ; then
                 auth_choice="authorized_keys TrustedUserCAKeys"
         fi
 
         for auth in $auth_choice ; do
-                cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
-                if test "x$auth" = "xauthorized_keys" ; then
-                        # Add CA to authorized_keys
-                        (
-                                echon 'cert-authority '
-                                cat $OBJ/user_ca_key.pub
-                        ) > $OBJ/authorized_keys_$USER
-                else
-                        echo > $OBJ/authorized_keys_$USER
-                        echo "TrustedUserCAKeys $OBJ/user_ca_key.pub" >> \
-                            $OBJ/sshd_proxy
-
-                fi
-                
-                verbose "$tid: $ident auth $auth expect $result"
-                ${SSHKEYGEN} -q -s $OBJ/user_ca_key \
-                    -I "regress user key for $USER" \
-                    $sign_opts \
-                    $OBJ/cert_user_key_rsa ||
-                        fail "couldn't sign cert_user_key_rsa"
-        
-                ${SSH} -2i $OBJ/cert_user_key_rsa -F $OBJ/ssh_proxy \
-                    somehost true >/dev/null 2>&1
-                rc=$?
-                if [ "x$result" = "xsuccess" ] ; then
-                        if [ $rc -ne 0 ]; then
-                                fail "$ident failed unexpectedly"
+                for ktype in rsa rsa_v00 ; do
+                        cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
+                        if test "x$auth" = "xauthorized_keys" ; then
+                                # Add CA to authorized_keys
+                                (
+                                        echon "cert-authority${auth_opt} "
+                                        cat $OBJ/user_ca_key.pub
+                                ) > $OBJ/authorized_keys_$USER
+                        else
+                                echo > $OBJ/authorized_keys_$USER
+                                echo "TrustedUserCAKeys $OBJ/user_ca_key.pub" \
+                                    >> $OBJ/sshd_proxy
+                                if test "x$auth_opt" != "x" ; then
+                                        echo $auth_opt >> $OBJ/sshd_proxy
+                                fi
                         fi
-                else
-                        if [ $rc -eq 0 ]; then
-                                fail "$ident succeeded unexpectedly"
+                        
+                        verbose "$tid: $ident auth $auth expect $result $ktype"
+                        ${SSHKEYGEN} -q -s $OBJ/user_ca_key \
+                            -I "regress user key for $USER" \
+                            $sign_opts \
+                            $OBJ/cert_user_key_${ktype} ||
+                                fail "couldn't sign cert_user_key_${ktype}"
+
+                        ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                            -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                        rc=$?
+                        if [ "x$result" = "xsuccess" ] ; then
+                                if [ $rc -ne 0 ]; then
+                                        fail "$ident failed unexpectedly"
+                                fi
+                        else
+                                if [ $rc -eq 0 ]; then
+                                        fail "$ident succeeded unexpectedly"
+                                fi
                         fi
-                fi
+                done
         done
 }
 
@@ -157,10 +282,33 @@ test_one "force-command"	failure "-n ${USER} -Oforce-command=false"
 test_one "empty principals"     success "" authorized_keys
 test_one "empty principals"     failure "" TrustedUserCAKeys
 
+# Check explicitly-specified principals: an empty principals list in the cert
+# should always be refused.
+
+# AuthorizedPrincipalsFile
+rm -f $OBJ/authorized_keys_$USER
+echo mekmitasdigoat > $OBJ/authorized_principals_$USER
+test_one "AuthorizedPrincipalsFile principals" success "-n mekmitasdigoat" \
+    TrustedUserCAKeys "AuthorizedPrincipalsFile $OBJ/authorized_principals_%u"
+test_one "AuthorizedPrincipalsFile no principals" failure "" \
+    TrustedUserCAKeys "AuthorizedPrincipalsFile $OBJ/authorized_principals_%u"
+
+# principals= key option
+rm -f $OBJ/authorized_principals_$USER
+test_one "principals key option principals" success "-n mekmitasdigoat" \
+    authorized_keys ',principals="mekmitasdigoat"'
+test_one "principals key option no principals" failure "" \
+    authorized_keys ',principals="mekmitasdigoat"'
+
 # Wrong certificate
-for ktype in rsa dsa ; do 
+cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
+for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+        case $ktype in
+        *_v00) args="-t v00" ;;
+        *) args="" ;;
+        esac
         # Self-sign
-        ${SSHKEYGEN} -q -s $OBJ/cert_user_key_${ktype} -I \
+        ${SSHKEYGEN} $args -q -s $OBJ/cert_user_key_${ktype} -I \
             "regress user key for $USER" \
             -n $USER $OBJ/cert_user_key_${ktype} ||
                 fail "couldn't sign cert_user_key_${ktype}"
@@ -173,4 +321,5 @@ for ktype in rsa dsa ; do
 done
 
 rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key*
+rm -f $OBJ/authorized_principals_$USER