added a basic SMB2 read test suite

diff --git a/source/torture/smb2/config.mk b/source/torture/smb2/config.mk
index 6c69f3043cc0683533c93da0633467b656a5a64b..97853036295001b279745af23c1c79db6b3c1752 100644 (file)
--- a/source/torture/smb2/config.mk
+++ b/source/torture/smb2/config.mk
@@ -21,7 +21,8 @@ TORTURE_SMB2_OBJ_FILES = $(addprefix $(torturesrcdir)/smb2/, \
                smb2.o \
                persistent_handles.o \
                oplocks.o \
-               create.o)
+               create.o \
+               read.o)
 
 
 $(eval $(call proto_header_template,$(torturesrcdir)/smb2/proto.h,$(TORTURE_SMB2_OBJ_FILES:.o=.c)))

diff --git a/source/torture/smb2/read.c b/source/torture/smb2/read.c
new file mode 100644 (file)
index 0000000..3e1d077
--- /dev/null
+++ b/source/torture/smb2/read.c
@@ -0,0 +1,141 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   SMB2 read test suite
+
+   Copyright (C) Andrew Tridgell 2008
+   
+   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 "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+
+#include "torture/torture.h"
+#include "torture/smb2/proto.h"
+
+#include "librpc/gen_ndr/ndr_security.h"
+
+#define CHECK_STATUS(status, correct) do { \
+       if (!NT_STATUS_EQUAL(status, correct)) { \
+               printf("(%s) Incorrect status %s - should be %s\n", \
+                      __location__, nt_errstr(status), nt_errstr(correct)); \
+               ret = false; \
+               goto done; \
+       }} while (0)
+
+#define CHECK_VALUE(v, correct) do { \
+       if ((v) != (correct)) { \
+               printf("(%s) Incorrect value %s=%d - should be %d\n", \
+                      __location__, #v, v, correct); \
+               ret = false; \
+               goto done; \
+       }} while (0)
+
+static bool test_read(struct torture_context *torture, struct smb2_tree *tree)
+{
+       bool ret = true;
+       NTSTATUS status;
+       struct smb2_handle h;
+       uint8_t buf[70000];
+       struct smb2_read rd;
+       TALLOC_CTX *tmp_ctx = talloc_new(tree);
+
+       ZERO_STRUCT(buf);
+
+       status = torture_smb2_testfile(tree, "lock1.txt", &h);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_write(tree, h, buf, 0, ARRAY_SIZE(buf));
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       ZERO_STRUCT(rd);
+       rd.in.file.handle = h;
+       rd.in.length = 10;
+       rd.in.offset = 0;
+       rd.in.min_count = 1;
+
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_VALUE(rd.out.data.length, 10);
+
+       rd.in.min_count = 0;
+       rd.in.length = 10;
+       rd.in.offset = sizeof(buf);
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+
+       rd.in.min_count = 0;
+       rd.in.length = 0;
+       rd.in.offset = sizeof(buf);
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_VALUE(rd.out.data.length, 0);
+
+       rd.in.min_count = 1;
+       rd.in.length = 0;
+       rd.in.offset = sizeof(buf);
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+
+       rd.in.min_count = 0;
+       rd.in.length = 2;
+       rd.in.offset = sizeof(buf) - 1;
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_VALUE(rd.out.data.length, 1);
+
+       rd.in.min_count = 2;
+       rd.in.length = 1;
+       rd.in.offset = sizeof(buf) - 1;
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+
+       rd.in.min_count = 0x10000;
+       rd.in.length = 1;
+       rd.in.offset = 0;
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+
+       rd.in.min_count = 0x10000 - 2;
+       rd.in.length = 1;
+       rd.in.offset = 0;
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+
+       rd.in.min_count = 10;
+       rd.in.length = 5;
+       rd.in.offset = 0;
+       status = smb2_read(tree, tmp_ctx, &rd);
+       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+
+done:
+       talloc_free(tmp_ctx);
+       return ret;
+}
+
+/* basic testing of SMB2 read
+*/
+struct torture_suite *torture_smb2_read_init(void)
+{
+       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "READ");
+
+       torture_suite_add_1smb2_test(suite, "READ", test_read);
+
+       suite->description = talloc_strdup(suite, "SMB2-READ tests");
+
+       return suite;
+}
+

diff --git a/source/torture/smb2/smb2.c b/source/torture/smb2/smb2.c
index 852effe3e2fac5bcba18f086052410ae8b30e66a..f813148e1d56687c1d822f17e06479b339979953 100644 (file)
--- a/source/torture/smb2/smb2.c
+++ b/source/torture/smb2/smb2.c
@@ -137,6 +137,7 @@ NTSTATUS torture_smb2_init(void)
        torture_suite_add_simple_test(suite, "FIND", torture_smb2_find);
        torture_suite_add_simple_test(suite, "CREATE", torture_smb2_create);
        torture_suite_add_suite(suite, torture_smb2_lock_init());
+       torture_suite_add_suite(suite, torture_smb2_read_init());
        torture_suite_add_simple_test(suite, "NOTIFY", torture_smb2_notify);
        torture_suite_add_2smb2_test(suite, "PERSISTENT-HANDLES1", torture_smb2_persistent_handles1);
        torture_suite_add_1smb2_test(suite, "OPLOCK-BATCH1", torture_smb2_oplock_batch1);