diff options
| -rw-r--r-- | usr.sbin/extattr/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/extattr/rmextattr.8 | 18 | ||||
| -rw-r--r-- | usr.sbin/extattr/rmextattr.c | 75 | ||||
| -rw-r--r-- | usr.sbin/extattr/tests/Makefile | 7 | ||||
| -rwxr-xr-x | usr.sbin/extattr/tests/extattr_test.sh | 335 |
5 files changed, 410 insertions, 33 deletions
diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile index 8e2b5f7..9f5721d 100644 --- a/usr.sbin/extattr/Makefile +++ b/usr.sbin/extattr/Makefile @@ -1,8 +1,12 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= rmextattr MAN= rmextattr.8 +LDADD= -lsbuf + LINKS+= ${BINDIR}/rmextattr ${BINDIR}/getextattr LINKS+= ${BINDIR}/rmextattr ${BINDIR}/setextattr LINKS+= ${BINDIR}/rmextattr ${BINDIR}/lsextattr @@ -11,4 +15,8 @@ MLINKS+= rmextattr.8 setextattr.8 MLINKS+= rmextattr.8 getextattr.8 MLINKS+= rmextattr.8 lsextattr.8 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> diff --git a/usr.sbin/extattr/rmextattr.8 b/usr.sbin/extattr/rmextattr.8 index c51fa6d..3b0988f 100644 --- a/usr.sbin/extattr/rmextattr.8 +++ b/usr.sbin/extattr/rmextattr.8 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 30, 2000 +.Dd April 27, 2016 .Dt RMEXTATTR 8 .Os .Sh NAME @@ -61,6 +61,12 @@ .Ar attrname .Ar attrvalue .Ar filename ... +.Nm setextattr +.Fl i +.Op Fl fhnq +.Ar attrnamespace +.Ar attrname +.Ar filename ... .Sh DESCRIPTION These utilities @@ -91,6 +97,9 @@ the remaining arguments. (No follow.) If the file is a symbolic link, perform the operation on the link itself rather than the file that the link points to. +.It Fl i +(From stdin.) +Read attribute data from stdin instead of as an argument. .It Fl n .Dv ( NUL Ns -terminate.) @@ -99,6 +108,7 @@ link itself rather than the file that the link points to. .It Fl q (Quiet.) Do not print out the pathname and suppress error messages. +When given twice, print only the attribute value, with no trailing newline. .It Fl s (Stringify.) Escape nonprinting characters and put quotes around the output. @@ -109,7 +119,9 @@ Print the output in hexadecimal. .Sh EXAMPLES .Bd -literal setextattr system md5 `md5 -q /boot/kernel/kernel` /boot/kernel/kernel +md5 -q /boot/kernel/kernel | setextattr -i system md5 /boot/kernel/kernel getextattr system md5 /boot/kernel/kernel +getextattr -qq system md5 /boot/kernel/kernel | od -x lsextattr system /boot/kernel/kernel rmextattr system md5 /boot/kernel/kernel .Ed @@ -129,7 +141,3 @@ to be associated with each file or directory. .Sh AUTHORS .An Robert N M Watson .An Poul-Henning Kamp -.Sh BUGS -The -.Nm setextattr -utility can only be used to set attributes to strings. diff --git a/usr.sbin/extattr/rmextattr.c b/usr.sbin/extattr/rmextattr.c index c061943..4373fd6 100644 --- a/usr.sbin/extattr/rmextattr.c +++ b/usr.sbin/extattr/rmextattr.c @@ -37,6 +37,7 @@ */ #include <sys/types.h> +#include <sys/sbuf.h> #include <sys/uio.h> #include <sys/extattr.h> @@ -64,6 +65,8 @@ usage(void) case EASET: fprintf(stderr, "usage: setextattr [-fhnq] attrnamespace"); fprintf(stderr, " attrname attrvalue filename ...\n"); + fprintf(stderr, " or setextattr -i [-fhnq] attrnamespace"); + fprintf(stderr, " attrname filename ...\n"); exit(-1); case EARM: fprintf(stderr, "usage: rmextattr [-fhq] attrnamespace"); @@ -99,24 +102,28 @@ mkbuf(char **buf, int *oldlen, int newlen) int main(int argc, char *argv[]) { - char *buf, *visbuf, *p; +#define STDIN_BUF_SZ 1024 + char stdin_data[STDIN_BUF_SZ]; + char *p; const char *options, *attrname; size_t len; ssize_t ret; - int buflen, visbuflen, ch, error, i, arg_counter, attrnamespace, - minargc; + int ch, error, i, arg_counter, attrnamespace, minargc; + char *visbuf = NULL; + int visbuflen = 0; + char *buf = NULL; + int buflen = 0; + struct sbuf *attrvalue = NULL; int flag_force = 0; int flag_nofollow = 0; int flag_null = 0; - int flag_quiet = 0; + int count_quiet = 0; + int flag_from_stdin = 0; int flag_string = 0; int flag_hex = 0; - visbuflen = buflen = 0; - visbuf = buf = NULL; - p = basename(argv[0]); if (p == NULL) p = argv[0]; @@ -126,8 +133,8 @@ main(int argc, char *argv[]) minargc = 3; } else if (!strcmp(p, "setextattr")) { what = EASET; - options = "fhnq"; - minargc = 4; + options = "fhinq"; + minargc = 3; } else if (!strcmp(p, "rmextattr")) { what = EARM; options = "fhq"; @@ -148,11 +155,14 @@ main(int argc, char *argv[]) case 'h': flag_nofollow = 1; break; + case 'i': + flag_from_stdin = 1; + break; case 'n': flag_null = 1; break; case 'q': - flag_quiet = 1; + count_quiet += 1; break; case 's': flag_string = 1; @@ -169,6 +179,9 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + if (what == EASET && flag_from_stdin == 0) + minargc++; + if (argc < minargc) usage(); @@ -184,9 +197,15 @@ main(int argc, char *argv[]) attrname = NULL; if (what == EASET) { - mkbuf(&buf, &buflen, strlen(argv[0]) + 1); - strcpy(buf, argv[0]); - argc--; argv++; + attrvalue = sbuf_new_auto(); + if (flag_from_stdin) { + while ((error = read(0, stdin_data, STDIN_BUF_SZ)) > 0) + sbuf_bcat(attrvalue, stdin_data, error); + } else { + sbuf_cpy(attrvalue, argv[0]); + argc--; argv++; + } + sbuf_finish(attrvalue); } for (arg_counter = 0; arg_counter < argc; arg_counter++) { @@ -202,15 +221,17 @@ main(int argc, char *argv[]) continue; break; case EASET: - len = strlen(buf) + flag_null; + len = sbuf_len(attrvalue) + flag_null; if (flag_nofollow) ret = extattr_set_link(argv[arg_counter], - attrnamespace, attrname, buf, len); + attrnamespace, attrname, + sbuf_data(attrvalue), len); else ret = extattr_set_file(argv[arg_counter], - attrnamespace, attrname, buf, len); + attrnamespace, attrname, + sbuf_data(attrvalue), len); if (ret >= 0) { - if ((size_t)ret != len && !flag_quiet) { + if ((size_t)ret != len && !count_quiet) { warnx("Set %zd bytes of %zu for %s", ret, len, attrname); } @@ -235,7 +256,7 @@ main(int argc, char *argv[]) attrnamespace, buf, buflen); if (ret < 0) break; - if (!flag_quiet) + if (!count_quiet) printf("%s\t", argv[arg_counter]); for (i = 0; i < ret; i += ch + 1) { /* The attribute name length is unsigned. */ @@ -243,7 +264,7 @@ main(int argc, char *argv[]) printf("%s%*.*s", i ? "\t" : "", ch, ch, buf + i + 1); } - if (!flag_quiet || ret > 0) + if (!count_quiet || ret > 0) printf("\n"); continue; case EAGET: @@ -264,29 +285,27 @@ main(int argc, char *argv[]) attrnamespace, attrname, buf, buflen); if (ret < 0) break; - if (!flag_quiet) + if (!count_quiet) printf("%s\t", argv[arg_counter]); if (flag_string) { mkbuf(&visbuf, &visbuflen, ret * 4 + 1); strvisx(visbuf, buf, ret, VIS_SAFE | VIS_WHITE); - printf("\"%s\"\n", visbuf); - continue; + printf("\"%s\"", visbuf); } else if (flag_hex) { for (i = 0; i < ret; i++) printf("%s%02x", i ? " " : "", - buf[i]); - printf("\n"); - continue; + (unsigned char)buf[i]); } else { fwrite(buf, ret, 1, stdout); - printf("\n"); - continue; } + if (count_quiet < 2) + printf("\n"); + continue; default: break; } - if (!flag_quiet) + if (!count_quiet) warn("%s: failed", argv[arg_counter]); if (flag_force) continue; diff --git a/usr.sbin/extattr/tests/Makefile b/usr.sbin/extattr/tests/Makefile new file mode 100644 index 0000000..ca8200e --- /dev/null +++ b/usr.sbin/extattr/tests/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.sbin/extattr + +ATF_TESTS_SH= extattr_test + +.include <bsd.test.mk> diff --git a/usr.sbin/extattr/tests/extattr_test.sh b/usr.sbin/extattr/tests/extattr_test.sh new file mode 100755 index 0000000..d9c0c71 --- /dev/null +++ b/usr.sbin/extattr/tests/extattr_test.sh @@ -0,0 +1,335 @@ +# +# Copyright (c) 2016 Spectra Logic Corp +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ + +atf_test_case bad_namespace +bad_namespace_head() { + atf_set "descr" "Can't set attributes for nonexistent namespaces" +} +bad_namespace_body() { + touch foo + atf_check -s not-exit:0 -e match:"Invalid argument" \ + setextattr badnamespace myattr X foo + atf_check -s not-exit:0 -e match:"Invalid argument" \ + lsextattr -q badnamespace foo +} + +atf_test_case hex +hex_head() { + atf_set "descr" "Set and get attribute values in hexadecimal" +} +hex_body() { + touch foo + atf_check -s exit:0 -o empty setextattr user myattr XYZ foo + atf_check -s exit:0 -o inline:"58 59 5a\n" \ + getextattr -qx user myattr foo +} + +atf_test_case hex_nonascii +hex_nonascii_head() { + atf_set "descr" "Get binary attribute values in hexadecimal" +} +hex_nonascii_body() { + touch foo + BINSTUFF=`echo $'\x20\x30\x40\x55\x66\x70\x81\xa2\xb3\xee\xff'` + atf_check -s exit:0 -o empty setextattr user myattr "$BINSTUFF" foo + getextattr user myattr foo + atf_check -s exit:0 -o inline:"20 30 40 55 66 70 81 a2 b3 ee ff\n" \ + getextattr -qx user myattr foo +} + +atf_test_case long_name +long_name_head() { + atf_set "descr" "A maximum length attribute name" +} +long_name_body() { + # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208965 + atf_expect_fail "BUG 208965 extattr(2) doesn't allow maxlen attr names" + + ATTRNAME=`jot -b X -s "" 255 0` + touch foo + atf_check -s exit:0 -o empty setextattr user $ATTRNAME myvalue foo + atf_check -s exit:0 -o inline:"${ATTRNAME}\n" lsextattr -q user foo + atf_check -s exit:0 -o inline:"myvalue\n" \ + getextattr -q user ${ATTRNAME} foo + atf_check -s exit:0 -o empty rmextattr user ${ATTRNAME} foo + atf_check -s exit:0 -o empty lsextattr -q user foo +} + +atf_test_case loud +loud_head() { + atf_set "descr" "Loud (non -q) output for each command" +} +loud_body() { + touch foo + # setextattr(8) and friends print hard tabs. Use printf to convert + # them to spaces before checking the output. + atf_check -s exit:0 -o empty setextattr user myattr myvalue foo + atf_check -s exit:0 -o inline:"foo myattr" \ + printf "%s %s" $(lsextattr user foo) + atf_check -s exit:0 -o inline:"foo myvalue" \ + printf "%s %s" $(getextattr user myattr foo) + atf_check -s exit:0 -o empty rmextattr user myattr foo + atf_check -s exit:0 -o inline:"foo" printf %s $(lsextattr user foo) +} + +atf_test_case noattrs +noattrs_head() { + atf_set "descr" "A file with no extended attributes" +} +noattrs_body() { + touch foo + atf_check -s exit:0 -o empty lsextattr -q user foo +} + +atf_test_case nonexistent_file +nonexistent_file_head() { + atf_set "descr" "A file that does not exist" +} +nonexistent_file_body() { + atf_check -s exit:1 -e match:"No such file or directory" \ + lsextattr user foo + atf_check -s exit:1 -e match:"No such file or directory" \ + setextattr user myattr myvalue foo + atf_check -s exit:1 -e match:"No such file or directory" \ + getextattr user myattr foo + atf_check -s exit:1 -e match:"No such file or directory" \ + rmextattr user myattr foo +} + +atf_test_case null +null_head() { + atf_set "descr" "NUL-terminate an attribute value" +} +null_body() { + touch foo + atf_check -s exit:0 -o empty setextattr -n user myattr myvalue foo + atf_check -s exit:0 -o inline:"myvalue\0\n" getextattr -q user myattr foo +} + +atf_test_case one_user_attr +one_user_attr_head() { + atf_set "descr" "A file with one extended attribute" +} +one_user_attr_body() { + touch foo + atf_check -s exit:0 -o empty setextattr user myattr myvalue foo + atf_check -s exit:0 -o inline:"myattr\n" lsextattr -q user foo + atf_check -s exit:0 -o inline:"myvalue\n" getextattr -q user myattr foo + atf_check -s exit:0 -o empty rmextattr user myattr foo + atf_check -s exit:0 -o empty lsextattr -q user foo +} + +atf_test_case one_system_attr +one_system_attr_head() { + atf_set "descr" "A file with one extended attribute" + atf_set "require.user" "root" +} +one_system_attr_body() { + touch foo + atf_check -s exit:0 -o empty setextattr system myattr myvalue foo + atf_check -s exit:0 -o inline:"myattr\n" lsextattr -q system foo + atf_check -s exit:0 -o inline:"myvalue\n" getextattr -q system myattr foo + atf_check -s exit:0 -o empty rmextattr system myattr foo + atf_check -s exit:0 -o empty lsextattr -q system foo +} + +atf_test_case stdin +stdin_head() { + atf_set "descr" "Set attribute value from stdin" +} +stdin_body() { + dd if=/dev/random of=infile bs=1k count=8 + touch foo + setextattr -i user myattr foo < infile || atf_fail "setextattr failed" + atf_check -s exit:0 -o inline:"myattr\n" lsextattr -q user foo + getextattr -qq user myattr foo > outfile || atf_fail "getextattr failed" + atf_check -s exit:0 cmp -s infile outfile +} + +atf_test_case stringify +stringify_head() { + atf_set "descr" "Stringify the output of getextattr" +} +stringify_body() { + touch foo + atf_check -s exit:0 -o empty setextattr user myattr "my value" foo + atf_check -s exit:0 -o inline:"\"my\\\040value\"\n" \ + getextattr -qs user myattr foo +} + +atf_test_case symlink +symlink_head() { + atf_set "descr" "A symlink to an ordinary file" +} +symlink_body() { + touch foo + ln -s foo foolink + atf_check -s exit:0 -o empty setextattr user myattr myvalue foolink + atf_check -s exit:0 -o inline:"myvalue\n" \ + getextattr -q user myattr foolink + atf_check -s exit:0 -o inline:"myvalue\n" getextattr -q user myattr foo +} + +atf_test_case symlink_nofollow +symlink_nofollow_head() { + atf_set "descr" "Operating directly on a symlink" +} +symlink_nofollow_body() { + touch foo + ln -s foo foolink + # Check that with -h we can operate directly on the link + atf_check -s exit:0 -o empty setextattr -h user myattr myvalue foolink + atf_check -s exit:0 -o inline:"myvalue\n" \ + getextattr -qh user myattr foolink + atf_check -s exit:1 -e match:"Attribute not found" \ + getextattr user myattr foolink + atf_check -s exit:1 -e match:"Attribute not found" \ + getextattr user myattr foo + + # Check that with -h we cannot operate on the destination file + atf_check -s exit:0 -o empty setextattr user otherattr othervalue foo + atf_check -s exit:1 getextattr -qh user otherattr foolink +} + +atf_test_case system_and_user_attrs +system_and_user_attrs_head() { + atf_set "descr" "A file with both system and user extended attributes" + atf_set "require.user" "root" +} +system_and_user_attrs_body() { + touch foo + atf_check -s exit:0 -o empty setextattr user userattr userval foo + atf_check -s exit:0 -o empty setextattr system sysattr sysval foo + atf_check -s exit:0 -o inline:"userattr\n" lsextattr -q user foo + atf_check -s exit:0 -o inline:"sysattr\n" lsextattr -q system foo + + atf_check -s exit:0 -o inline:"userval\n" getextattr -q user userattr foo + atf_check -s exit:0 -o inline:"sysval\n" getextattr -q system sysattr foo + atf_check -s exit:0 -o empty rmextattr user userattr foo + atf_check -s exit:0 -o empty rmextattr system sysattr foo + atf_check -s exit:0 -o empty lsextattr -q user foo + atf_check -s exit:0 -o empty lsextattr -q system foo +} + +atf_test_case two_files +two_files_head() { + atf_set "descr" "Manipulate two files" +} +two_files_body() { + touch foo bar + atf_check -s exit:0 -o empty setextattr user myattr myvalue foo bar + atf_check -s exit:0 -o inline:"foo\tmyattr\nbar\tmyattr\n" \ + lsextattr user foo bar + atf_check -s exit:0 \ + -o inline:"foo\tmyvalue\nbar\tmyvalue\n" \ + getextattr user myattr foo bar + atf_check -s exit:0 -o empty rmextattr user myattr foo bar + atf_check -s exit:0 -o empty lsextattr -q user foo bar +} + +atf_test_case two_files_force +two_files_force_head() { + atf_set "descr" "Manipulate two files. The first does not exist" +} +two_files_force_body() { + touch bar + atf_check -s exit:1 -e match:"No such file or directory" \ + setextattr user myattr myvalue foo bar + atf_check -s exit:0 -e ignore setextattr -f user myattr myvalue foo bar + atf_check -s exit:1 -e match:"No such file or directory" \ + lsextattr user foo bar + atf_check -s exit:0 -e ignore -o inline:"bar\tmyattr\n" \ + lsextattr -f user foo bar + atf_check -s exit:1 -e match:"No such file or directory" \ + getextattr user myattr foo bar + atf_check -s exit:0 -e ignore \ + -o inline:"bar\tmyvalue\n" \ + getextattr -f user myattr foo bar + atf_check -s exit:1 -e match:"No such file or directory" \ + rmextattr user myattr foo bar + atf_check -s exit:0 -e ignore \ + rmextattr -f user myattr foo bar + atf_check -s exit:0 -o empty lsextattr -q user bar +} + +atf_test_case two_user_attrs +two_user_attrs_head() { + atf_set "descr" "A file with two extended attributes" +} +two_user_attrs_body() { + touch foo + atf_check -s exit:0 -o empty setextattr user myattr1 myvalue1 foo + atf_check -s exit:0 -o empty setextattr user myattr2 myvalue2 foo + # lsextattr could return the attributes in any order, so we must be + # careful how we compare them. + raw_output=`lsextattr -q user foo` || atf_fail "lsextattr failed" + tabless_output=`printf "%s %s" ${raw_output}` + if [ "myattr1 myattr2" != "${tabless_output}" -a \ + "myattr2 myattr1" != "${tabless_output}" ]; then + atf_fail "lsextattr printed ${tabless_output}" + fi + atf_check -s exit:0 -o inline:"myvalue1\n" getextattr -q user myattr1 foo + atf_check -s exit:0 -o inline:"myvalue2\n" getextattr -q user myattr2 foo + atf_check -s exit:0 -o empty rmextattr user myattr2 foo + atf_check -s exit:0 -o empty rmextattr user myattr1 foo + atf_check -s exit:0 -o empty lsextattr -q user foo +} + +atf_test_case unprivileged_user_cannot_set_system_attr +unprivileged_user_cannot_set_system_attr_head() { + atf_set "descr" "Unprivileged users can't set system attributes" + atf_set "require.user" "unprivileged" +} +unprivileged_user_cannot_set_system_attr_body() { + touch foo + atf_check -s exit:1 -e match:"Operation not permitted" \ + setextattr system myattr myvalue foo +} + + +atf_init_test_cases() { + atf_add_test_case bad_namespace + atf_add_test_case hex + atf_add_test_case hex_nonascii + atf_add_test_case long_name + atf_add_test_case loud + atf_add_test_case noattrs + atf_add_test_case nonexistent_file + atf_add_test_case null + atf_add_test_case symlink_nofollow + atf_add_test_case one_user_attr + atf_add_test_case one_system_attr + atf_add_test_case stdin + atf_add_test_case stringify + atf_add_test_case symlink + atf_add_test_case symlink_nofollow + atf_add_test_case system_and_user_attrs + atf_add_test_case two_files + atf_add_test_case two_files_force + atf_add_test_case two_user_attrs + atf_add_test_case unprivileged_user_cannot_set_system_attr +} |
