Skip to content

Commit

Permalink
s4: torture: Add smb2 FIND_and_set_DOC test case.
Browse files Browse the repository at this point in the history
Regression tests doing an SMB2_find followed by
a set delete on close and then close on a directory.

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

Signed-off-by: Ralph Wuerthner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>

Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Sun Nov  5 12:31:12 CET 2017 on sn-devel-144
  • Loading branch information
ralph-wuerthner authored and vlendec committed Nov 5, 2017
1 parent c9e996d commit 44c018b
Showing 1 changed file with 66 additions and 0 deletions.
66 changes: 66 additions & 0 deletions source4/torture/smb2/delete-on-close.c
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,71 @@ static bool test_doc_create_if_exist(struct torture_context *tctx, struct smb2_t
return true;
}

static bool test_doc_find_and_set_doc(struct torture_context *tctx, struct smb2_tree *tree)
{
struct smb2_create io;
struct smb2_find find;
NTSTATUS status;
union smb_search_data *d;
union smb_setfileinfo sfinfo;
unsigned int count;
uint32_t perms = 0;

perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE |
SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE |
SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
SEC_FILE_WRITE_DATA | SEC_DIR_LIST;

/* File should not exist for this first test, so make sure */
set_dir_delete_perms(tctx, tree);

smb2_deltree(tree, DNAME);

create_dir(tctx, tree);

torture_comment(tctx, "FIND and delete directory\n");
torture_comment(tctx, "We expect NT_STATUS_OK\n");

/* open the directory first */
ZERO_STRUCT(io);
io.in.desired_access = perms;
io.in.file_attributes = FILE_ATTRIBUTE_DIRECTORY;
io.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
io.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
NTCREATEX_SHARE_ACCESS_DELETE;
io.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
io.in.fname = DNAME;

status = smb2_create(tree, tctx, &io);
CHECK_STATUS(status, NT_STATUS_OK);

/* list directory */
ZERO_STRUCT(find);
find.in.file.handle = io.out.file.handle;
find.in.pattern = "*";
find.in.continue_flags = SMB2_CONTINUE_FLAG_SINGLE;
find.in.max_response_size = 0x100;
find.in.level = SMB2_FIND_BOTH_DIRECTORY_INFO;

/* start enumeration on directory */
status = smb2_find_level(tree, tree, &find, &count, &d);
CHECK_STATUS(status, NT_STATUS_OK);

/* set delete-on-close */
ZERO_STRUCT(sfinfo);
sfinfo.generic.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
sfinfo.disposition_info.in.delete_on_close = 1;
sfinfo.generic.in.file.handle = io.out.file.handle;
status = smb2_setinfo_file(tree, &sfinfo);
CHECK_STATUS(status, NT_STATUS_OK);

/* close directory */
status = smb2_util_close(tree, io.out.file.handle);
CHECK_STATUS(status, NT_STATUS_OK);
return true;
}


/*
* Extreme testing of Delete On Close and permissions
*/
Expand All @@ -529,6 +594,7 @@ struct torture_suite *torture_smb2_doc_init(TALLOC_CTX *ctx)
torture_suite_add_1smb2_test(suite, "CREATE Existing", test_doc_create_exist);
torture_suite_add_1smb2_test(suite, "CREATE_IF", test_doc_create_if);
torture_suite_add_1smb2_test(suite, "CREATE_IF Existing", test_doc_create_if_exist);
torture_suite_add_1smb2_test(suite, "FIND_and_set_DOC", test_doc_find_and_set_doc);

suite->description = talloc_strdup(suite, "SMB2-Delete-on-Close-Perms tests");

Expand Down

0 comments on commit 44c018b

Please sign in to comment.