From bbc351a83ca9c5c27c059d3a90824648f413a377 Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Tue, 23 Aug 2016 14:03:30 +0300 Subject: [PATCH] selftest: check file readability in shadow_copy2 test Add tests which verify that a snapshot file is readable if and only if it its metadata can be retrieved. Also verify (in most tests) that file is retrieved from the correct snapshot. Together with the existing test for number of previous versions we can stat, this test checks that we can read those files, and also that we cannot break out of a snapshot if wide links are not allowed. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12172 Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison (cherry picked from commit 495b8177363bf1930f3afb373ad73caac022f353) --- source3/script/tests/test_shadow_copy.sh | 44 +++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/source3/script/tests/test_shadow_copy.sh b/source3/script/tests/test_shadow_copy.sh index a59aae33eed..2b72f06b146 100755 --- a/source3/script/tests/test_shadow_copy.sh +++ b/source3/script/tests/test_shadow_copy.sh @@ -139,18 +139,48 @@ test_count_versions() local share local path local expected_count + local skip_content local versions + local tstamps + local tstamp + local content share=$1 path=$2 expected_count=$3 + skip_content=$4 versions=`$SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP -c "allinfo $path" | grep "^create_time:" | wc -l` - if [ "$versions" = "$expected_count" ] ; then - true - else + if [ "$versions" != "$expected_count" ] ; then echo "expected $expected_count versions of $path, got $versions" - false + return 1 fi + + #readable snapshots + tstamps=`$SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP -c "allinfo $path" | awk '/^@GMT-/ {snapshot=$1} /^create_time:/ {printf "%s\n", snapshot}'` + for tstamp in $tstamps ; do + if ! $SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP -c "get $tstamp\\$path $WORKDIR/foo" ; then + echo "Failed getting \\\\$SERVER\\$share\\$tstamp\\$path" + return 1 + fi + #also check the content, but not for wide links + if [ "x$skip_content" != "x1" ] ; then + content=`cat $WORKDIR/foo` + if [ "$content" != "$tstamp" ] ; then + echo "incorrect content of \\\\$SERVER\\$share\\$tstamp\\$path expected [$tstamp] got [$content]" + return 1 + fi + fi + done + + #non-readable snapshots + tstamps=`$SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP -c "allinfo $path" | \ + awk '/^@GMT-/ {if (snapshot!=""){printf "%s\n", snapshot} ; snapshot=$1} /^create_time:/ {snapshot=""} END {if (snapshot!=""){printf "%s\n", snapshot}}'` + for tstamp in $tstamps ; do + if $SMBCLIENT -U$USERNAME%$PASSWORD "//$SERVER/$share" -I $SERVER_IP -c "get $tstamp\\$path $WORKDIR/foo" ; then + echo "Unexpected success getting \\\\$SERVER\\$share\\$tstamp\\$path" + return 1 + fi + done } # Test fetching a previous version of a file @@ -206,11 +236,11 @@ test_shadow_copy_fixed() failed=`expr $failed + 1` testit "$msg - abs symlink outside" \ - test_count_versions $share bar/letcpasswd $ncopies_blocked || \ + test_count_versions $share bar/letcpasswd $ncopies_blocked 1 || \ failed=`expr $failed + 1` testit "$msg - rel symlink outside" \ - test_count_versions $share bar/loutside $ncopies_blocked || \ + test_count_versions $share bar/loutside $ncopies_blocked 1 || \ failed=`expr $failed + 1` } @@ -292,7 +322,7 @@ test_shadow_copy_format() build_snapshots $WORKDIR/$where "$prefix" 10 19 testit "$msg - regular file" \ - test_count_versions $share foo $ncopies_allowed || \ + test_count_versions $share foo $ncopies_allowed 1 || \ failed=`expr $failed + 1` } -- 2.11.4.GIT