[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed May 2 11:58:02 MDT 2012
The branch, master has been updated
via ac1e1af s4:torture:rpc: add a new test samba3.smb2-pipe-read-logoff
via 1c14538 s4:torture:rpc: add a new test samba3.smb2.pipe-read-tdis
via ecc28b8 s4:torture:rpc: add a test samba3.smb2-pipe-read-close
via e615c22 s4:torture:rpc: fix a comment typo in samba3.smb2-reauth2
via f479d8f s4:torture:rpc: remove an accidentially committed character (in a comment)
from 2b5ee34 s3-passdb: Add extra debug on ID mapping failures
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ac1e1af8cc566438e216ca1fb5657605b6dec96e
Author: Michael Adam <obnox at samba.org>
Date: Wed May 2 18:09:48 2012 +0200
s4:torture:rpc: add a new test samba3.smb2-pipe-read-logoff
- open a pipe via smb2
- trigger a read which hangs since there is nothing to read
- do a logoff
- wait for the read to return and check the status
(STATUS_PIPE_BROKEN)
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Wed May 2 19:57:45 CEST 2012 on sn-devel-104
commit 1c14538f60edf170820addbcaf24de2ae7d78ee4
Author: Michael Adam <obnox at samba.org>
Date: Wed May 2 18:03:33 2012 +0200
s4:torture:rpc: add a new test samba3.smb2.pipe-read-tdis
- open a pipe via smb2
- trigger a read which hangs since there is nothing to read
- do a tree disconnect
- wait for the read to return and check the status
(STATUS_PIPE_BROKEN)
commit ecc28b8e5dd8b7a6c7d392581aa9885378d548fc
Author: Michael Adam <obnox at samba.org>
Date: Wed May 2 14:25:58 2012 +0200
s4:torture:rpc: add a test samba3.smb2-pipe-read-close
* open a pipe via smb2
* trigger a read which hangs since there is nothing to read
* close the pipe file handle
* wait for the read to reaturn and check the status
(NT_STATUS_PIPE_BROKEN)
commit e615c22bc2d17e536ad7fc72054c97ddcb083f33
Author: Michael Adam <obnox at samba.org>
Date: Wed May 2 17:33:33 2012 +0200
s4:torture:rpc: fix a comment typo in samba3.smb2-reauth2
commit f479d8ff59bb1ebab3aade73e27504156eb97341
Author: Michael Adam <obnox at samba.org>
Date: Wed May 2 13:55:45 2012 +0200
s4:torture:rpc: remove an accidentially committed character (in a comment)
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/samba3rpc.c | 261 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 259 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 5c2dff7..30a3b85 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1,4 +1,4 @@
-/*f
+/*
Unix SMB/CIFS implementation.
dcerpc torture tests, designed to walk Samba3 code paths
@@ -46,6 +46,7 @@
#include "libcli/smb2/smb2_calls.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/rpc/dcerpc_proto.h"
+#include "../source3/libsmb/smb2cli.h"
/*
* This tests a RPC call using an invalid vuid
@@ -3741,7 +3742,7 @@ done:
}
/**
- * Test smb2reauthentication while rpc pipe is in use.
+ * Test smb2 reauthentication while rpc pipe is in use.
* Open a second lsa bind after reauth to anon.
* Do lsa getusername on that second bind.
*/
@@ -3875,6 +3876,259 @@ done:
return ret;
}
+/**
+ * Test behaviour of a waiting read call on a pipe when
+ * the pipe handle is closed:
+ * - open a pipe via smb2
+ * - trigger a read which hangs since there is nothing to read
+ * - close the pipe file handle
+ * - wait for the read to return and check the status
+ * (STATUS_PIPE_BROKEN)
+ */
+static bool torture_rpc_smb2_pipe_read_close(struct torture_context *torture)
+{
+ TALLOC_CTX *mem_ctx;
+ NTSTATUS status;
+ bool ret = false;
+ struct smbcli_options options;
+ const char *host = torture_setting_string(torture, "host", NULL);
+ struct smb2_tree *tree;
+ struct smb2_handle h;
+ struct smb2_request *smb2req;
+ struct smb2_create io;
+ struct smb2_read rd;
+
+ mem_ctx = talloc_init("torture_samba3_pipe_read_close");
+ torture_assert(torture, (mem_ctx != NULL), "talloc_init failed");
+
+ lpcfg_smbcli_options(torture->lp_ctx, &options);
+
+ status = smb2_connect(mem_ctx,
+ host,
+ lpcfg_smb_ports(torture->lp_ctx),
+ "IPC$",
+ lpcfg_resolve_context(torture->lp_ctx),
+ cmdline_credentials,
+ &tree,
+ torture->ev,
+ &options,
+ lpcfg_socket_options(torture->lp_ctx),
+ lpcfg_gensec_settings(torture, torture->lp_ctx)
+ );
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_connect failed");
+
+ ZERO_STRUCT(io);
+ io.in.oplock_level = 0;
+ io.in.desired_access = DESIRED_ACCESS_PIPE;
+ io.in.impersonation_level = SMB2_IMPERSONATION_IMPERSONATION;
+ io.in.file_attributes = 0;
+ io.in.create_disposition = NTCREATEX_DISP_OPEN;
+ io.in.share_access =
+ NTCREATEX_SHARE_ACCESS_READ|
+ NTCREATEX_SHARE_ACCESS_WRITE;
+ io.in.create_options = 0;
+ io.in.fname = "lsarpc";
+
+ status = smb2_create(tree, tree, &io);
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_create failed for 'lsarpc'");
+
+ h = io.out.file.handle;
+
+ ZERO_STRUCT(rd);
+ rd.in.file.handle = h;
+ rd.in.length = 1024;
+ rd.in.offset = 0;
+ rd.in.min_count = 0;
+
+ smb2req = smb2_read_send(tree, &rd);
+ torture_assert_goto(torture, (smb2req != NULL), ret, done,
+ "smb2_read_send failed");
+
+ status = smb2_util_close(tree, h);
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_util_close failed");
+
+ status = smb2_read_recv(smb2req, mem_ctx, &rd);
+ torture_assert_ntstatus_equal_goto(torture, status, NT_STATUS_PIPE_BROKEN, ret, done,
+ "smb2_read_recv: unexpected return code");
+
+ ret = true;
+done:
+ talloc_free(mem_ctx);
+ return ret;
+}
+
+/**
+ * Test behaviour of a waiting read call on a pipe when
+ * the tree is disconnected.
+ * - open a pipe via smb2
+ * - trigger a read which hangs since there is nothing to read
+ * - do a tree disconnect
+ * - wait for the read to return and check the status
+ * (STATUS_PIPE_BROKEN)
+ */
+static bool torture_rpc_smb2_pipe_read_tdis(struct torture_context *torture)
+{
+ TALLOC_CTX *mem_ctx;
+ NTSTATUS status;
+ bool ret = false;
+ struct smbcli_options options;
+ const char *host = torture_setting_string(torture, "host", NULL);
+ struct smb2_tree *tree;
+ struct smb2_handle h;
+ struct smb2_request *smb2req;
+ struct smb2_create io;
+ struct smb2_read rd;
+
+ mem_ctx = talloc_init("torture_samba3_pipe_read_tdis");
+ torture_assert(torture, (mem_ctx != NULL), "talloc_init failed");
+
+ lpcfg_smbcli_options(torture->lp_ctx, &options);
+
+ status = smb2_connect(mem_ctx,
+ host,
+ lpcfg_smb_ports(torture->lp_ctx),
+ "IPC$",
+ lpcfg_resolve_context(torture->lp_ctx),
+ cmdline_credentials,
+ &tree,
+ torture->ev,
+ &options,
+ lpcfg_socket_options(torture->lp_ctx),
+ lpcfg_gensec_settings(torture, torture->lp_ctx)
+ );
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_connect failed");
+
+ ZERO_STRUCT(io);
+ io.in.oplock_level = 0;
+ io.in.desired_access = DESIRED_ACCESS_PIPE;
+ io.in.impersonation_level = SMB2_IMPERSONATION_IMPERSONATION;
+ io.in.file_attributes = 0;
+ io.in.create_disposition = NTCREATEX_DISP_OPEN;
+ io.in.share_access =
+ NTCREATEX_SHARE_ACCESS_READ|
+ NTCREATEX_SHARE_ACCESS_WRITE;
+ io.in.create_options = 0;
+ io.in.fname = "lsarpc";
+
+ status = smb2_create(tree, tree, &io);
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_create failed for 'lsarpc'");
+
+ h = io.out.file.handle;
+
+ ZERO_STRUCT(rd);
+ rd.in.file.handle = h;
+ rd.in.length = 1024;
+ rd.in.offset = 0;
+ rd.in.min_count = 0;
+
+ smb2req = smb2_read_send(tree, &rd);
+ torture_assert_goto(torture, (smb2req != NULL), ret, done,
+ "smb2_read_send failed");
+
+ status = smb2_tdis(tree);
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_tdis failed");
+
+ status = smb2_read_recv(smb2req, mem_ctx, &rd);
+ torture_assert_ntstatus_equal_goto(torture, status, NT_STATUS_PIPE_BROKEN, ret, done,
+ "smb2_read_recv: unexpected return code");
+
+ ret = true;
+done:
+ talloc_free(mem_ctx);
+ return ret;
+}
+
+/**
+ * Test behaviour of a waiting read call on a pipe when
+ * the user logs off
+ * - open a pipe via smb2
+ * - trigger a read which hangs since there is nothing to read
+ * - do a logoff
+ * - wait for the read to return and check the status
+ * (STATUS_PIPE_BROKEN)
+ */
+static bool torture_rpc_smb2_pipe_read_logoff(struct torture_context *torture)
+{
+ TALLOC_CTX *mem_ctx;
+ NTSTATUS status;
+ bool ret = false;
+ struct smbcli_options options;
+ const char *host = torture_setting_string(torture, "host", NULL);
+ struct smb2_tree *tree;
+ struct smb2_handle h;
+ struct smb2_request *smb2req;
+ struct smb2_create io;
+ struct smb2_read rd;
+
+ mem_ctx = talloc_init("torture_samba3_pipe_read_tdis");
+ torture_assert(torture, (mem_ctx != NULL), "talloc_init failed");
+
+ lpcfg_smbcli_options(torture->lp_ctx, &options);
+
+ status = smb2_connect(mem_ctx,
+ host,
+ lpcfg_smb_ports(torture->lp_ctx),
+ "IPC$",
+ lpcfg_resolve_context(torture->lp_ctx),
+ cmdline_credentials,
+ &tree,
+ torture->ev,
+ &options,
+ lpcfg_socket_options(torture->lp_ctx),
+ lpcfg_gensec_settings(torture, torture->lp_ctx)
+ );
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_connect failed");
+
+ ZERO_STRUCT(io);
+ io.in.oplock_level = 0;
+ io.in.desired_access = DESIRED_ACCESS_PIPE;
+ io.in.impersonation_level = SMB2_IMPERSONATION_IMPERSONATION;
+ io.in.file_attributes = 0;
+ io.in.create_disposition = NTCREATEX_DISP_OPEN;
+ io.in.share_access =
+ NTCREATEX_SHARE_ACCESS_READ|
+ NTCREATEX_SHARE_ACCESS_WRITE;
+ io.in.create_options = 0;
+ io.in.fname = "lsarpc";
+
+ status = smb2_create(tree, tree, &io);
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_create failed for 'lsarpc'");
+
+ h = io.out.file.handle;
+
+ ZERO_STRUCT(rd);
+ rd.in.file.handle = h;
+ rd.in.length = 1024;
+ rd.in.offset = 0;
+ rd.in.min_count = 0;
+
+ smb2req = smb2_read_send(tree, &rd);
+ torture_assert_goto(torture, (smb2req != NULL), ret, done,
+ "smb2_read_send failed");
+
+ status = smb2_logoff(tree->session);
+ torture_assert_ntstatus_ok_goto(torture, status, ret, done,
+ "smb2_logoff failed");
+
+ status = smb2_read_recv(smb2req, mem_ctx, &rd);
+ torture_assert_ntstatus_equal_goto(torture, status, NT_STATUS_PIPE_BROKEN, ret, done,
+ "smb2_read_recv: unexpected return code");
+
+ ret = true;
+done:
+ talloc_free(mem_ctx);
+ return ret;
+}
+
+
struct torture_suite *torture_rpc_samba3(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "samba3");
@@ -3896,6 +4150,9 @@ struct torture_suite *torture_rpc_samba3(TALLOC_CTX *mem_ctx)
torture_suite_add_simple_test(suite, "smb-reauth2", torture_rpc_smb_reauth2);
torture_suite_add_simple_test(suite, "smb2-reauth1", torture_rpc_smb2_reauth1);
torture_suite_add_simple_test(suite, "smb2-reauth2", torture_rpc_smb2_reauth2);
+ torture_suite_add_simple_test(suite, "smb2-pipe-read-close", torture_rpc_smb2_pipe_read_close);
+ torture_suite_add_simple_test(suite, "smb2-pipe-read-tdis", torture_rpc_smb2_pipe_read_tdis);
+ torture_suite_add_simple_test(suite, "smb2-pipe-read-logoff", torture_rpc_smb2_pipe_read_logoff);
suite->description = talloc_strdup(suite, "samba3 DCERPC interface tests");
--
Samba Shared Repository
More information about the samba-cvs
mailing list