gss: port NegoEx implementation from MIT

An implementation of draft-zhu-negoex-04 for MIT Kerberos was developed in 2011. This has been recently integrated, with many fixes from Greg Hudson. This commit ports it to Heimdal. The implementation has been interoperability tested with MIT Kerberos and Windows, using the GSS EAP mechanism developed as part of the Moonshot project. The SPNEGO code was also updated to import the state machine from Apple which improves mechListMIC processing and avoids discarding initial context tokens generated during mechanism probing, that can be used for optimistic tokens. Finally, to aid in testing, the GSS-API mechanism glue configuration file can be changed using the environment variable GSS_MECH_CONFIG. This environment variable name, along with the format of the configuration file, is compatible with MIT (although it would be difficult for a single mechanism binary to support both implementations).
2019-12-30 13:34:10 +11:00
parent ae5c60286a
commit 4fb6a6adc9
45 changed files with 6241 additions and 863 deletions
--- a/tests/bin/setup-env.in
+++ b/tests/bin/setup-env.in
@@ -6,6 +6,9 @@ export HEIM_PIDFILE_DIR
 unset KRB5_CONFIG
 unset KRB5CCNAME

+unset GSS_MECH_CONFIG
+unset GSSAPI_SPNEGO_NAME
+
 top_builddir="@top_builddir@"
 top_srcdir="@top_srcdir@"
 EGREP="@EGREP@"
--- a/tests/gss/Makefile.am
+++ b/tests/gss/Makefile.am
@@ -2,9 +2,9 @@

 include $(top_srcdir)/Makefile.am.common

-noinst_DATA = krb5.conf
+noinst_DATA = krb5.conf mech

-SCRIPT_TESTS = check-basic check-gss check-gssmask check-context check-spnego check-ntlm
+SCRIPT_TESTS = check-basic check-gss check-gssmask check-context check-spnego check-ntlm check-negoex

 TESTS = $(SCRIPT_TESTS)

@@ -49,10 +49,19 @@ check-ntlm: check-ntlm.in Makefile
 	chmod +x check-ntlm.tmp && \
 	mv check-ntlm.tmp check-ntlm

+check-negoex: check-negoex.in Makefile
+	$(do_subst) < $(srcdir)/check-negoex.in > check-negoex.tmp && \
+	chmod +x check-negoex.tmp && \
+	mv check-negoex.tmp check-negoex
+
 krb5.conf: krb5.conf.in Makefile
 	$(do_subst) < $(srcdir)/krb5.conf.in > krb5.conf.tmp && \
 	mv krb5.conf.tmp krb5.conf

+mech: mech.in Makefile
+	$(do_subst) < $(srcdir)/mech.in > mech.tmp && \
+	mv mech.tmp mech
+
 CLEANFILES= \
 	$(TESTS) \
 	foopassword \
@@ -61,6 +70,7 @@ CLEANFILES= \
 	krb5ccfile-ds \
 	server.keytab \
 	krb5.conf \
+	mech \
 	current-db* \
 	*.log \
 	tempfile \
@@ -80,4 +90,5 @@ EXTRA_DIST = \
 	check-ntlm.in \
 	check-context.in \
 	ntlm-user-file.txt \
-	krb5.conf.in
+	krb5.conf.in \
+	mech.in
--- a/tests/gss/check-gssmask.in
+++ b/tests/gss/check-gssmask.in
@@ -61,6 +61,7 @@ gssmaestro="../../appl/gssmask/gssmaestro"
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG

+KRB5CCNAME=${cache}
 rm -f ${keytabfile}
 rm -f current-db*
 rm -f out-*
