torture: Add smb2.notify.rmdir

We need to cancel a pending FileChangeNotify with DELETE_PENDING if the
directory watched is about to be deleted.

I know I just deleted a bool parameter, but to me torture is different :-)

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Apr 23 01:36:48 CEST 2015 on sn-devel-104

diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index bbdc223eea8c1bfc4e0a0a784e2a07ef43bb4837..0f572b6774dd07c6e9696b437db57436a6d6e7ac 100644 (file)
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -2015,6 +2015,108 @@ done:
        return ret;
 }
 
+static bool torture_smb2_notify_rmdir(struct torture_context *torture,
+                                     struct smb2_tree *tree1,
+                                     struct smb2_tree *tree2,
+                                     bool initial_delete_on_close)
+{
+       bool ret = true;
+       NTSTATUS status;
+       union smb_notify notify = {};
+       union smb_setfileinfo sfinfo = {};
+       union smb_open io = {};
+       struct smb2_handle h = {};
+       struct smb2_request *req;
+
+       torture_comment(torture, "TESTING NOTIFY CANCEL FOR DELETED DIR\n");
+
+       smb2_deltree(tree1, BASEDIR);
+       smb2_util_rmdir(tree1, BASEDIR);
+
+       ZERO_STRUCT(io.smb2);
+       io.generic.level = RAW_OPEN_SMB2;
+       io.smb2.in.create_flags = 0;
+       io.smb2.in.desired_access = SEC_FILE_ALL;
+       io.smb2.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.smb2.in.file_attributes = FILE_ATTRIBUTE_NORMAL;
+       io.smb2.in.share_access =
+               NTCREATEX_SHARE_ACCESS_READ |
+               NTCREATEX_SHARE_ACCESS_WRITE |
+               NTCREATEX_SHARE_ACCESS_DELETE ;
+       io.smb2.in.alloc_size = 0;
+       io.smb2.in.create_disposition = NTCREATEX_DISP_CREATE;
+       io.smb2.in.impersonation_level = SMB2_IMPERSONATION_ANONYMOUS;
+       io.smb2.in.security_flags = 0;
+       io.smb2.in.fname = BASEDIR;
+
+       status = smb2_create(tree1, torture, &(io.smb2));
+       CHECK_STATUS(status, NT_STATUS_OK);
+       h = io.smb2.out.file.handle;
+
+       ZERO_STRUCT(notify.smb2);
+       notify.smb2.level = RAW_NOTIFY_SMB2;
+       notify.smb2.in.buffer_size = 1000;
+       notify.smb2.in.completion_filter = FILE_NOTIFY_CHANGE_NAME;
+       notify.smb2.in.file.handle = h;
+       notify.smb2.in.recursive = false;
+
+       io.smb2.in.desired_access |= SEC_STD_DELETE;
+       io.smb2.in.create_disposition = NTCREATEX_DISP_OPEN;
+       req = smb2_notify_send(tree1, &(notify.smb2));
+
+       if (initial_delete_on_close) {
+               status = smb2_util_rmdir(tree2, BASEDIR);
+               CHECK_STATUS(status, NT_STATUS_OK);
+       } else {
+               status = smb2_create(tree2, torture, &(io.smb2));
+               CHECK_STATUS(status, NT_STATUS_OK);
+
+               sfinfo.generic.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
+               sfinfo.generic.in.file.handle = io.smb2.out.file.handle;
+               sfinfo.disposition_info.in.delete_on_close = 1;
+               status = smb2_setinfo_file(tree2, &sfinfo);
+               CHECK_STATUS(status, NT_STATUS_OK);
+
+               smb2_util_close(tree2, io.smb2.out.file.handle);
+       }
+
+       status = smb2_notify_recv(req, torture, &(notify.smb2));
+       CHECK_STATUS(status, NT_STATUS_DELETE_PENDING);
+
+done:
+
+       smb2_util_close(tree1, h);
+       smb2_deltree(tree1, BASEDIR);
+
+       return ret;
+}
+
+static bool torture_smb2_notify_rmdir1(struct torture_context *torture,
+                                      struct smb2_tree *tree)
+{
+       return torture_smb2_notify_rmdir(torture, tree, tree, false);
+}
+
+static bool torture_smb2_notify_rmdir2(struct torture_context *torture,
+                                      struct smb2_tree *tree)
+{
+       return torture_smb2_notify_rmdir(torture, tree, tree, true);
+}
+
+static bool torture_smb2_notify_rmdir3(struct torture_context *torture,
+                                      struct smb2_tree *tree1,
+                                      struct smb2_tree *tree2)
+{
+       return torture_smb2_notify_rmdir(torture, tree1, tree2, false);
+}
+
+static bool torture_smb2_notify_rmdir4(struct torture_context *torture,
+                                      struct smb2_tree *tree1,
+                                      struct smb2_tree *tree2)
+{
+       return torture_smb2_notify_rmdir(torture, tree1, tree2, true);
+}
+
 /*
    basic testing of SMB2 change notify
 */
@@ -2037,6 +2139,14 @@ struct torture_suite *torture_smb2_notify_init(void)
        torture_suite_add_1smb2_test(suite, "tcp", torture_smb2_notify_tcp_disconnect);
        torture_suite_add_2smb2_test(suite, "rec", torture_smb2_notify_recursive);
        torture_suite_add_1smb2_test(suite, "overflow", torture_smb2_notify_overflow);
+       torture_suite_add_1smb2_test(suite, "rmdir1",
+                                    torture_smb2_notify_rmdir1);
+       torture_suite_add_1smb2_test(suite, "rmdir2",
+                                    torture_smb2_notify_rmdir2);
+       torture_suite_add_2smb2_test(suite, "rmdir3",
+                                    torture_smb2_notify_rmdir3);
+       torture_suite_add_2smb2_test(suite, "rmdir4",
+                                    torture_smb2_notify_rmdir4);
 
        suite->description = talloc_strdup(suite, "SMB2-NOTIFY tests");