s4/torture: rework stream names tests usage of local xattr call

Previously this test, that tests for correct conversion of ':' in stream
names, only worked with streams_xattr with "fruit:metadata" set to
"netatalk".

In order to have test coverage for fruit shares with other configs,
split the test into two:

one test creates the stream over SMB and run against all shares, the
other one is the unmodified existing test and is only run against the
share with streams_xattr and fruit:metadata=netatalk.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13155

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 75a3c0f3b1f843ba9a7838aa7a1c311fc262f8c7)

diff --git a/selftest/knownfail b/selftest/knownfail
index d9abad952d8481e541f27f5f23c5ac21de98dae5..713e39b8e27428256647b5e4aa64820795ae76b8 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -307,5 +307,3 @@
 ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_add_duplicate_different_type.*
 ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_rank_none.*
 ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_security_descriptor.*
-^samba3.vfs.fruit metadata_stream.stream names\(nt4_dc\)
-^samba3.vfs.fruit streams_depot.stream names\(nt4_dc\)

diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index a018a54de11a7c05f464896b93fa15c58425b838..c5ee7af3bc19200c2146fc63f9af629c15e1cb35 100644 (file)
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -2861,15 +2861,8 @@ static bool test_stream_names(struct torture_context *tctx,
        /* UTF8 private use are starts at 0xef 0x80 0x80 (0xf000) */
        const char *streams[] = {
                ":foo" "\xef\x80\xa2" "bar:$DATA", /* "foo:bar:$DATA" */
-               ":bar" "\xef\x80\xa2" "baz:$DATA", /* "bar:baz:$DATA" */
                "::$DATA"
        };
-       const char *localdir = NULL;
-
-       localdir = torture_setting_string(tctx, "localdir", NULL);
-       if (localdir == NULL) {
-               torture_skip(tctx, "Need localdir for test");
-       }
 
        sname1 = talloc_asprintf(mem_ctx, "%s%s", fname, streams[0]);
 
@@ -2898,12 +2891,7 @@ static bool test_stream_names(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        smb2_util_close(tree, create.out.file.handle);
 
-       ret = torture_setup_local_xattr(tctx, "localdir", BASEDIR "/stream_names.txt",
-                                       "user.DosStream.bar:baz:$DATA",
-                                       "data", strlen("data"));
-       CHECK_VALUE(ret, true);
-
-       ret = check_stream_list(tree, tctx, fname, 3, streams, false);
+       ret = check_stream_list(tree, tctx, fname, 2, streams, false);
        CHECK_VALUE(ret, true);
 
 done:
@@ -4195,6 +4183,72 @@ struct torture_suite *torture_vfs_fruit(void)
        return suite;
 }
 
+static bool test_stream_names_local(struct torture_context *tctx,
+                                   struct smb2_tree *tree)
+{
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       NTSTATUS status;
+       struct smb2_create create;
+       struct smb2_handle h;
+       const char *fname = BASEDIR "\\stream_names.txt";
+       const char *sname1;
+       bool ret;
+       /* UTF8 private use are starts at 0xef 0x80 0x80 (0xf000) */
+       const char *streams[] = {
+               ":foo" "\xef\x80\xa2" "bar:$DATA", /* "foo:bar:$DATA" */
+               ":bar" "\xef\x80\xa2" "baz:$DATA", /* "bar:baz:$DATA" */
+               "::$DATA"
+       };
+       const char *localdir = NULL;
+
+       localdir = torture_setting_string(tctx, "localdir", NULL);
+       if (localdir == NULL) {
+               torture_skip(tctx, "Need localdir for test");
+       }
+
+       sname1 = talloc_asprintf(mem_ctx, "%s%s", fname, streams[0]);
+
+       /* clean slate ...*/
+       smb2_util_unlink(tree, fname);
+       smb2_deltree(tree, fname);
+       smb2_deltree(tree, BASEDIR);
+
+       status = torture_smb2_testdir(tree, BASEDIR, &h);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       smb2_util_close(tree, h);
+
+       torture_comment(tctx, "(%s) testing stream names\n", __location__);
+       ZERO_STRUCT(create);
+       create.in.desired_access = SEC_FILE_WRITE_DATA;
+       create.in.file_attributes = FILE_ATTRIBUTE_NORMAL;
+       create.in.share_access =
+               NTCREATEX_SHARE_ACCESS_DELETE|
+               NTCREATEX_SHARE_ACCESS_READ|
+               NTCREATEX_SHARE_ACCESS_WRITE;
+       create.in.create_disposition = NTCREATEX_DISP_CREATE;
+       create.in.impersonation_level = SMB2_IMPERSONATION_ANONYMOUS;
+       create.in.fname = sname1;
+
+       status = smb2_create(tree, mem_ctx, &create);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       smb2_util_close(tree, create.out.file.handle);
+
+       ret = torture_setup_local_xattr(tctx, "localdir", BASEDIR "/stream_names.txt",
+                                       "user.DosStream.bar:baz:$DATA",
+                                       "data", strlen("data"));
+       CHECK_VALUE(ret, true);
+
+       ret = check_stream_list(tree, tctx, fname, 3, streams, false);
+       CHECK_VALUE(ret, true);
+
+done:
+       status = smb2_util_unlink(tree, fname);
+       smb2_deltree(tree, BASEDIR);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
 struct torture_suite *torture_vfs_fruit_netatalk(void)
 {
        struct torture_suite *suite = torture_suite_create(
@@ -4204,6 +4258,7 @@ struct torture_suite *torture_vfs_fruit_netatalk(void)
 
        torture_suite_add_1smb2_test(suite, "read netatalk metadata", test_read_netatalk_metadata);
        torture_suite_add_1smb2_test(suite, "OS X AppleDouble file conversion", test_adouble_conversion);
+       torture_suite_add_1smb2_test(suite, "stream names with locally created xattr", test_stream_names_local);
 
        return suite;
 }