--- a/tests/gss/check-negoex.in
+++ b/tests/gss/check-negoex.in
@@ -0,0 +1,183 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Kungliga Tekniska Högskolan
+# (Royal Institute of Technology, Stockholm, Sweden). 
+# All rights reserved. 
+#
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions 
+# are met: 
+#
+# 1. Redistributions of source code must retain the above copyright 
+#    notice, this list of conditions and the following disclaimer. 
+#
+# 2. Redistributions in binary form must reproduce the above copyright 
+#    notice, this list of conditions and the following disclaimer in the 
+#    documentation and/or other materials provided with the distribution. 
+#
+# 3. Neither the name of the Institute nor the names of its contributors 
+#    may be used to endorse or promote products derived from this software 
+#    without specific prior written permission. 
+#
+# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+# SUCH DAMAGE. 
+#
+# $Id$
+#
+
+env_setup="@env_setup@"
+srcdir="@srcdir@"
+objdir="@objdir@"
+
+. ${env_setup}
+
+R=TEST.H5L.SE
+
+port=@port@
+
+keytabfile="${objdir}/server.keytab-no"
+keytab="FILE:${keytabfile}-no"
+cache="FILE:krb5ccfile-no"
+cacheds="FILE:krb5ccfile-ds-no"
+
+context="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_context"
+
+KRB5_CONFIG="${objdir}/krb5.conf"
+export KRB5_CONFIG
+
+KRB5_KTNAME="${keytab}-no"
+export KRB5_KTNAME
+KRB5CCNAME="${cache}-no"
+export KRB5CCNAME
+unset NTLM_ACCEPTOR_CCACHE
+unset NTLM_USER_FILE
+
+GSSAPI_SPNEGO_NAME=host@host.test.h5l.se
+export GSSAPI_SPNEGO_NAME
+
+GSS_MECH_CONFIG="${objdir}/mech"
+export GSS_MECH_CONFIG
+
+> messages.log
+
+exitcode=0
+
+echo "======context building for negoex"
+
+for HOPS in 1 2 3 4 5
+do
+    echo "test_negoex_1 $HOPS hops"
+    ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se || \
+	{ exitcode=1 ; echo test failed; }
+done
+
+for HOPS in 1 2 3 4 5
+do
+    echo "test_negoex_1 $HOPS hops early keys"
+    KEY=always ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se || \
+	{ exitcode=1 ; echo test failed; }
+done
+
+HOPS=1
+echo "test_negoex_1 no keys"
+    KEY=never ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null && \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 no optimistic token"
+    NEGOEX_NO_OPTIMISTIC_TOKEN=1 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se || \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 initiator query fail, test_negoex_2 pass"
+    INIT_QUERY_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_2 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null || \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 acceptor query fail, test_negoex_2 pass"
+    ACCEPT_QUERY_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_2 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null || \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 acceptor exchange fail, test_negoex_2 pass"
+    ACCEPT_EXCHANGE_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_2 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null || \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 first mech initiator exchange fail"
+    INIT_EXCHANGE_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null && \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 first mech initiator exchange fail, two hops"
+    HOPS=2 INIT_EXCHANGE_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null && \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 first mech initiator exchange fail, two hops, early keys"
+    HOPS=2 KEY=always INIT_EXCHANGE_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null && \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 first mech init_sec_context fail"
+    INIT_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null && \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 first mech accept_sec_context fail"
+    HOPS=2 ACCEPT_FAIL=102 ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se 2>/dev/null && \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 alert from acceptor to initiator"
+    HOPS=3 KEY=init-always ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se || \
+	{ exitcode=1 ; echo test failed; }
+
+echo "test_negoex_1 alert from initiator to acceptor"
+    HOPS=4 KEY=accept-always ${context} \
+	--mech-type=spnego --ret-mech-type=test_negoex_1 \
+	--name-type=hostbased-service \
+	host@host.test.h5l.se || \
+	{ exitcode=1 ; echo test failed; }
+
+trap "" EXIT
+
+exit $exitcode
--- a/tests/gss/check-ntlm.in
+++ b/tests/gss/check-ntlm.in
@@ -63,6 +63,7 @@ context="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_context"
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG

+KRB5CCNAME=${cache}
 KRB5_KTNAME="${keytab}"
 export KRB5_KTNAME
 KRB5CCNAME="${cache}"
--- a/tests/gss/check-spnego.in
+++ b/tests/gss/check-spnego.in
@@ -62,6 +62,7 @@ context="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_context"
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG

+KRB5CCNAME=${cache}
 KRB5_KTNAME="${keytab}"
 export KRB5_KTNAME
 KRB5CCNAME="${cache}"
--- a/tests/gss/mech.in
+++ b/tests/gss/mech.in
@@ -0,0 +1,5 @@
+#
+# Test GSS-API mechglue configuration file.
+#
+test_negoex_1 2.25.1414534758 @objdir@/../../lib/gssapi/.libs/test_negoex_mech.so
+test_negoex_2 2.25.1175737388 @objdir@/../../lib/gssapi/.libs/test_negoex_mech.so