From de8a0ee020699ec237dd4c8dbb04bf6cbe15a0d4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 14 Mar 2023 10:22:36 +0100 Subject: [PATCH] testprogs: Merge kinit 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 --- source4/selftest/tests.py | 121 +++---- testprogs/blackbox/test_kinit.sh | 555 +++++++++++++++++++++++++++++++ 2 files changed, 595 insertions(+), 81 deletions(-) create mode 100755 testprogs/blackbox/test_kinit.sh diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 6d2b55f5cd0..7883f0a996a 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -568,48 +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", - "ad_dc:local", - [ - os.path.join(bbdir, "test_kinit_heimdal.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$PREFIX', - "aes256-cts-hmac-sha1-96", - smbclient3, - configuration - ]) - plantestsuite("samba4.blackbox.kinit", - "fl2000dc:local", - [ - os.path.join(bbdir, "test_kinit_heimdal.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$PREFIX', - "arcfour-hmac-md5", - smbclient3, - configuration - ]) - plantestsuite("samba4.blackbox.kinit", - "fl2008r2dc:local", - [ - os.path.join(bbdir, "test_kinit_heimdal.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$PREFIX', - "aes256-cts-hmac-sha1-96", - smbclient3, - configuration - ]) plantestsuite("samba4.blackbox.kinit_trust", "fl2008r2dc:local", [ @@ -709,45 +667,6 @@ if have_heimdal_support: configuration ]) else: - plantestsuite("samba4.blackbox.kinit", - "ad_dc:local", - [ - os.path.join(bbdir, "test_kinit_mit.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$PREFIX', - smbclient3, - configuration - ]) - plantestsuite("samba4.blackbox.kinit", - "fl2000dc:local", - [ - os.path.join(bbdir, "test_kinit_mit.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$PREFIX', - smbclient3, - configuration - ]) - plantestsuite("samba4.blackbox.kinit", - "fl2008r2dc:local", - [ - os.path.join(bbdir, "test_kinit_mit.sh"), - '$SERVER', - '$USERNAME', - '$PASSWORD', - '$REALM', - '$DOMAIN', - '$PREFIX', - smbclient3, - configuration - ]) plantestsuite("samba4.blackbox.kinit_trust", "fl2008r2dc:local", [ @@ -827,6 +746,46 @@ else: configuration ]) +plantestsuite("samba4.blackbox.kinit_simple", + "ad_dc:local", + [ + os.path.join(bbdir, "test_kinit.sh"), + '$SERVER', + '$USERNAME', + '$PASSWORD', + '$REALM', + '$DOMAIN', + '$PREFIX', + smbclient3, + configuration + ]) +plantestsuite("samba4.blackbox.kinit_simple", + "fl2000dc:local", + [ + os.path.join(bbdir, "test_kinit.sh"), + '$SERVER', + '$USERNAME', + '$PASSWORD', + '$REALM', + '$DOMAIN', + '$PREFIX', + smbclient3, + configuration + ]) +plantestsuite("samba4.blackbox.kinit_simple", + "fl2008r2dc:local", + [ + os.path.join(bbdir, "test_kinit.sh"), + '$SERVER', + '$USERNAME', + '$PASSWORD', + '$REALM', + '$DOMAIN', + '$PREFIX', + smbclient3, + configuration + ]) + plantestsuite("samba4.blackbox.pkinit_simple", "ad_dc:local", [os.path.join(bbdir, "test_pkinit_simple.sh"), diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh new file mode 100755 index 00000000000..80188e8f852 --- /dev/null +++ b/testprogs/blackbox/test_kinit.sh @@ -0,0 +1,555 @@ +#!/bin/sh +# Blackbox tests for kinit and kerberos integration with smbclient etc +# Copyright (c) Andreas Schneider +# Copyright (C) 2006-2007 Jelmer Vernooij +# Copyright (C) 2006-2008 Andrew Bartlett + +if [ $# -lt 8 ]; then + cat <"${PREFIX}/tmpldbmodify" <"${PREFIX}/tmpldbmodify" <"${PREFIX}/tmpkpasswdscript" <"${PREFIX}/tmpkpasswdscript" <"${PREFIX}/tmpldbmodify" <"${PREFIX}/tmpkinituserpassscript" <"${PREFIX}/tmpkinituserpassscript" <