summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-09-15 08:54:44 +0200
committerAndreas Schneider <asn@samba.org>2011-10-27 17:09:50 +0200
commit4186ef9560804375fedca7c43faa80e57f868339 (patch)
treecf72a8dcd212749b7add04f597b8bcea891bd70f
parentb411b81642a6317f11cfb67c04fc1313ff009bea (diff)
downloadsamba-4186ef9560804375fedca7c43faa80e57f868339.tar.gz
samba-4186ef9560804375fedca7c43faa80e57f868339.tar.bz2
samba-4186ef9560804375fedca7c43faa80e57f868339.zip
s4-torture: Add a samr privilege check.
This is the first part which checks if a deleted user is propagated correctly to all daemons and caches with user information are emtpy.
-rwxr-xr-xsource3/selftest/tests.py1
-rw-r--r--source4/torture/rpc/rpc.c1
-rw-r--r--source4/torture/rpc/samr_priv.c327
-rw-r--r--source4/torture/wscript_build2
4 files changed, 330 insertions, 1 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index b4c41fd404..546ca12c36 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -191,6 +191,7 @@ rpc = ["rpc.authcontext", "rpc.samba3.bind", "rpc.samba3.srvsvc", "rpc.samba3.sh
"rpc.lsa.privileges", "rpc.lsa.secrets",
"rpc.samr", "rpc.samr.users", "rpc.samr.users.privileges", "rpc.samr.passwords",
"rpc.samr.passwords.pwdlastset", "rpc.samr.large-dc", "rpc.samr.machine.auth",
+ "rpc.samr.priv",
"rpc.netlogon.admin",
"rpc.schannel", "rpc.schannel2", "rpc.bench-schannel1", "rpc.join", "rpc.bind"]
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 01ce93f373..41668e00a3 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -503,6 +503,7 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_suite(suite, torture_rpc_samr_passwords_lockout(suite));
torture_suite_add_suite(suite, torture_rpc_samr_user_privileges(suite));
torture_suite_add_suite(suite, torture_rpc_samr_large_dc(suite));
+ torture_suite_add_suite(suite, torture_rpc_samr_priv(suite));
torture_suite_add_suite(suite, torture_rpc_epmapper(suite));
torture_suite_add_suite(suite, torture_rpc_initshutdown(suite));
torture_suite_add_suite(suite, torture_rpc_oxidresolve(suite));
diff --git a/source4/torture/rpc/samr_priv.c b/source4/torture/rpc/samr_priv.c
new file mode 100644
index 0000000000..3e0302e08a
--- /dev/null
+++ b/source4/torture/rpc/samr_priv.c
@@ -0,0 +1,327 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * test suite for samr rpc operations
+ *
+ * Copyright (c) 2011 Andreas Schneider
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "param/param.h"
+#include "torture/torture.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/rpc/dcerpc_proto.h"
+#include "torture/rpc/torture_rpc.h"
+
+#define TEST_ACCOUNT_NAME "guru"
+
+static void init_lsa_String(struct lsa_String *name, const char *s)
+{
+ name->string = s;
+}
+
+static bool test_samr_queryUserInfo(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *user_handle)
+{
+ struct samr_QueryUserInfo r;
+ union samr_UserInfo *info;
+ NTSTATUS status;
+
+ r.in.level = UserGeneralInformation;
+ r.in.user_handle = user_handle;
+ r.out.info = &info;
+
+ status = dcerpc_samr_QueryUserInfo_r(b,
+ tctx,
+ &r);
+ torture_assert_ntstatus_ok(tctx, status, "queryUserInfo failed");
+ if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_OK)) {
+ torture_comment(tctx, "queryUserInfo failed");
+ return false;
+ }
+
+ return true;
+}
+
+static bool test_LookupName(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
+ struct policy_handle *domain_handle,
+ const char *name,
+ uint32_t *rid)
+{
+ NTSTATUS status;
+ struct samr_LookupNames n;
+ struct lsa_String sname[1];
+ struct samr_Ids rids, types;
+
+ init_lsa_String(&sname[0], name);
+
+ n.in.domain_handle = domain_handle;
+ n.in.num_names = 1;
+ n.in.names = sname;
+ n.out.rids = &rids;
+ n.out.types = &types;
+
+ status = dcerpc_samr_LookupNames_r(b, tctx, &n);
+ if (!NT_STATUS_IS_OK(status)) {
+ return false;
+ }
+ if (!NT_STATUS_IS_OK(n.out.result)) {
+ return false;
+ }
+
+ *rid = n.out.rids->ids[0];
+ return true;
+}
+
+static bool test_samr_OpenUser(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *domain_handle,
+ const char *name,
+ struct policy_handle *user_handle,
+ bool expected)
+{
+ struct samr_OpenUser r;
+ uint32_t rid = 0;
+ NTSTATUS status;
+ bool ok;
+
+ ok = test_LookupName(b, tctx, domain_handle, name, &rid);
+ if (!ok && expected) {
+ torture_comment(tctx, " - lookup name for %s failed\n", name);
+ return true;
+ } else if (!ok) {
+ return false;
+ }
+
+ r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r.in.domain_handle = domain_handle;
+ r.in.rid = rid;
+ r.out.user_handle = user_handle;
+
+ status = dcerpc_samr_OpenUser_r(b, tctx, &r);
+ torture_assert_ntstatus_ok(tctx, status, "CreateUser failed");
+ if (!NT_STATUS_IS_OK(r.out.result)) {
+ torture_comment(tctx, "CreateUser failed");
+ return false;
+ }
+
+ return true;
+}
+
+static bool test_samr_openDomain(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *connect_handle,
+ const char *domain,
+ struct policy_handle *domain_handle)
+{
+ struct samr_LookupDomain r;
+ struct samr_OpenDomain r2;
+ struct lsa_String n;
+ struct dom_sid *sid;
+ NTSTATUS status;
+
+ r.in.connect_handle = connect_handle;
+ init_lsa_String(&n, domain);
+ r.in.domain_name = &n;
+ r.out.sid = &sid;
+
+ status = dcerpc_samr_LookupDomain_r(b, tctx, &r);
+ torture_assert_ntstatus_ok(tctx, status, "LookupDomain failed");
+ if (!NT_STATUS_IS_OK(r.out.result)) {
+ torture_comment(tctx, "LookupDomain failed - %s\n", nt_errstr(r.out.result));
+ return false;
+ }
+
+ r2.in.connect_handle = connect_handle;
+ r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r2.in.sid = sid;
+ r2.out.domain_handle = domain_handle;
+
+ status = dcerpc_samr_OpenDomain_r(b, tctx, &r2);
+ torture_assert_ntstatus_ok(tctx, status, "OpenDomain failed");
+ if (!NT_STATUS_IS_OK(r2.out.result)) {
+ torture_comment(tctx, "OpenDomain failed - %s\n", nt_errstr(r.out.result));
+ return false;
+ }
+
+ return true;
+}
+
+static bool test_samr_Connect(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *connect_handle)
+{
+ struct samr_Connect r;
+ NTSTATUS status;
+
+ r.in.system_name = 0;
+ r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r.out.connect_handle = connect_handle;
+
+ status = dcerpc_samr_Connect_r(b, tctx, &r);
+ torture_assert_ntstatus_ok(tctx, status, "SAMR connect failed");
+ if (!NT_STATUS_IS_OK(r.out.result)) {
+ torture_comment(tctx, "Connect failed - %s\n", nt_errstr(r.out.result));
+ return false;
+ }
+
+ return true;
+}
+
+static bool test_samr_userinfo_getinfo(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ bool expected)
+{
+ const char *name;
+ struct dcerpc_pipe *p2 = NULL;
+ struct dcerpc_binding_handle *b;
+ struct policy_handle connect_handle;
+ struct policy_handle domain_handle;
+ struct policy_handle user_handle;
+ NTSTATUS status;
+ uint32_t i = 0;
+ bool ok;
+
+ status = torture_rpc_connection(tctx, &p2, &ndr_table_samr);
+ torture_assert_ntstatus_ok(tctx, status,
+ "Creating secondary connection failed");
+ b = p2->binding_handle;
+
+ torture_comment(tctx, " - 2nd connect\n");
+ /* connect */
+ ZERO_STRUCT(connect_handle);
+ ok = test_samr_Connect(tctx, b, &connect_handle);
+ torture_assert(tctx, ok, "Unable to connect to domain");
+
+ torture_comment(tctx, " - 2nd open domain\n");
+ /* open domain */
+ ZERO_STRUCT(domain_handle);
+ ok = test_samr_openDomain(tctx,
+ b,
+ &connect_handle,
+ torture_setting_string(tctx, "workgroup",
+ lpcfg_workgroup(tctx->lp_ctx)),
+ &domain_handle);
+ torture_assert(tctx, ok, "Unable to open to domain");
+
+ /* create user */
+ name = talloc_asprintf(tctx,
+ "%s%04d",
+ TEST_ACCOUNT_NAME,
+ i);
+
+ torture_comment(tctx, " - 2nd open user\n");
+ ZERO_STRUCT(user_handle);
+ ok = test_samr_OpenUser(tctx,
+ b,
+ &domain_handle,
+ name,
+ &user_handle,
+ expected);
+ torture_assert(tctx, ok, "Unable to open user");
+
+ if (!expected) {
+ torture_comment(tctx, " - 2nd query user\n");
+ ok = test_samr_queryUserInfo(tctx, b, &user_handle);
+ torture_assert(tctx, ok, "Unable to query user");
+
+ test_samr_handle_Close(b, tctx, &user_handle);
+ }
+
+ test_samr_handle_Close(b, tctx, &domain_handle);
+ test_samr_handle_Close(b, tctx, &connect_handle);
+
+ talloc_free(p2);
+
+ return true;
+}
+
+#define NUM_RUNS 20
+static bool torture_rpc_samr_caching(struct torture_context *tctx,
+ struct dcerpc_pipe *p)
+{
+ struct test_join *join;
+ const char *password = NULL;
+ const char *name;
+ NTSTATUS status;
+ uint32_t i = 0;
+ bool ok;
+
+ torture_comment(tctx, ">>> Testing User Info Caching\n");
+
+ /* create user */
+ name = talloc_asprintf(tctx,
+ "%s%04d",
+ TEST_ACCOUNT_NAME,
+ i);
+
+ torture_comment(tctx, "- Creating user %s\n", name);
+
+ join = torture_create_testuser(tctx,
+ name,
+ torture_setting_string(tctx, "workgroup",
+ lpcfg_workgroup(tctx->lp_ctx)),
+ ACB_NORMAL,
+ &password);
+ if (join == NULL) {
+ return false;
+ }
+
+ torture_comment(tctx, "- Query user information\n");
+ for (i = 0; i < NUM_RUNS; i++) {
+ ok = test_samr_userinfo_getinfo(tctx, p, false);
+ torture_assert(tctx, ok, "test_samr_userinfo_getinfo failed");
+ }
+
+ torture_comment(tctx, "- Delete user\n");
+ status = torture_delete_testuser(tctx,
+ join,
+ name);
+ if (!NT_STATUS_IS_OK(status)) {
+ torture_comment(tctx, "DeleteUser failed - %s\n",
+ nt_errstr(status));
+ return false;
+ }
+
+ torture_comment(tctx, "- Try to query user information again (should fail)\n");
+ for (i = 0; i < NUM_RUNS; i++) {
+ ok = test_samr_userinfo_getinfo(tctx,
+ p,
+ true);
+ torture_assert(tctx, ok, "test_samr_userinfo_getinfo failed");
+ }
+
+ return true;
+}
+#undef NUM_RUNS
+
+struct torture_suite *torture_rpc_samr_priv(TALLOC_CTX *mem_ctx)
+{
+ struct torture_suite *suite =
+ torture_suite_create(mem_ctx, "samr.priv");
+ struct torture_rpc_tcase *tcase;
+
+ tcase = torture_suite_add_rpc_iface_tcase(suite,
+ "samr",
+ &ndr_table_samr);
+
+ torture_rpc_tcase_add_test(tcase,
+ "caching",
+ torture_rpc_samr_caching);
+
+ return suite;
+}
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 704f26f994..f1692e87c9 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -40,7 +40,7 @@ bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
bld.SAMBA_MODULE('torture_rpc',
- source='rpc/join.c rpc/lsa.c rpc/forest_trust.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/multi_bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c rpc/bind.c rpc/backupkey.c',
+ source='rpc/join.c rpc/lsa.c rpc/forest_trust.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/samr_priv.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/multi_bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c rpc/bind.c rpc/backupkey.c',
autoproto='rpc/proto.h',
subsystem='smbtorture',
init_function='torture_rpc_init',