Attachment 13352 Details for Bug 12885 – Patch for 4.7 cherry-picked from master

[patch] Patch for 4.7 cherry-picked from master

bug12887-v47.patch (text/plain), 4.66 KB, created by Ralph Böhme on 2017-07-10 09:34:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-07-10 09:34:34 UTC

Size: 4.66 KB

patch

obsolete

>From 1cde8683c77713d6d8a7e446ec4d25034307c377 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Fri, 7 Jul 2017 12:57:57 +0200
>Subject: [PATCH 1/2] s3/smbd: let non_widelink_open() chdir() to directories
> directly
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If the caller passes O_DIRECTORY we just try to chdir() to smb_fname
>directly, not to the parent directory.
>
>The security check in check_reduced_name() will continue to work, but
>this fixes the case of an open() for a previous version of a
>subdirectory that contains snapshopt.
>
>Eg:
>
>[share]
>    path = /shares/test
>    vfs objects = shadow_copy2
>    shadow:snapdir = .snapshots
>    shadow:snapdirseverywhere = yes
>
>Directory tree with fake snapshots:
>
>$ tree -a /shares/test/
>/shares/test/
>âââ dir
>âÂ Â  âââ file
>âÂ Â  âââ .snapshots
>âÂ Â      âââ @GMT-2017.07.04-04.30.12
>âÂ Â          âââ file
>âââ dir2
>âÂ Â  âââ file
>âââ file
>âââ .snapshots
>âÂ Â  âââ @GMT-2001.01.01-00.00.00
>âÂ Â      âââ dir2
>âÂ Â      âÂ Â  âââ file
>âÂ Â      âââ file
>âââ testfsctl.dat
>
>./bin/smbclient -U slow%x //localhost/share -c 'ls @GMT-2017.07.04-04.30.12/dir/*'
>NT_STATUS_OBJECT_NAME_NOT_FOUND listing \@GMT-2017.07.04-04.30.12\dir\*
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12885
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit b886a9443d49f6e27fa3863d87c9e24d12e62874)
>---
> source3/smbd/open.c | 30 +++++++++++++++++++++++++-----
> 1 file changed, 25 insertions(+), 5 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index 3ccee36..7781a6f 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -550,12 +550,32 @@ static int non_widelink_open(struct connection_struct *conn,
> 	char *parent_dir = NULL;
> 	struct smb_filename parent_dir_fname = {0};
> 	const char *final_component = NULL;
>+	bool is_directory = false;
>+	bool ok;
> 
>-	if (!parent_dirname(talloc_tos(),
>-			smb_fname->base_name,
>-			&parent_dir,
>-			&final_component)) {
>-		goto out;
>+#ifdef O_DIRECTORY
>+	if (flags & O_DIRECTORY) {
>+		is_directory = true;
>+	}
>+#endif
>+
>+	if (is_directory) {
>+		parent_dir = talloc_strdup(talloc_tos(), smb_fname->base_name);
>+		if (parent_dir == NULL) {
>+			saved_errno = errno;
>+			goto out;
>+		}
>+
>+		final_component = ".";
>+	} else {
>+		ok = parent_dirname(talloc_tos(),
>+				    smb_fname->base_name,
>+				    &parent_dir,
>+				    &final_component);
>+		if (!ok) {
>+			saved_errno = errno;
>+			goto out;
>+		}
> 	}
> 
> 	parent_dir_fname = (struct smb_filename) { .base_name = parent_dir };
>-- 
>2.9.4
>
>
>From a7b5565db835aa737b4a4df16419aefafe76a7ff Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Fri, 7 Jul 2017 13:12:19 +0200
>Subject: [PATCH 2/2] selftest: add a test for accessing previous version of
> directories with snapdirseverywhere
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12885
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Sat Jul  8 00:33:51 CEST 2017 on sn-devel-144
>
>(cherry picked from commit cc9ba98c08665e0ed6927fd81fa43a7bb7842e45)
>---
> source3/script/tests/test_shadow_copy.sh | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
>diff --git a/source3/script/tests/test_shadow_copy.sh b/source3/script/tests/test_shadow_copy.sh
>index 783e7f32..eba873f 100755
>--- a/source3/script/tests/test_shadow_copy.sh
>+++ b/source3/script/tests/test_shadow_copy.sh
>@@ -221,6 +221,26 @@ test_fetch_snap_file()
>         -c "get ${SNAPSHOTS[$snapidx]}/$path $WORKDIR/foo"
> }
> 
>+# Test fetching a previous version of a file
>+test_fetch_snap_dir()
>+{
>+    local share
>+    local path
>+    local snapidx
>+
>+    share=$1
>+    path=$2
>+    snapidx=$3
>+
>+    # This first command is not strictly needed, but it causes the snapshots to
>+    # appear in a network trace which helps debugging...
>+    $SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP \
>+        -c "allinfo $path"
>+
>+    $SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP \
>+        -c "ls ${SNAPSHOTS[$snapidx]}/$path/*"
>+}
>+
> test_shadow_copy_fixed()
> {
>     local share     #share to contact
>@@ -329,6 +349,9 @@ test_shadow_copy_everywhere()
>         test_fetch_snap_file $share "bar/lfoo" 3 || \
>         failed=`expr $failed + 1`
> 
>+    testit "list a previous version directory" \
>+        test_fetch_snap_dir $share "bar" 6 || \
>+        failed=`expr $failed + 1`
> }
> 
> test_shadow_copy_format()
>-- 
>2.9.4
>

Flags:

jra: review+

Actions: View

Attachments on bug 12885: 13350 | 13351 | 13352 | 13381