diff options
| author | Christof Schmitt <cs@samba.org> | 2018-02-28 13:10:43 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-04-11 11:52:25 +0200 |
| commit | 40ee7863a558568c69ee990fb8405ab51febae34 (patch) | |
| tree | cf7fae6d3e575e6fbe83fe689623f06ddfd81ded | |
| parent | 80560167956cde78652d804cdf26385f759ba39b (diff) | |
| download | samba-40ee7863a558568c69ee990fb8405ab51febae34.tar.gz | |
Add test for wbinfo name lookup
This demonstrates that wbinfo -n / --name-to-sid returns information
instead of failing the request. More specifically the query for
INVALIDDOMAIN//user returns the user SID for the joined domain, instead
of failing the request.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13312
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 552a00ec1f6795b9025298931a6cc50ebe552052)
| -rwxr-xr-x | nsswitch/tests/test_wbinfo_name_lookup.sh | 40 | ||||
| -rw-r--r-- | selftest/knownfail | 2 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 4 |
3 files changed, 46 insertions, 0 deletions
diff --git a/nsswitch/tests/test_wbinfo_name_lookup.sh b/nsswitch/tests/test_wbinfo_name_lookup.sh new file mode 100755 index 00000000000..696e25b3a2a --- /dev/null +++ b/nsswitch/tests/test_wbinfo_name_lookup.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Blackbox test for wbinfo name lookup +if [ $# -lt 2 ]; then +cat <<EOF +Usage: test_wbinfo.sh DOMAIN DC_USERNAME +EOF +exit 1; +fi + +DOMAIN=$1 +DC_USERNAME=$2 +shift 2 + +failed=0 +sambabindir="$BINDIR" +wbinfo="$VALGRIND $sambabindir/wbinfo" + +. `dirname $0`/../../testprogs/blackbox/subunit.sh + +# Correct query is expected to work +testit "name-to-sid.single-separator" \ + $wbinfo -n $DOMAIN/$DC_USERNAME || \ + failed=$(expr $failed + 1) + +# Two separator characters should fail +testit_expect_failure "name-to-sid.double-separator" \ + $wbinfo -n $DOMAIN//$DC_USERNAME || \ + failed=$(expr $failed + 1) + +# Invalid domain is expected to fail +testit_expect_failure "name-to-sid.invalid-domain" \ + $wbinfo -n INVALID/$DC_USERNAME || \ + failed=$(expr $failed + 1) + +# Invalid domain with two separator characters is expected to fail +testit_expect_failure "name-to-sid.double-separator-invalid-domain" \ + $wbinfo -n INVALID//$DC_USERNAME || \ + failed=$(expr $failed + 1) + +exit $failed diff --git a/selftest/knownfail b/selftest/knownfail index 710fd33894e..06d4cd636ba 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -343,3 +343,5 @@ # Disabling NTLM means you can't use samr to change the password ^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\) ^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\) +samba3.wbinfo_name_lookup.name-to-sid.double-separator\(ad_member\) +samba3.wbinfo_name_lookup.name-to-sid.double-separator-invalid-domain\(ad_member\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index e1b0e35e8d9..092605d50e2 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -207,6 +207,10 @@ for env in ["nt4_member", "ad_member"]: env = "ad_member" t = "--krb5auth=$DOMAIN/$DC_USERNAME%$DC_PASSWORD" plantestsuite("samba3.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t]) +plantestsuite("samba3.wbinfo_name_lookup", env, + [ os.path.join(srcdir(), + "nsswitch/tests/test_wbinfo_name_lookup.sh"), + '$DOMAIN', '$DC_USERNAME' ]) t = "WBCLIENT-MULTI-PING" plantestsuite("samba3.smbtorture_s3.%s" % t, env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//foo/bar', '""', '""', smbtorture3, ""]) plantestsuite("samba3.substitutions", env, [os.path.join(samba3srcdir, "script/tests/test_substitutions.sh"), "$SERVER", "alice", "Secret007", "$PREFIX"]) |