s3: smbtorture: Add new SMB2-DIR-FSYNC test to show behavior of FSYNC on directories.

Tests against a directory handle on the root of a share,
and a directory handle on a sub-directory in a share.

Check SEC_DIR_ADD_FILE and SEC_DIR_ADD_SUBDIR separately,
either allows flush to succeed.

Passes against Windows.

Regression test for:

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri May 18 02:38:50 CEST 2018 on sn-devel-144

diff --git a/selftest/knownfail b/selftest/knownfail
index a2aeed2690dd4f48b03a1688a643741aa9d63456..8c70d6a6172b0d67ef6ff73010aec8e1ad2e5a34 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -8,6 +8,7 @@
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
  ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption
 ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
  ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption
 ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test

+^samba3.smbtorture_s3.*ad_dc_ntvfs.*SMB2-DIR-FSYNC.*

 ^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test
 ^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used
 ^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used
 ^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test
 ^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used
 ^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 1e1f97efa4059ae7e3e77eb6b355df7f37456f61..bd84d001041619d3780d097e12121fc28f7d47ab 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -77,7 +77,7 @@ tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7"
         "UID-REGRESSION-TEST", "SHORTNAME-TEST",
         "CASE-INSENSITIVE-CREATE", "SMB2-BASIC", "NTTRANS-FSCTL", "SMB2-NEGPROT",
         "SMB2-SESSION-REAUTH", "SMB2-SESSION-RECONNECT", "SMB2-FTRUNCATE",
         "UID-REGRESSION-TEST", "SHORTNAME-TEST",
         "CASE-INSENSITIVE-CREATE", "SMB2-BASIC", "NTTRANS-FSCTL", "SMB2-NEGPROT",
         "SMB2-SESSION-REAUTH", "SMB2-SESSION-RECONNECT", "SMB2-FTRUNCATE",

-        "SMB2-ANONYMOUS",
+        "SMB2-ANONYMOUS", "SMB2-DIR-FSYNC",

         "CLEANUP1",
         "CLEANUP2",
         "CLEANUP4",
         "CLEANUP1",
         "CLEANUP2",
         "CLEANUP4",

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index 45870c904fbd68c9ad8f3593d5fe401ee4ca8343..1634da493150eec4daa7d8e863de1f47cedace70 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -101,6 +101,7 @@ bool run_smb2_tcon_dependence(int dummy);
 bool run_smb2_multi_channel(int dummy);
 bool run_smb2_session_reauth(int dummy);
 bool run_smb2_ftruncate(int dummy);
 bool run_smb2_multi_channel(int dummy);
 bool run_smb2_session_reauth(int dummy);
 bool run_smb2_ftruncate(int dummy);

+bool run_smb2_dir_fsync(int dummy);

 bool run_chain3(int dummy);
 bool run_local_conv_auth_info(int dummy);
 bool run_local_sprintf_append(int dummy);
 bool run_chain3(int dummy);
 bool run_local_conv_auth_info(int dummy);
 bool run_local_sprintf_append(int dummy);

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 897d034f6a9165d129b2c1ca951ec51bca1cfc25..094a9b84d6e56f999d5bb903f33156129e058eac 100644 (file)
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -2065,3 +2065,273 @@ bool run_smb2_ftruncate(int dummy)
        }
        return correct;
 }
        }
        return correct;
 }

