The branch, master has been updated
       via  ffee37c torture: Add sharemode tests for SMB2
      from  8865ded s3-printing: precreate DriverStore directories.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ffee37c243d016804b2394ea3b6a3aedd79a1f6b
Author: Christof Schmitt <c...@samba.org>
Date:   Wed May 31 14:43:41 2017 -0700

    torture: Add sharemode tests for SMB2
    
    There are two pieces: Test access with different sharemodes through SMB
    and verify access, and also provide tests that can be used with file
    systems enforcing share modes outside of Samba.
    
    Signed-off-by: Christof Schmitt <c...@samba.org>
    Reviewed-by: Jeremy Allison <j...@samba.org>
    
    Autobuild-User(master): Jeremy Allison <j...@samba.org>
    Autobuild-Date(master): Wed Jul 26 09:30:31 CEST 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 selftest/knownfail                 |   1 +
 selftest/skip                      |   4 +
 source4/torture/smb2/sharemode.c   | 609 +++++++++++++++++++++++++++++++++++++
 source4/torture/smb2/smb2.c        |   5 +
 source4/torture/smb2/wscript_build |   1 +
 5 files changed, 620 insertions(+)
 create mode 100644 source4/torture/smb2/sharemode.c


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index f41b99d..1b5a98c 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -140,6 +140,7 @@
 ^samba4.smb2.getinfo.qfs_buffercheck # S4 does not do the 
INFO_LENGTH_MISMATCH/BUFFER_OVERFLOW thingy
 ^samba4.smb2.getinfo.qfile_buffercheck # S4 does not do the 
INFO_LENGTH_MISMATCH/BUFFER_OVERFLOW thingy
 ^samba4.smb2.getinfo.qsec_buffercheck # S4 does not do the BUFFER_TOO_SMALL 
thingy
+^samba4.smb2.sharemode
 ^samba4.ntvfs.cifs.krb5.base.createx_access.createx_access\(.*\)$
 ^samba4.rpc.lsa.forest.trust #Not fully provided by Samba4
 ^samba4.blackbox.upgradeprovision.alpha13.ldapcmp_sd\(none\) # Due to 
something rewriting the NT ACL on DNS objects
diff --git a/selftest/skip b/selftest/skip
index fd9932a..c2c4553 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -64,6 +64,8 @@
 ^samba3.*raw.qfsinfo
 ^samba3.*raw.sfileinfo.base
 ^samba3.smb2.hold-oplock                # Not a test, but a way to block other 
clients for a test
+^samba3.smb2.hold-sharemode             # Not a test, but a way to block other 
clients for a test
+^samba3.smb2.check-sharemode            # Not a test, but a way to test 
sharemodes outside of Samba
 ^samba3.smb2.durable-open-disconnect    # Not a test, but a way to create a 
disconnected durable
 ^samba3.smb2.scan                       # No tests
 ^samba3.smb2.oplock.levelii501         # No test yet
@@ -75,6 +77,8 @@
 ^samba4.raw.eas
 ^samba4.raw.hold-oplock                # Not a test, but a way to block other 
clients for a test
 ^samba4.smb2.hold-oplock               # Not a test, but a way to block other 
clients for a test
+^samba4.smb2.hold-sharemode            # Not a test, but a way to block other 
clients for a test
+^samba4.smb2.check-sharemode            # Not a test, but a way to test 
sharemodes outside of Samba
 ^samba4.raw.ping.pong          # Needs second server to test
 ^samba4.rpc.samr.accessmask
 ^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_ntvfs\) # currently fails, 
