s3/torture: add POSIX-LS-WILDCARD test

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

selftest/knownfail.d/samba3.smbtorture_s3

@@ -0,0 +1,2 @@
+^samba3.smbtorture_s3.plain.POSIX-LS-WILDCARD.smbtorture\(nt4_dc_smb1\)
+^samba3.smbtorture_s3.crypt.POSIX-LS-WILDCARD.smbtorture\(nt4_dc_smb1\)

source3/selftest/tests.py

@@ -243,6 +243,7 @@ posix_tests = ["POSIX", "POSIX-APPEND", "POSIX-SYMLINK-ACL", "POSIX-SYMLINK-EA",
                "POSIX-BLOCKING-LOCK",
                "POSIX-ACL-OPLOCK",
                "POSIX-ACL-SHAREROOT",
+               "POSIX-LS-WILDCARD",
               ]
 
 for t in posix_tests:

source3/torture/proto.h

@@ -85,6 +85,7 @@ bool torture_casetable(int dummy);
  */
 
 bool run_posix_append(int dummy);
+bool run_posix_ls_wildcard_test(int dummy);
 bool run_case_insensitive_create(int dummy);
 
 bool run_nbench2(int dummy);

source3/torture/test_posix.c

@@ -0,0 +1,250 @@
+/*
+   Unix SMB/CIFS implementation.
+   Copyright (C) Ralph Boehme 2020
+
+   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 "torture/proto.h"
+#include "libcli/security/security.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "libsmb/proto.h"
+
+struct posix_test_entry {
+	const char *name;
+	const char *target;
+	const char *expected;
+	uint64_t returned_size;
+	bool ok;
+};
+
+static NTSTATUS posix_ls_fn(struct file_info *finfo,
+			    const char *name,
+			    void *_state)
+{
+	struct posix_test_entry *state =
+		(struct posix_test_entry *)_state;
+
+	for (; state->name != NULL; state++) {
+		if (strequal(finfo->name, state->expected)) {
+			state->ok = true;
+			state->returned_size = finfo->size;
+			break;
+		}
+	}
+
+	return NT_STATUS_OK;
+}
+
+static void posix_test_entries_reset(struct posix_test_entry *state)
+{
+	for (; state->name != NULL; state++) {
+		state->ok = false;
+	}
+}
+
+static bool posix_test_entry_check(struct posix_test_entry *state,
+				   const char *name,
+				   bool expected,
+				   uint64_t expected_size)
+{
+	bool result = false;
+
+	for (; state->name != NULL; state++) {
+		if (strequal(name, state->name)) {
+			result = state->ok;
+			break;
+		}
+	}
+	if (state->name == NULL) {
+		printf("test failed, unknown name: %s\n", name);
+		return false;
+	}
+
+	if (expected == result) {
+		return true;
+	}
+
+	printf("test failed, %s: %s\n",
+	       expected ? "missing" : "unexpected",
+	       name);
+
+	return false;
+}
+
+/*
+  Test non-POSIX vs POSIX ls * of symlinks
+ */
+bool run_posix_ls_wildcard_test(int dummy)
+{
+	TALLOC_CTX *frame = NULL;
+	struct cli_state *cli_unix = NULL;
+	struct cli_state *cli_win = NULL;
+	uint16_t fnum = (uint16_t)-1;
+	NTSTATUS status;
+	const char *file = "file";
+	const char *symlnk_dangling = "dangling";
+	const char *symlnk_dst_dangling = "xxxxxxx";
+	const char *symlnk_in_share = "symlnk_in_share";
+	const char *symlnk_dst_in_share = file;
+	const char *symlnk_outside_share = "symlnk_outside_share";
+	const char *symlnk_dst_outside_share = "/etc/passwd";
+	struct posix_test_entry state[] = {
+		{
+			.name = symlnk_dangling,
+			.target = symlnk_dst_dangling,
+			.expected = symlnk_dangling,
+		}, {
+			.name = symlnk_in_share,
+			.target = symlnk_dst_in_share,
+			.expected = symlnk_in_share,
+		}, {
+			.name = symlnk_outside_share,
+			.target = symlnk_dst_outside_share,
+			.expected = symlnk_outside_share,
+		}, {
+			.name = NULL,
+		}
+	};
+	int i;
+	bool correct = false;
+
+	frame = talloc_stackframe();
+
+	printf("Starting POSIX-LS-WILDCARD test\n");
+
+	if (!torture_open_connection(&cli_unix, 0)) {
+		TALLOC_FREE(frame);
+		return false;
+	}
+
+	if (!torture_open_connection(&cli_win, 0)) {
+		TALLOC_FREE(frame);
+		return false;
+	}
+
+	torture_conn_set_sockopt(cli_unix);
+	torture_conn_set_sockopt(cli_win);
+
+	status = torture_setup_unix_extensions(cli_unix);
+	if (!NT_STATUS_IS_OK(status)) {
+		TALLOC_FREE(frame);
+		return false;
+	}
+
+	cli_posix_unlink(cli_unix, file);
+	cli_posix_unlink(cli_unix, symlnk_dangling);
+	cli_posix_unlink(cli_unix, symlnk_in_share);
+	cli_posix_unlink(cli_unix, symlnk_outside_share);
+
+	status = cli_posix_open(cli_unix,
+				file,
+				O_RDWR|O_CREAT,
+				0666,
+				&fnum);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("cli_posix_open of %s failed error %s\n",
+		       file,
+		       nt_errstr(status));
+		goto out;
+	}
+
+	status = cli_close(cli_unix, fnum);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("cli_close failed %s\n", nt_errstr(status));
+		goto out;
+	}
+	fnum = (uint16_t)-1;
+
+	for (i = 0; state[i].name != NULL; i++) {
+		status = cli_posix_symlink(cli_unix,
+					   state[i].target,
+					   state[i].name);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("POSIX symlink of %s failed (%s)\n",
+			       symlnk_dangling, nt_errstr(status));
+			goto out;
+		}
+	}
+
+	printf("Doing Windows ls *\n");
+
+	status = cli_list(cli_win, "*", 0, posix_ls_fn, state);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("cli_close failed %s\n", nt_errstr(status));
+		goto out;
+	}
+
+	if (!posix_test_entry_check(state, symlnk_dangling, false, 0)) {
+		goto out;
+	}
+	if (!posix_test_entry_check(state, symlnk_outside_share, false, 0)) {
+		goto out;
+	}
+	if (!posix_test_entry_check(state, symlnk_in_share, true, 0)) {
+		goto out;
+	}
+
+	posix_test_entries_reset(state);
+
+	printf("Doing POSIX ls *\n");
+
+	status = cli_list(cli_unix, "*", 0, posix_ls_fn, state);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("cli_close failed %s\n", nt_errstr(status));
+		goto out;
+	}
+
+	if (!posix_test_entry_check(state,
+				    symlnk_dangling,
+				    true,
+				    strlen(symlnk_dst_dangling)))
+	{
+		goto out;
+	}
+	if (!posix_test_entry_check(state,
+				    symlnk_outside_share,
+				    true,
+				    strlen(symlnk_dst_outside_share)))
+	{
+		goto out;
+	}
+	if (!posix_test_entry_check(state,
+				    symlnk_in_share,
+				    true,
+				    strlen(symlnk_dst_in_share))) {
+		goto out;
+	}
+
+	printf("POSIX-LS-WILDCARD test passed\n");
+	correct = true;
+
+out:
+	cli_posix_unlink(cli_unix, file);
+	cli_posix_unlink(cli_unix, symlnk_dangling);
+	cli_posix_unlink(cli_unix, symlnk_in_share);
+	cli_posix_unlink(cli_unix, symlnk_outside_share);
+
+	if (!torture_close_connection(cli_unix)) {
+		correct = false;
+	}
+	if (!torture_close_connection(cli_win)) {
+		correct = false;
+	}
+
+	TALLOC_FREE(frame);
+	return correct;
+}

source3/torture/torture.c

@@ -14914,6 +14914,10 @@ static struct {
 		.name  = "POSIX-ACL-SHAREROOT",
 		.fn    = run_posix_acl_shareroot_test,
 	},
+	{
+		.name  = "POSIX-LS-WILDCARD",
+		.fn    = run_posix_ls_wildcard_test,
+	},
 	{
 		.name  = "WINDOWS-BAD-SYMLINK",
 		.fn    = run_symlink_open_test,

source3/wscript_build

@@ -1183,6 +1183,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                         torture/test_async_echo.c
                         torture/test_addrchange.c
                         torture/test_posix_append.c
+                        torture/test_posix.c
                         torture/test_nttrans_create.c
                         torture/test_nttrans_fsctl.c
                         torture/test_case_insensitive.c