+
+/* Ensure SMB2 flush on directories behaves correctly. */
+
+static bool test_dir_fsync(struct cli_state *cli, const char *path)
+{
+       NTSTATUS status;
+       uint64_t fid_persistent, fid_volatile;
+       uint8_t *dir_data = NULL;
+       uint32_t dir_data_length = 0;
+
+       /* Open directory - no write abilities. */
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_READ_ATTRIBUTE, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (readonly) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
+               1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
+               talloc_tos(), &dir_data, &dir_data_length);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       /* Open directory no write access. Flush should fail. */
+
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("smb2cli_flush on a read-only directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_close returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       /* Open directory write-attributes only. Flush should still fail. */
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_WRITE_ATTRIBUTE|
+                       SEC_DIR_READ_ATTRIBUTE, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (write attr) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
+               1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
+               talloc_tos(), &dir_data, &dir_data_length);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_directory returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("smb2cli_flush on a write-attributes directory "
+                       "returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_close returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       /* Open directory with SEC_DIR_ADD_FILE access. Flush should now succeed. */
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_ADD_FILE, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (write FILE access) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
+               1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
+               talloc_tos(), &dir_data, &dir_data_length);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_directory returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_flush on a directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_close returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       /* Open directory with SEC_DIR_ADD_FILE access. Flush should now succeed. */
+
+       status = smb2cli_create(cli->conn, cli->timeout, cli->smb2.session,
+                       cli->smb2.tcon, path,
+                       SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+                       SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+                       SEC_STD_SYNCHRONIZE|
+                       SEC_DIR_LIST|
+                       SEC_DIR_ADD_SUBDIR, /* desired_access, */
+                       0, /* file_attributes, */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+                       FILE_OPEN, /* create_disposition, */
+                       FILE_SYNCHRONOUS_IO_NONALERT|FILE_DIRECTORY_FILE, /* create_options, */
+                       NULL, /* smb2_create_blobs *blobs */
+                       &fid_persistent,
+                       &fid_volatile,
+                       NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_create '%s' (write DIR access) returned %s\n",
+                       path,
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_query_directory(
+               cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
+               1, 0, 0, fid_persistent, fid_volatile, "*", 0xffff,
+               talloc_tos(), &dir_data, &dir_data_length);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_query_directory returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_flush(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, fid_persistent, fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_flush on a directory returned %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+
+       status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session,
+                              cli->smb2.tcon, 0, fid_persistent, fid_volatile);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smb2cli_close returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+
+       return true;
+}
+
+bool run_smb2_dir_fsync(int dummy)
+{
+       struct cli_state *cli = NULL;
+       NTSTATUS status;
+       bool bret = false;
+       const char *dname = "fsync_test_dir";
+
+       printf("Starting SMB2-DIR-FSYNC\n");
+
+       if (!torture_init_connection(&cli)) {
+               return false;
+       }
+
+       status = smbXcli_negprot(cli->conn, cli->timeout,
+                                PROTOCOL_SMB2_02, PROTOCOL_SMB2_02);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("smbXcli_negprot returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = cli_session_setup_creds(cli, torture_creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_session_setup returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       status = cli_tree_connect(cli, share, "?????", NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_tree_connect returned %s\n", nt_errstr(status));
+               return false;
+       }
+
+       (void)cli_rmdir(cli, dname);
+       status = cli_mkdir(cli, dname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_mkdir(%s) returned %s\n",
+                       dname,
+                       nt_errstr(status));
+               return false;
+       }
+
+       /* Test on a subdirectory. */
+       bret = test_dir_fsync(cli, dname);
+       if (bret == false) {
+               (void)cli_rmdir(cli, dname);
+               return false;
+       }
+       (void)cli_rmdir(cli, dname);
+
+       /* Test on the root handle of a share. */
+       bret = test_dir_fsync(cli, "");
+       if (bret == false) {
+               return false;
+       }
+       return true;
+}

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2bc6ff712ce3a7e8ed2715b5efda137ce1f4c265..23671a706cd0e94aaa63abc76ea49c7f929da154 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -11595,6 +11595,7 @@ static struct {
        { "SMB2-MULTI-CHANNEL", run_smb2_multi_channel },
        { "SMB2-SESSION-REAUTH", run_smb2_session_reauth },
        { "SMB2-FTRUNCATE", run_smb2_ftruncate },
        { "SMB2-MULTI-CHANNEL", run_smb2_multi_channel },
        { "SMB2-SESSION-REAUTH", run_smb2_session_reauth },
        { "SMB2-FTRUNCATE", run_smb2_ftruncate },

+       { "SMB2-DIR-FSYNC", run_smb2_dir_fsync },

        { "CLEANUP1", run_cleanup1 },
        { "CLEANUP2", run_cleanup2 },
        { "CLEANUP3", run_cleanup3 },
        { "CLEANUP1", run_cleanup1 },
        { "CLEANUP2", run_cleanup2 },
        { "CLEANUP3", run_cleanup3 },