possibly config issue
diff --git a/source4/torture/smb2/sharemode.c b/source4/torture/smb2/sharemode.c
new file mode 100644
index 0000000..f59927c
--- /dev/null
+++ b/source4/torture/smb2/sharemode.c
@@ -0,0 +1,609 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   test suite for SMB2 sharemodes
+
+   Copyright (C) Christof Schmitt 2017
+
+   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 "libcli/security/security.h"
+#include "torture/torture.h"
+#include "torture/smb2/proto.h"
+#include "lib/tevent/tevent.h"
+
+#define BASEDIRHOLD "sharemode_hold_test"
+
+struct hold_sharemode_info {
+       const char *sharemode;
+       const char *filename;
+       struct smb2_handle handle;
+} hold_sharemode_table[] = {
+       { "",    BASEDIRHOLD "\\N"      },
+       { "R",   BASEDIRHOLD "\\R"      },
+       { "W",   BASEDIRHOLD "\\W"      },
+       { "D",   BASEDIRHOLD "\\D"      },
+       { "RW",  BASEDIRHOLD "\\RW"     },
+       { "RD",  BASEDIRHOLD "\\RD"     },
+       { "WD",  BASEDIRHOLD "\\WD"     },
+       { "RWD", BASEDIRHOLD "\\RWD"    },
+};
+
+static void signal_handler(struct tevent_context *ev,
+                          struct tevent_signal *se,
+                          int signum,
+                          int count,
+                          void *siginfo,
+                          void *private_data)
+{
+       struct torture_context *tctx = private_data;
+
+       torture_comment(tctx, "Received signal %d\n", signum);
+}
+
+/*
+ * Used for manual testing of sharemodes - especially interaction with
+ * other filesystems (such as NFS and local access). The scenario is
+ * that this test holds files open and then concurrent access to the same
+ * files outside of Samba can be tested.
+ */
+bool torture_smb2_hold_sharemode(struct torture_context *tctx)
+{
+       struct tevent_context *ev = tctx->ev;
+       struct smb2_tree *tree = NULL;
+       struct smb2_handle dir_handle;
+       struct tevent_signal *s;
+       NTSTATUS status;
+       bool ret = true;
+       int i;
+
+       if (!torture_smb2_connection(tctx, &tree)) {
+               torture_comment(tctx, "Initializing smb2 connection failed.\n");
+               return false;
+       }
+
+       s = tevent_add_signal(ev, tctx, SIGINT, 0, signal_handler, tctx);
+       torture_assert_not_null_goto(tctx, s, ret, done,
+                                    "Error registering signal handler.");
+
+       torture_comment(tctx, "Setting up open files with sharemodes in %s\n",
+                       BASEDIRHOLD);
+
+       status = torture_smb2_testdir(tree, BASEDIRHOLD, &dir_handle);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "Error creating directory.");
+
+       for (i = 0; i < ARRAY_SIZE(hold_sharemode_table); i++) {
+               struct hold_sharemode_info *info = &hold_sharemode_table[i];
+               struct smb2_create create = { };
+
+               create.in.desired_access = SEC_RIGHTS_FILE_ALL;
+               create.in.alloc_size = 0;
+               create.in.file_attributes = FILE_ATTRIBUTE_NORMAL;
+               create.in.share_access =
+                       smb2_util_share_access(info->sharemode);
+               create.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+               create.in.create_options = 0;
+               create.in.impersonation_level = SMB2_IMPERSONATION_ANONYMOUS;
+               create.in.security_flags = 0;
+               create.in.fname = info->filename;
+               create.in.create_flags = NTCREATEX_FLAGS_EXTENDED;
+               create.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+
+               torture_comment(tctx, "opening %s\n", info->filename);
+
+               status = smb2_create(tree, tctx, &create);
+
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "CREATE file failed\n");
+
+               info->handle = create.out.file.handle;
+       }
+
+       torture_comment(tctx, "Waiting for SIGINT (ctrl-c)\n");
+       tevent_loop_wait(ev);
+
+       torture_comment(tctx, "Closing and deleting files\n");
+
+       for (i = 0; i < ARRAY_SIZE(hold_sharemode_table); i++) {
+               struct hold_sharemode_info *info = &hold_sharemode_table[i];
+
+               union smb_setfileinfo sfinfo = { };
+
+               sfinfo.disposition_info.in.delete_on_close = 1;
+               sfinfo.generic.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
+               sfinfo.generic.in.file.handle = info->handle;
+               status = smb2_setinfo_file(tree, &sfinfo);
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "SETINFO failed\n");
+
+               status = smb2_util_close(tree, info->handle);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                       torture_comment(tctx, "File %s not found, could have "
+                                       "been deleted outside of SMB\n",
+                                       info->filename);
+                       continue;
+               }
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "CLOSE failed\n");
+}
+
+done:
+       smb2_deltree(tree, BASEDIRHOLD);
+       return ret;
+}
+
+/*
+ * Used for manual testing of sharemodes, especially interaction with
+ * file systems that can enforce sharemodes. The scenario here is that
+ * a file is already open outside of Samba with a sharemode and this
+ * can be used to test accessing the same file from Samba.
+ */
+bool torture_smb2_check_sharemode(struct torture_context *tctx)
+{
+       const char *sharemode_string, *access_string, *filename, *operation;
+       uint32_t sharemode, access;
+       struct smb2_tree *tree;
+       struct smb2_create create = { };
+       NTSTATUS status;
+       bool ret = true;
+
+       sharemode_string = torture_setting_string(tctx, "sharemode", "RWD");
+       sharemode = smb2_util_share_access(sharemode_string);
+
+       access_string = torture_setting_string(tctx, "access", "0xf01ff");
+       access = strtoul(access_string, NULL, 0);
+
+       filename = torture_setting_string(tctx, "filename", "testfile");
+       operation = torture_setting_string(tctx, "operation", "WD");
+
+       if (!torture_smb2_connection(tctx, &tree)) {
+               torture_comment(tctx, "Initializing smb2 connection failed.\n");
+               return false;
+       }
+
+       create.in.desired_access = access;
+       create.in.alloc_size = 0;
+       create.in.file_attributes = FILE_ATTRIBUTE_NORMAL;
+       create.in.share_access = sharemode;
+       create.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+       create.in.create_options = 0;
+       create.in.impersonation_level = SMB2_IMPERSONATION_ANONYMOUS;
+       create.in.security_flags = 0;
+       create.in.fname = filename;
+       create.in.create_flags = NTCREATEX_FLAGS_EXTENDED;
+       create.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+
+       status = smb2_create(tree, tctx, &create);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "CREATE failed\n");
+
+       if (strchr(operation, 'R')) {
+               struct smb2_read read = { 0 };
+
+               read.in.file.handle = create.out.file.handle;
+               read.in.offset = 0;
+               read.in.length = 1;
+
+               status = smb2_read(tree, tctx, &read);
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "READ failed\n");
+       }
+
+       if (strchr(operation, 'W')) {
+               char buf[1];
+               status = smb2_util_write(tree, create.out.file.handle,
+                                        &buf, 0, sizeof(buf));
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "WRITE failed\n");
+       }
+
+       if (strchr(operation, 'D')) {
+               union smb_setfileinfo sfinfo = { };
+
+               sfinfo.disposition_info.in.delete_on_close = 1;
+               sfinfo.generic.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
+               sfinfo.generic.in.file.handle = create.out.file.handle;
+
+               status = smb2_setinfo_file(tree, &sfinfo);
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "SETINFO failed\n");
+
+               status = smb2_util_close(tree, create.out.file.handle);
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "CLOSE failed\n");
+       }
+
+done:
+       return ret;
+}
+
+struct sharemode_info {
+       const char *sharemode;
+       uint32_t access_mask;
+       bool expect_ok;
+} sharemode_table[] = {
+
+       /*
+        * Basic tests, check each permission bit against every
+        * possible sharemode combination.
+        */
+
+       { "R",   SEC_FILE_READ_DATA,            true,   },
+       { "R",   SEC_FILE_WRITE_DATA,           false,  },
+       { "R",   SEC_FILE_APPEND_DATA,          false,  },
+       { "R",   SEC_FILE_READ_EA,              true,   },
+       { "R",   SEC_FILE_WRITE_EA,             true,   },
+       { "R",   SEC_FILE_EXECUTE,              true,   },
+       { "R",   SEC_FILE_READ_ATTRIBUTE,       true,   },
+       { "R",   SEC_FILE_WRITE_ATTRIBUTE,      true,   },
+       { "R",   SEC_STD_DELETE,                false,  },
+       { "R",   SEC_STD_READ_CONTROL,          true,   },
+       { "R",   SEC_STD_WRITE_DAC,             true,   },
+       { "R",   SEC_STD_WRITE_OWNER,           true,   },
+       { "R",   SEC_STD_SYNCHRONIZE,           true,   },
+
+       { "W",   SEC_FILE_READ_DATA,            false   },
+       { "W",   SEC_FILE_WRITE_DATA,           true,   },
+       { "W",   SEC_FILE_APPEND_DATA,          true,   },
+       { "W",   SEC_FILE_READ_EA,              true,   },
+       { "W",   SEC_FILE_WRITE_EA,             true,   },
+       { "W",   SEC_FILE_EXECUTE,              false,  },
+       { "W",   SEC_FILE_READ_ATTRIBUTE,       true,   },
+       { "W",   SEC_FILE_WRITE_ATTRIBUTE,      true,   },
+       { "W",   SEC_STD_DELETE,                false,  },
+       { "W",   SEC_STD_READ_CONTROL,          true,   },
+       { "W",   SEC_STD_WRITE_DAC,             true,   },
+       { "W",   SEC_STD_WRITE_OWNER,           true,   },
+       { "W",   SEC_STD_SYNCHRONIZE,           true,   },
+
+       { "D",   SEC_FILE_READ_DATA,            false   },
+       { "D",   SEC_FILE_WRITE_DATA,           false   },
+       { "D",   SEC_FILE_APPEND_DATA,          false   },
+       { "D",   SEC_FILE_READ_EA,              true,   },
+       { "D",   SEC_FILE_WRITE_EA,             true,   },
+       { "D",   SEC_FILE_EXECUTE,              false,  },
+       { "D",   SEC_FILE_READ_ATTRIBUTE,       true,   },
+       { "D",   SEC_FILE_WRITE_ATTRIBUTE,      true,   },
+       { "D",   SEC_STD_DELETE,                true,   },
+       { "D",   SEC_STD_READ_CONTROL,          true,   },
+       { "D",   SEC_STD_WRITE_DAC,             true,   },
+       { "D",   SEC_STD_WRITE_OWNER,           true,   },
+       { "D",   SEC_STD_SYNCHRONIZE,           true,   },
+
+       { "RW",  SEC_FILE_READ_DATA,            true,   },
+       { "RW",  SEC_FILE_WRITE_DATA,           true,   },
+       { "RW",  SEC_FILE_APPEND_DATA,          true,   },
+       { "RW",  SEC_FILE_READ_EA,              true,   },
+       { "RW",  SEC_FILE_WRITE_EA,             true,   },
+       { "RW",  SEC_FILE_EXECUTE,              true,   },
+       { "RW",  SEC_FILE_READ_ATTRIBUTE,       true,   },
+       { "RW",  SEC_FILE_WRITE_ATTRIBUTE,      true,   },
+       { "RW",  SEC_STD_DELETE,                false,  },
+       { "RW",  SEC_STD_READ_CONTROL,          true,   },
+       { "RW",  SEC_STD_WRITE_DAC,             true,   },
+       { "RW",  SEC_STD_WRITE_OWNER,           true,   },
+       { "RW",  SEC_STD_SYNCHRONIZE,           true,   },
+
+       { "RD",  SEC_FILE_READ_DATA,            true,   },
+       { "RD",  SEC_FILE_WRITE_DATA,           false,  },
+       { "RD",  SEC_FILE_APPEND_DATA,          false,  },
+       { "RD",  SEC_FILE_READ_EA,              true,   },
+       { "RD",  SEC_FILE_WRITE_EA,             true,   },
+       { "RD",  SEC_FILE_EXECUTE,              true,   },
+       { "RD",  SEC_FILE_READ_ATTRIBUTE,       true,   },
+       { "RD",  SEC_FILE_WRITE_ATTRIBUTE,      true,   },
+       { "RD",  SEC_STD_DELETE,                true,   },
+       { "RD",  SEC_STD_READ_CONTROL,          true,   },
+       { "RD",  SEC_STD_WRITE_DAC,             true,   },
+       { "RD",  SEC_STD_WRITE_OWNER,           true,   },
+       { "RD",  SEC_STD_SYNCHRONIZE,           true,   },
+
+       { "WD",  SEC_FILE_READ_DATA,            false   },
+       { "WD",  SEC_FILE_WRITE_DATA,           true,   },
+       { "WD",  SEC_FILE_APPEND_DATA,          true,   },
+       { "WD",  SEC_FILE_READ_EA,              true    },
+       { "WD",  SEC_FILE_WRITE_EA,             true,   },
+       { "WD",  SEC_FILE_EXECUTE,              false   },
+       { "WD",  SEC_FILE_READ_ATTRIBUTE,       true,   },
+       { "WD",  SEC_FILE_WRITE_ATTRIBUTE,      true,   },
+       { "WD",  SEC_STD_DELETE,                true,   },
+       { "WD",  SEC_STD_READ_CONTROL,          true,   },
+       { "WD",  SEC_STD_WRITE_DAC,             true,   },
+       { "WD",  SEC_STD_WRITE_OWNER,           true,   },
+       { "WD",  SEC_STD_SYNCHRONIZE,           true,   },
+
+       { "RWD",  SEC_FILE_READ_DATA,           true    },
+       { "RWD",  SEC_FILE_WRITE_DATA,          true,   },
+       { "RWD",  SEC_FILE_APPEND_DATA, true,   },
+       { "RWD",  SEC_FILE_READ_EA,             true    },
+       { "RWD",  SEC_FILE_WRITE_EA,            true,   },
+       { "RWD",  SEC_FILE_EXECUTE,             true,   },
+       { "RWD",  SEC_FILE_READ_ATTRIBUTE,      true,   },
+       { "RWD",  SEC_FILE_WRITE_ATTRIBUTE,     true,   },
+       { "RWD",  SEC_STD_DELETE,               true,   },
+       { "RWD",  SEC_STD_READ_CONTROL, true,   },
+       { "RWD",  SEC_STD_WRITE_DAC,            true,   },
+       { "RWD",  SEC_STD_WRITE_OWNER,          true,   },
+       { "RWD",  SEC_STD_SYNCHRONIZE,           true,  },
+
+       /*
+        * Some more interesting cases. Always request READ or WRITE
+        * access, as that will trigger the opening of a file
+        * description in Samba. This especially useful for file
+        * systems that enforce share modes on open file descriptors.
+        */
+
+       { "R",   SEC_FILE_READ_DATA,                            true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA,        false,  },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_APPEND_DATA,       false,  },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_READ_EA,           true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_WRITE_EA,          true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_EXECUTE,           true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,    true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_FILE_WRITE_ATTRIBUTE,   true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_STD_DELETE,             false,  },
+       { "R",   SEC_FILE_READ_DATA|SEC_STD_READ_CONTROL,       true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_STD_WRITE_DAC,          true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_STD_WRITE_OWNER,        true,   },
+       { "R",   SEC_FILE_READ_DATA|SEC_STD_SYNCHRONIZE,        true,   },
+
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_READ_DATA,        false,  },
+       { "W",   SEC_FILE_WRITE_DATA,                           true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_APPEND_DATA,      true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_READ_EA,          true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_WRITE_EA, true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_EXECUTE,          false,  },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_READ_ATTRIBUTE,   true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_FILE_WRITE_ATTRIBUTE,  true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_STD_DELETE,            false,  },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_STD_READ_CONTROL,      true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_STD_WRITE_DAC, true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_STD_WRITE_OWNER,       true,   },
+       { "W",   SEC_FILE_WRITE_DATA|SEC_STD_SYNCHRONIZE,       true,   },
+
+       { "RW",  SEC_FILE_READ_DATA,                            true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA,        true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_APPEND_DATA,       true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_READ_EA,           true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_WRITE_EA,          true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_EXECUTE,           true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,    true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_FILE_WRITE_ATTRIBUTE,   true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_STD_DELETE,             false,  },
+       { "RW",  SEC_FILE_READ_DATA|SEC_STD_READ_CONTROL,       true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_STD_WRITE_DAC,          true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_STD_WRITE_OWNER,        true,   },
+       { "RW",  SEC_FILE_READ_DATA|SEC_STD_SYNCHRONIZE,        true,   },
+
+       { "RD",  SEC_FILE_READ_DATA,                            true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA,        false,  },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_APPEND_DATA,       false,  },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_READ_EA,           true    },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_WRITE_EA,          true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_EXECUTE,           true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,    true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_FILE_WRITE_ATTRIBUTE,   true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_STD_DELETE,             true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_STD_READ_CONTROL,       true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_STD_WRITE_DAC,          true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_STD_WRITE_OWNER,        true,   },
+       { "RD",  SEC_FILE_READ_DATA|SEC_STD_SYNCHRONIZE,        true,   },
+
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_READ_DATA,        false   },
+       { "WD",  SEC_FILE_WRITE_DATA,                           true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_APPEND_DATA,      true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_READ_EA,          true    },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_WRITE_EA, true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_EXECUTE,          false   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_READ_ATTRIBUTE,   true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_FILE_WRITE_ATTRIBUTE,  true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_STD_DELETE,            true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_STD_READ_CONTROL,      true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_STD_WRITE_DAC, true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_STD_WRITE_OWNER,       true,   },
+       { "WD",  SEC_FILE_WRITE_DATA|SEC_STD_SYNCHRONIZE,       true,   },
+
+       { "RWD", SEC_FILE_READ_DATA,                            true    },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA,        true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_APPEND_DATA,       true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_READ_EA,           true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_WRITE_EA,          true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_EXECUTE,           true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,    true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_FILE_WRITE_ATTRIBUTE,   true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_STD_DELETE,             true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_STD_READ_CONTROL,       true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_STD_WRITE_DAC,          true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_STD_WRITE_OWNER,        true,   },
+       { "RWD", SEC_FILE_READ_DATA|SEC_STD_SYNCHRONIZE,        true,   },
+};
+
+/*
+ * Test conflicting sharemodes through SMB2: First open takes a
+ * sharemode, second open with potentially conflicting access.
+ */
+static bool test_smb2_sharemode_access(struct torture_context *tctx,
+                                      struct smb2_tree *tree)
+{
+       const char *fname = "test_sharemode";
+       NTSTATUS status;
+       bool ret = true;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(sharemode_table); i++) {
+               struct sharemode_info *info = &sharemode_table[i];
+               struct smb2_create create1 = { }, create2 = { };
+               NTSTATUS expected_status;
+
+               torture_comment(tctx, "index %3d, sharemode %3s, "
+                               "access mask 0x%06x\n",
+                               i, info->sharemode, info->access_mask);
+
+               create1.in.desired_access = SEC_RIGHTS_FILE_ALL;
+               create1.in.alloc_size = 0;
+               create1.in.file_attributes = FILE_ATTRIBUTE_NORMAL;


-- 
Samba Shared Repository

Reply via email to