s4:torture:smb2: add new durable-open.reopen1a test

- open session1 on tcp connection conn1
- open a durable handle on a session1
- do a session reconnect on a new tcp connection conn2
- doing a durable reconnect on session1 gives
  USER_SESSION_DELETED
- doing a durable reconnect on session2 succeeds

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index a931f6f7a5dc6e0c47cf3fda0aa145ed2cd867c6..23425c8e44dade92257adf2126f5afa3b8d4f24b 100644 (file)
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -408,6 +408,105 @@ done:
        return ret;
 }
 
+/**
+ * Basic test for doing a durable open
+ * and do a session reconnect while the first
+ * session is still active and the handle is
+ * still open in the client.
+ * This closes the original session and  a
+ * durable reconnect on the new session succeeds.
+ */
+static bool test_durable_open_reopen1a(struct torture_context *tctx,
+                                      struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2;
+       bool ret = true;
+       struct smb2_tree *tree2 = NULL;
+       uint64_t previous_session_id;
+       struct smbcli_options options;
+
+       options = tree->session->transport->options;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_reopen1a_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       /*
+        * a session reconnect on a second tcp connection
+        */
+
+       previous_session_id = smb2cli_session_current_id(tree->session->smbXcli);
+
+       if (!torture_smb2_connection_ext(tctx, previous_session_id,
+                                        &options, &tree2))
+       {
+               torture_warning(tctx, "couldn't reconnect, bailing\n");
+               ret = false;
+               goto done;
+       }
+
+       /*
+        * check that this has deleted the old session
+        */
+
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+
+       status = smb2_create(tree, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
+
+       /*
+        * but a durable reconnect on the new session succeeds:
+        */
+
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+
+       status = smb2_create(tree2, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+       _h = io2.out.file.handle;
+       h = &_h;
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree2, *h);
+       }
+
+       smb2_util_unlink(tree2, fname);
+
+       talloc_free(tree2);
+
+       talloc_free(tree);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
 /**
  * basic test for doing a durable open
  * tcp disconnect, reconnect, do a durable reopen (succeeds)
@@ -2428,6 +2527,7 @@ struct torture_suite *torture_smb2_durable_open_init(void)
        torture_suite_add_1smb2_test(suite, "open-oplock", test_durable_open_open_oplock);
        torture_suite_add_1smb2_test(suite, "open-lease", test_durable_open_open_lease);
        torture_suite_add_1smb2_test(suite, "reopen1", test_durable_open_reopen1);
+       torture_suite_add_1smb2_test(suite, "reopen1a", test_durable_open_reopen1a);
        torture_suite_add_1smb2_test(suite, "reopen2", test_durable_open_reopen2);
        torture_suite_add_1smb2_test(suite, "reopen2-lease", test_durable_open_reopen2_lease);
        torture_suite_add_1smb2_test(suite, "reopen2-lease-v2", test_durable_open_reopen2_lease_v2);