From: Andreas Schneider Date: Wed, 15 Mar 2023 07:43:54 +0000 (+0100) Subject: testprogs: Merge kinit trust tests into a single script for MIT and Heimdal X-Git-Tag: talloc-2.4.1~1003 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f18ca8a5c8b80756d47f9a3ac5167bfb31f48978;p=thirdparty%2Fsamba.git testprogs: Merge kinit trust tests into a single script for MIT and Heimdal BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336 Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 7883f0a996a..8bee95d5d37 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -568,63 +568,6 @@ plantestsuite("samba4.blackbox.test_primary_group", "ad_dc:local", [os.path.join plantestsuite("samba4.blackbox.test_old_enctypes", "fl2003dc:local", [os.path.join(bbdir, "test_old_enctypes.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX_ABS']) if have_heimdal_support: - plantestsuite("samba4.blackbox.kinit_trust", - "fl2008r2dc:local", - [ - os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$TRUST_SERVER', - '$TRUST_USERNAME', - '$TRUST_PASSWORD', - '$TRUST_REALM', - '$TRUST_DOMAIN', - '$PREFIX', - "forest", - "aes256-cts-hmac-sha1-96", - configuration - ]) - plantestsuite("samba4.blackbox.kinit_trust", - "fl2003dc:local", - [ - os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$TRUST_SERVER', - '$TRUST_USERNAME', - '$TRUST_PASSWORD', - '$TRUST_REALM', - '$TRUST_DOMAIN', - '$PREFIX', - "external", - "arcfour-hmac-md5", - configuration - ]) - plantestsuite("samba4.blackbox.kinit_trust", - "fl2000dc:local", - [ - os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$TRUST_SERVER', - '$TRUST_USERNAME', - '$TRUST_PASSWORD', - '$TRUST_REALM', - '$TRUST_DOMAIN', - '$PREFIX', - "external", - "arcfour-hmac-md5", - configuration - ]) plantestsuite("samba4.blackbox.export.keytab", "ad_dc:local", [ @@ -667,60 +610,6 @@ if have_heimdal_support: configuration ]) else: - plantestsuite("samba4.blackbox.kinit_trust", - "fl2008r2dc:local", - [ - os.path.join(bbdir, "test_kinit_trusts_mit.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$TRUST_SERVER', - '$TRUST_USERNAME', - '$TRUST_PASSWORD', - '$TRUST_REALM', - '$TRUST_DOMAIN', - '$PREFIX', - "forest", - configuration - ]) - plantestsuite("samba4.blackbox.kinit_trust", - "fl2003dc:local", - [ - os.path.join(bbdir, "test_kinit_trusts_mit.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$TRUST_SERVER', - '$TRUST_USERNAME', - '$TRUST_PASSWORD', - '$TRUST_REALM', - '$TRUST_DOMAIN', - '$PREFIX', - "external", - configuration - ]) - plantestsuite("samba4.blackbox.kinit_trust", - "fl2000dc:local", - [ - os.path.join(bbdir, "test_kinit_trusts_mit.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$TRUST_SERVER', - '$TRUST_USERNAME', - '$TRUST_PASSWORD', - '$TRUST_REALM', - '$TRUST_DOMAIN', - '$PREFIX', - "external", - configuration - ]) plantestsuite("samba4.blackbox.export.keytab", "ad_dc:local", [ @@ -786,6 +675,62 @@ plantestsuite("samba4.blackbox.kinit_simple", configuration ]) + +plantestsuite("samba4.blackbox.kinit_trust", + "fl2008r2dc:local", + [ + os.path.join(bbdir, "test_kinit_trusts.sh"), + '$SERVER', + '$USERNAME', + '$PASSWORD', + '$REALM', + '$DOMAIN', + '$TRUST_SERVER', + '$TRUST_USERNAME', + '$TRUST_PASSWORD', + '$TRUST_REALM', + '$TRUST_DOMAIN', + '$PREFIX', + "forest", + configuration + ]) +plantestsuite("samba4.blackbox.kinit_trust", + "fl2003dc:local", + [ + os.path.join(bbdir, "test_kinit_trusts.sh"), + '$SERVER', + '$USERNAME', + '$PASSWORD', + '$REALM', + '$DOMAIN', + '$TRUST_SERVER', + '$TRUST_USERNAME', + '$TRUST_PASSWORD', + '$TRUST_REALM', + '$TRUST_DOMAIN', + '$PREFIX', + "external", + configuration + ]) +plantestsuite("samba4.blackbox.kinit_trust", + "fl2000dc:local", + [ + os.path.join(bbdir, "test_kinit_trusts.sh"), + '$SERVER', + '$USERNAME', + '$PASSWORD', + '$REALM', + '$DOMAIN', + '$TRUST_SERVER', + '$TRUST_USERNAME', + '$TRUST_PASSWORD', + '$TRUST_REALM', + '$TRUST_DOMAIN', + '$PREFIX', + "external", + configuration + ]) + plantestsuite("samba4.blackbox.pkinit_simple", "ad_dc:local", [os.path.join(bbdir, "test_pkinit_simple.sh"), diff --git a/testprogs/blackbox/test_kinit_trusts.sh b/testprogs/blackbox/test_kinit_trusts.sh new file mode 100755 index 00000000000..e76d81b1da7 --- /dev/null +++ b/testprogs/blackbox/test_kinit_trusts.sh @@ -0,0 +1,247 @@ +#!/bin/sh +# Blackbox tests for kinit and trust validation +# Copyright (c) 2015 Stefan Metzmacher +# Copyright (c) Andreas Schneider + +if [ $# -lt 13 ]; then + cat <