* [PATCH v2] btrfs: test if the capability is kept on incremental send
@ 2020-06-01 19:48 Marcos Paulo de Souza
2020-06-02 10:38 ` Filipe Manana
0 siblings, 1 reply; 2+ messages in thread
From: Marcos Paulo de Souza @ 2020-06-01 19:48 UTC (permalink / raw)
To: dsterba, linux-btrfs, fdmanana, fstests; +Cc: Marcos Paulo de Souza
From: Marcos Paulo de Souza <mpdesouza@suse.com>
This test exercises full send and incremental send operations for cases
where files have capabilities, ensuring the capabilities aren't lost in
the process.
There was a problem with kernel <=5.7 that was making capabilities to be lost
after a combination of full + incremental send. This behavior was fixed by the
following patch:
btrfs: send: Emit file capabilities after chown
Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
---
Changes from v1:
* Remove the steps to reproduce a problem fixes in btrfs code. (Filipe)
* Remove the underscore from the local function names (Filipe)
* Change function name _check_xattr -> check_capabilities (Filipe)
* Rename all local variables to be lowercase (Filipe)
* Put FS1 and FS2 variables in the global context of the test (Filipe)
* Changes all occurrences of _fail into a simple echo (Filipe)
* Declare some local variables as "local" (Filipe)
* Some Capability -> Capabilities, since we are dealing with multiple capabilities (Filipe)
* Some cap -> capabilities, inc -> incremental (Filipe)
* Add missing "send group" (Filipe)
tests/btrfs/214 | 152 ++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/214.out | 6 ++
tests/btrfs/group | 1 +
3 files changed, 159 insertions(+)
create mode 100755 tests/btrfs/214
create mode 100644 tests/btrfs/214.out
diff --git a/tests/btrfs/214 b/tests/btrfs/214
new file mode 100755
index 00000000..113bbb27
--- /dev/null
+++ b/tests/btrfs/214
@@ -0,0 +1,152 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved.
+#
+# FS QA Test 214
+#
+# Test if the file capabilities aren't lost after full and incremental send
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_command "$SETCAP_PROG" setcap
+_require_command "$GETCAP_PROG" getcap
+
+FS1="$SCRATCH_MNT/fs1"
+FS2="$SCRATCH_MNT/fs2"
+
+cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+check_capabilities()
+{
+ local file
+ local cap
+ local ret
+ file="$1"
+ cap="$2"
+ ret=$($GETCAP_PROG "$file")
+ if [ -z "$ret" ]; then
+ echo "$ret"
+ echo "missing capability in file $file"
+ fi
+ if [[ "$ret" != *$cap* ]]; then
+ echo "$cap"
+ echo "Capabilities do not match. Output: $ret"
+ fi
+}
+
+setup()
+{
+ _scratch_mkfs >/dev/null
+ _scratch_mount
+
+ $BTRFS_UTIL_PROG subvolume create "$FS1" > /dev/null
+ $BTRFS_UTIL_PROG subvolume create "$FS2" > /dev/null
+}
+
+full_nocap_inc_withcap_send()
+{
+ local ret
+
+ setup
+
+ # Test full send containing a file without capabilities
+ touch "$FS1/foo.bar"
+ $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_init" >/dev/null
+ $BTRFS_UTIL_PROG send "$FS1/snap_init" -q | $BTRFS_UTIL_PROG receive "$FS2" -q
+ # ensure that we don't have capabilities set
+ ret=$($GETCAP_PROG "$FS2/snap_init/foo.bar")
+ if [ -n "$ret" ]; then
+ echo "File contains capabilities when it shouldn't"
+ fi
+
+ # Test if incremental send brings the newly added capability
+ $SETCAP_PROG "cap_sys_ptrace+ep cap_sys_nice+ep" "$FS1/foo.bar"
+ $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_inc" >/dev/null
+ $BTRFS_UTIL_PROG send -p "$FS1/snap_init" "$FS1/snap_inc" -q | \
+ $BTRFS_UTIL_PROG receive "$FS2" -q
+ check_capabilities "$FS2/snap_inc/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
+
+ _scratch_unmount
+}
+
+roundtrip_send()
+{
+ local files
+
+ # files should include foo.bar
+ files="$1"
+
+ setup
+
+ # create files on fs1, must contain foo.bar
+ for f in $files; do
+ touch "$FS1/$f"
+ done
+
+ # Test full send, checking if the receiving side keeps the capabilities
+ $SETCAP_PROG "cap_sys_ptrace+ep cap_sys_nice+ep" "$FS1/foo.bar"
+ $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_init" >/dev/null
+ $BTRFS_UTIL_PROG send "$FS1/snap_init" -q | $BTRFS_UTIL_PROG receive "$FS2" -q
+ check_capabilities "$FS2/snap_init/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
+
+ # Test incremental send with different owner/group but same capabilities
+ chgrp 100 "$FS1/foo.bar"
+ $SETCAP_PROG "cap_sys_ptrace+ep cap_sys_nice+ep" "$FS1/foo.bar"
+ $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_inc" >/dev/null
+ check_capabilities "$FS1/snap_inc/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
+ $BTRFS_UTIL_PROG send -p "$FS1/snap_init" "$FS1/snap_inc" -q | \
+ $BTRFS_UTIL_PROG receive "$FS2" -q
+ check_capabilities "$FS2/snap_inc/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
+
+ # Test capabilities after incremental send with different group and capabilities
+ chgrp 0 "$FS1/foo.bar"
+ $SETCAP_PROG "cap_sys_time+ep cap_syslog+ep" "$FS1/foo.bar"
+ $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_inc2" >/dev/null
+ check_capabilities "$FS1/snap_inc2/foo.bar" "cap_sys_time,cap_syslog+ep"
+ $BTRFS_UTIL_PROG send -p "$FS1/snap_inc" "$FS1/snap_inc2" -q | \
+ $BTRFS_UTIL_PROG receive "$FS2" -q
+ check_capabilities "$FS2/snap_inc2/foo.bar" "cap_sys_time,cap_syslog+ep"
+
+ _scratch_unmount
+}
+
+# real QA test starts here
+
+echo "Test full send + file without capabilities, then incremental send bringing a new capability"
+full_nocap_inc_withcap_send
+
+echo "Testing if foo.bar alone can keep its capabilities"
+roundtrip_send "foo.bar"
+
+echo "Test foo.bar being the first item among other files"
+roundtrip_send "foo.bar foo.bax foo.baz"
+
+echo "Test foo.bar with objectid between two other files"
+roundtrip_send "foo1 foo.bar foo3"
+
+echo "Test foo.bar being the last item among other files"
+roundtrip_send "foo1 foo2 foo.bar"
+
+status=0
+exit
diff --git a/tests/btrfs/214.out b/tests/btrfs/214.out
new file mode 100644
index 00000000..197a39a9
--- /dev/null
+++ b/tests/btrfs/214.out
@@ -0,0 +1,6 @@
+QA output created by 214
+Test full send + file without capabilities, then incremental send bringing a new capability
+Testing if foo.bar alone can keep its capabilities
+Test foo.bar being the first item among other files
+Test foo.bar with objectid between two other files
+Test foo.bar being the last item among other files
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 9e48ecc1..505665b5 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -216,3 +216,4 @@
211 auto quick log prealloc
212 auto balance dangerous
213 auto balance dangerous
+214 auto quick send snapshot
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] btrfs: test if the capability is kept on incremental send
2020-06-01 19:48 [PATCH v2] btrfs: test if the capability is kept on incremental send Marcos Paulo de Souza
@ 2020-06-02 10:38 ` Filipe Manana
0 siblings, 0 replies; 2+ messages in thread
From: Filipe Manana @ 2020-06-02 10:38 UTC (permalink / raw)
To: Marcos Paulo de Souza
Cc: David Sterba, linux-btrfs, fstests, Marcos Paulo de Souza
On Mon, Jun 1, 2020 at 9:08 PM Marcos Paulo de Souza
<marcos@mpdesouza.com> wrote:
>
> From: Marcos Paulo de Souza <mpdesouza@suse.com>
>
> This test exercises full send and incremental send operations for cases
> where files have capabilities, ensuring the capabilities aren't lost in
> the process.
>
> There was a problem with kernel <=5.7 that was making capabilities to be lost
> after a combination of full + incremental send. This behavior was fixed by the
> following patch:
>
> btrfs: send: Emit file capabilities after chown
>
> Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Thanks.
> ---
>
> Changes from v1:
> * Remove the steps to reproduce a problem fixes in btrfs code. (Filipe)
> * Remove the underscore from the local function names (Filipe)
> * Change function name _check_xattr -> check_capabilities (Filipe)
> * Rename all local variables to be lowercase (Filipe)
> * Put FS1 and FS2 variables in the global context of the test (Filipe)
> * Changes all occurrences of _fail into a simple echo (Filipe)
> * Declare some local variables as "local" (Filipe)
> * Some Capability -> Capabilities, since we are dealing with multiple capabilities (Filipe)
> * Some cap -> capabilities, inc -> incremental (Filipe)
> * Add missing "send group" (Filipe)
>
> tests/btrfs/214 | 152 ++++++++++++++++++++++++++++++++++++++++++++
> tests/btrfs/214.out | 6 ++
> tests/btrfs/group | 1 +
> 3 files changed, 159 insertions(+)
> create mode 100755 tests/btrfs/214
> create mode 100644 tests/btrfs/214.out
>
> diff --git a/tests/btrfs/214 b/tests/btrfs/214
> new file mode 100755
> index 00000000..113bbb27
> --- /dev/null
> +++ b/tests/btrfs/214
> @@ -0,0 +1,152 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved.
> +#
> +# FS QA Test 214
> +#
> +# Test if the file capabilities aren't lost after full and incremental send
> +#
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "cleanup; exit \$status" 0 1 2 3 15
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# remove previous $seqres.full before test
> +rm -f $seqres.full
> +
> +_supported_fs btrfs
> +_supported_os Linux
> +_require_scratch
> +_require_command "$SETCAP_PROG" setcap
> +_require_command "$GETCAP_PROG" getcap
> +
> +FS1="$SCRATCH_MNT/fs1"
> +FS2="$SCRATCH_MNT/fs2"
> +
> +cleanup()
> +{
> + cd /
> + rm -f $tmp.*
> +}
> +
> +check_capabilities()
> +{
> + local file
> + local cap
> + local ret
> + file="$1"
> + cap="$2"
> + ret=$($GETCAP_PROG "$file")
> + if [ -z "$ret" ]; then
> + echo "$ret"
> + echo "missing capability in file $file"
> + fi
> + if [[ "$ret" != *$cap* ]]; then
> + echo "$cap"
> + echo "Capabilities do not match. Output: $ret"
> + fi
> +}
> +
> +setup()
> +{
> + _scratch_mkfs >/dev/null
> + _scratch_mount
> +
> + $BTRFS_UTIL_PROG subvolume create "$FS1" > /dev/null
> + $BTRFS_UTIL_PROG subvolume create "$FS2" > /dev/null
> +}
> +
> +full_nocap_inc_withcap_send()
> +{
> + local ret
> +
> + setup
> +
> + # Test full send containing a file without capabilities
> + touch "$FS1/foo.bar"
> + $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_init" >/dev/null
> + $BTRFS_UTIL_PROG send "$FS1/snap_init" -q | $BTRFS_UTIL_PROG receive "$FS2" -q
> + # ensure that we don't have capabilities set
> + ret=$($GETCAP_PROG "$FS2/snap_init/foo.bar")
> + if [ -n "$ret" ]; then
> + echo "File contains capabilities when it shouldn't"
> + fi
> +
> + # Test if incremental send brings the newly added capability
> + $SETCAP_PROG "cap_sys_ptrace+ep cap_sys_nice+ep" "$FS1/foo.bar"
> + $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_inc" >/dev/null
> + $BTRFS_UTIL_PROG send -p "$FS1/snap_init" "$FS1/snap_inc" -q | \
> + $BTRFS_UTIL_PROG receive "$FS2" -q
> + check_capabilities "$FS2/snap_inc/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
> +
> + _scratch_unmount
> +}
> +
> +roundtrip_send()
> +{
> + local files
> +
> + # files should include foo.bar
> + files="$1"
> +
> + setup
> +
> + # create files on fs1, must contain foo.bar
> + for f in $files; do
> + touch "$FS1/$f"
> + done
> +
> + # Test full send, checking if the receiving side keeps the capabilities
> + $SETCAP_PROG "cap_sys_ptrace+ep cap_sys_nice+ep" "$FS1/foo.bar"
> + $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_init" >/dev/null
> + $BTRFS_UTIL_PROG send "$FS1/snap_init" -q | $BTRFS_UTIL_PROG receive "$FS2" -q
> + check_capabilities "$FS2/snap_init/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
> +
> + # Test incremental send with different owner/group but same capabilities
> + chgrp 100 "$FS1/foo.bar"
> + $SETCAP_PROG "cap_sys_ptrace+ep cap_sys_nice+ep" "$FS1/foo.bar"
> + $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_inc" >/dev/null
> + check_capabilities "$FS1/snap_inc/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
> + $BTRFS_UTIL_PROG send -p "$FS1/snap_init" "$FS1/snap_inc" -q | \
> + $BTRFS_UTIL_PROG receive "$FS2" -q
> + check_capabilities "$FS2/snap_inc/foo.bar" "cap_sys_ptrace,cap_sys_nice+ep"
> +
> + # Test capabilities after incremental send with different group and capabilities
> + chgrp 0 "$FS1/foo.bar"
> + $SETCAP_PROG "cap_sys_time+ep cap_syslog+ep" "$FS1/foo.bar"
> + $BTRFS_UTIL_PROG subvolume snapshot -r "$FS1" "$FS1/snap_inc2" >/dev/null
> + check_capabilities "$FS1/snap_inc2/foo.bar" "cap_sys_time,cap_syslog+ep"
> + $BTRFS_UTIL_PROG send -p "$FS1/snap_inc" "$FS1/snap_inc2" -q | \
> + $BTRFS_UTIL_PROG receive "$FS2" -q
> + check_capabilities "$FS2/snap_inc2/foo.bar" "cap_sys_time,cap_syslog+ep"
> +
> + _scratch_unmount
> +}
> +
> +# real QA test starts here
> +
> +echo "Test full send + file without capabilities, then incremental send bringing a new capability"
> +full_nocap_inc_withcap_send
> +
> +echo "Testing if foo.bar alone can keep its capabilities"
> +roundtrip_send "foo.bar"
> +
> +echo "Test foo.bar being the first item among other files"
> +roundtrip_send "foo.bar foo.bax foo.baz"
> +
> +echo "Test foo.bar with objectid between two other files"
> +roundtrip_send "foo1 foo.bar foo3"
> +
> +echo "Test foo.bar being the last item among other files"
> +roundtrip_send "foo1 foo2 foo.bar"
> +
> +status=0
> +exit
> diff --git a/tests/btrfs/214.out b/tests/btrfs/214.out
> new file mode 100644
> index 00000000..197a39a9
> --- /dev/null
> +++ b/tests/btrfs/214.out
> @@ -0,0 +1,6 @@
> +QA output created by 214
> +Test full send + file without capabilities, then incremental send bringing a new capability
> +Testing if foo.bar alone can keep its capabilities
> +Test foo.bar being the first item among other files
> +Test foo.bar with objectid between two other files
> +Test foo.bar being the last item among other files
> diff --git a/tests/btrfs/group b/tests/btrfs/group
> index 9e48ecc1..505665b5 100644
> --- a/tests/btrfs/group
> +++ b/tests/btrfs/group
> @@ -216,3 +216,4 @@
> 211 auto quick log prealloc
> 212 auto balance dangerous
> 213 auto balance dangerous
> +214 auto quick send snapshot
> --
> 2.26.2
>
--
Filipe David Manana,
“Whether you think you can, or you think you can't — you're right.”
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-02 10:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-01 19:48 [PATCH v2] btrfs: test if the capability is kept on incremental send Marcos Paulo de Souza
2020-06-02 10:38 ` Filipe Manana
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).