sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-05 09:18:06 +03:00
Code

Add a blackbox tests for id & getent to test domain@realm type credentials

Browse Source 
Using domain@realm credentials has been problematic when
global conf setting "winbind use default domain" is enabled, this patch
creates a new s4member_dflt_domain environment (where
"winbind use default domain" is enabled) and runs getent & id against the
normal s4member & and new s4member_dflt_domain environments

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12298

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit ebfe3c85d0)
This commit is contained in:
Noel Power 2016-09-29 16:50:58 +01:00 committed by Stefan Metzmacher
parent 6e12cac25a
commit 0790769c09
4 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/target/Samba.pm
View File

@ -296,6 +296,7 @@ sub get_interface($)
$interfaces{"promotedvdc"} = 33;
$interfaces{"rfc2307member"} = 34;
$interfaces{"fileserver"} = 35;
$interfaces{"s4member_dflt"} = 36;
# update lib/socket_wrapper/socket_wrapper.c
# #define MAX_WRAPPED_INTERFACES 40

36
selftest/target/Samba4.pm
View File

@ -936,10 +936,10 @@ $extra_smbconf_shares
return $self->provision_raw_step2($ctx, $ret);
}
sub provision_s4member($$$)
sub provision_s4member($$$$$)
{
my ($self, $prefix, $dcvars) = @_;
print "PROVISIONING MEMBER...";
my ($self, $prefix, $dcvars, $hostname, $more_conf) = @_;
print "PROVISIONING MEMBER...\n";
my $extra_smb_conf = "
passdb backend = samba_dsdb
winbindd:use external pipes = true
@ -954,9 +954,12 @@ rpc_server:spoolss = embedded
rpc_daemon:spoolssd = embedded
rpc_server:tcpip = no
";
if ($more_conf) {
$extra_smb_conf = $extra_smb_conf . $more_conf . "\n";
}
my $ret = $self->provision($prefix,
"member server",
"s4member",
$hostname,
"SAMBADOMAIN",
"samba.example.com",
"2008",
@ -1893,6 +1896,11 @@ sub setup_env($$$)
$self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs");
}
return $self->setup_subdom_dc("$path/subdom_dc", $self->{vars}->{ad_dc_ntvfs});
} elsif ($envname eq "s4member_dflt_domain") {
if (not defined($self->{vars}->{ad_dc_ntvfs})) {
$self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs");
}
return $self->setup_s4member_dflt_domain("$path/s4member_dflt_domain", $self->{vars}->{ad_dc_ntvfs});
} elsif ($envname eq "s4member") {
if (not defined($self->{vars}->{ad_dc_ntvfs})) {
$self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs");
@ -1931,7 +1939,7 @@ sub setup_s4member($$$)
{
my ($self, $path, $dc_vars) = @_;
my $env = $self->provision_s4member($path, $dc_vars);
my $env = $self->provision_s4member($path, $dc_vars, "s4member");
if (defined $env) {
if (not defined($self->check_or_start($env, "single"))) {
@ -1944,6 +1952,24 @@ sub setup_s4member($$$)
return $env;
}
sub setup_s4member_dflt_domain($$$)
{
my ($self, $path, $dc_vars) = @_;
my $env = $self->provision_s4member($path, $dc_vars, "s4member_dflt",
"winbind use default domain = yes");
if (defined $env) {
if (not defined($self->check_or_start($env, "standard"))) {
return undef;
}
$self->{vars}->{s4member_dflt_domain} = $env;
}
return $env;
}
sub setup_rpc_proxy($$$)
{
my ($self, $path, $dc_vars) = @_;

7
source4/selftest/tests.py
View File

@ -510,6 +510,13 @@ for env in ["nt4_dc", "nt4_member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4memb
plantestsuite("samba.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, ntlm_auth3, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
for env in ["s4member_dflt_domain", "s4member"]:
for cmd in ["id", "getent"]:
users = ["$DC_USERNAME", "$DC_USERNAME@$REALM"]
if env == "s4member":
users = ["$DOMAIN/$DC_USERNAME", "$DC_USERNAME@$REALM"]
for usr in users:
plantestsuite("samba4.winbind.dom_name_parse.cmd", env, "%s/dom_parse.sh %s %s" % (bbdir,cmd,usr))
nsstest4 = binpath("nsstest")
for env in ["ad_dc:local", "ad_dc_ntvfs:local", "s4member:local", "nt4_dc:local", "ad_member:local", "nt4_member:local"]:

27
testprogs/blackbox/dom_parse.sh Executable file
View File

@ -0,0 +1,27 @@
#!/bin/sh
# Blackbox wrapper for nsstest
# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer@samba.org>
# Copyright (C) 2006-2008 Andrew Bartlett <abartlet@samba.org>
if [ $# -lt 2 ]; then
cat <<EOF
Usage: dom_parse.sh [id|getent] $USER
EOF
exit 1;
fi
USER=$2
CMD=$1
EXTRA=""
shift 2
failed=0
. `dirname $0`/subunit.sh
if [ "$CMD" = "getent" ]; then
EXTRA="passwd"
fi
testit "samba4.winbind.dom_name_parse.cmd.$CMD" $CMD $EXTRA $USER || failed=`expr $failed + 1`
exit $failed