Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8311 ZFS_READONLY is a little too strict
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Reviewed by: Matt Ahrens <mahrens@delphix.com> Reviewed by: John Kennedy <john.kennedy@delphix.com> Approved by: Prakash Surya <prakash.surya@delphix.com>
- Loading branch information
1 parent
796b863
commit 2889ec4
Showing
11 changed files
with
360 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # | ||
| # This file and its contents are supplied under the terms of the | ||
| # Common Development and Distribution License ("CDDL"), version 1.0. | ||
| # You may only use this file in accordance with the terms of version | ||
| # 1.0 of the CDDL. | ||
| # | ||
| # A full copy of the text of the CDDL should have accompanied this | ||
| # source. A copy of the CDDL is also available via the Internet at | ||
| # http://www.illumos.org/license/CDDL. | ||
| # | ||
|
|
||
| # | ||
| # Copyright 2017 Nexenta Systems, Inc. All rights reserved. | ||
| # | ||
|
|
||
| PROG = dos_ro | ||
|
|
||
| include $(SRC)/cmd/Makefile.cmd | ||
|
|
||
| LDLIBS += -lnvpair | ||
|
|
||
| include ../Makefile.subdirs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| /* | ||
| * This file and its contents are supplied under the terms of the | ||
| * Common Development and Distribution License ("CDDL"), version 1.0. | ||
| * You may only use this file in accordance with the terms of version | ||
| * 1.0 of the CDDL. | ||
| * | ||
| * A full copy of the text of the CDDL should have accompanied this | ||
| * source. A copy of the CDDL is also available via the Internet at | ||
| * http://www.illumos.org/license/CDDL. | ||
| */ | ||
|
|
||
| /* | ||
| * Copyright 2017 Nexenta Systems, Inc. All rights reserved. | ||
| */ | ||
|
|
||
| #include <sys/types.h> | ||
| #include <sys/stat.h> | ||
|
|
||
| #include <attr.h> | ||
| #include <errno.h> | ||
| #include <fcntl.h> | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <unistd.h> | ||
| #include <libnvpair.h> | ||
|
|
||
| extern const char *__progname; | ||
|
|
||
| int vflag = 0; | ||
|
|
||
| static int | ||
| dosattr_set_ro(int fildes, const char *fname) | ||
| { | ||
| nvlist_t *nvl = NULL; | ||
| int err; | ||
|
|
||
| err = nvlist_alloc(&nvl, NV_UNIQUE_NAME, 0); | ||
| if (err != 0) | ||
| return (err); | ||
|
|
||
| (void) nvlist_add_boolean_value(nvl, A_READONLY, 1); | ||
|
|
||
| if (fname == NULL) { | ||
| err = fsetattr(fildes, XATTR_VIEW_READWRITE, nvl); | ||
| } else { | ||
| err = setattrat(fildes, XATTR_VIEW_READWRITE, fname, nvl); | ||
| } | ||
| if (err < 0) { | ||
| err = errno; | ||
| if (vflag > 1) { | ||
| (void) fprintf(stderr, | ||
| "dosattr_set: setattrat (%s), err %d\n", | ||
| fname, err); | ||
| } | ||
| } | ||
|
|
||
| nvlist_free(nvl); | ||
|
|
||
| return (err); | ||
| } | ||
|
|
||
| void | ||
| usage(void) | ||
| { | ||
| (void) fprintf(stderr, "usage: %s [-v] file\n", | ||
| __progname); | ||
| exit(1); | ||
| } | ||
|
|
||
| int | ||
| main(int argc, char **argv) | ||
| { | ||
| char *fname; | ||
| int c, fd, n; | ||
|
|
||
| while ((c = getopt(argc, argv, "v")) != -1) { | ||
| switch (c) { | ||
| case 'v': | ||
| vflag++; | ||
| break; | ||
| case '?': | ||
| default: | ||
| usage(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (optind + 1 != argc) | ||
| usage(); | ||
| fname = argv[optind]; | ||
|
|
||
| fd = open(fname, O_CREAT | O_RDWR, 0644); | ||
| if (fd < 0) { | ||
| perror(fname); | ||
| exit(1); | ||
| } | ||
|
|
||
| if (vflag) | ||
| (void) fprintf(stderr, "Write 1 (mode 644)\n"); | ||
| n = write(fd, "mode 644 OK\n", 12); | ||
| if (n != 12) { | ||
| (void) fprintf(stderr, "write mode 644, err=%d\n", errno); | ||
| exit(1); | ||
| } | ||
|
|
||
| if (vflag) | ||
| (void) fprintf(stderr, "Chmod 444\n"); | ||
| n = fchmod(fd, 0444); | ||
| if (n < 0) { | ||
| (void) fprintf(stderr, "chmod 444, err=%d\n", errno); | ||
| exit(1); | ||
| } | ||
|
|
||
| if (vflag) | ||
| (void) fprintf(stderr, "Write 2 (mode 444)\n"); | ||
| n = write(fd, "mode 444 OK\n", 12); | ||
| if (n != 12) { | ||
| (void) fprintf(stderr, "write mode 444, err=%d\n", errno); | ||
| exit(1); | ||
| } | ||
|
|
||
| if (vflag) | ||
| (void) fprintf(stderr, "Set DOS R/O\n"); | ||
| n = dosattr_set_ro(fd, NULL /* fname? */); | ||
| if (n != 0) { | ||
| (void) fprintf(stderr, "Set R/O, err=%d\n", n); | ||
| exit(1); | ||
| } | ||
|
|
||
| /* | ||
| * This fails, but write on an already open handle should succeed | ||
| * the same as when we've set the mode to 444 after open. | ||
| */ | ||
| if (vflag) | ||
| (void) fprintf(stderr, "Write 3 (DOS R/O)\n"); | ||
| n = write(fd, "Write DOS RO?\n", 14); | ||
| if (n != 14) { | ||
| (void) fprintf(stderr, "write (DOS R/O), err=%d\n", errno); | ||
| exit(1); | ||
| } | ||
|
|
||
| return (0); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_004_pos.ksh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| #!/bin/ksh -p | ||
| # | ||
| # CDDL HEADER START | ||
| # | ||
| # The contents of this file are subject to the terms of the | ||
| # Common Development and Distribution License (the "License"). | ||
| # You may not use this file except in compliance with the License. | ||
| # | ||
| # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
| # or http://www.opensolaris.org/os/licensing. | ||
| # See the License for the specific language governing permissions | ||
| # and limitations under the License. | ||
| # | ||
| # When distributing Covered Code, include this CDDL HEADER in each | ||
| # file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
| # If applicable, add the following below this CDDL HEADER, with the | ||
| # fields enclosed by brackets "[]" replaced with your own identifying | ||
| # information: Portions Copyright [yyyy] [name of copyright owner] | ||
| # | ||
| # CDDL HEADER END | ||
| # | ||
|
|
||
| # | ||
| # Copyright 2009 Sun Microsystems, Inc. All rights reserved. | ||
| # Use is subject to license terms. | ||
| # | ||
|
|
||
| # | ||
| # Copyright (c) 2012 by Delphix. All rights reserved. | ||
| # Copyright 2017 Nexenta Systems, Inc. All rights reserved. | ||
| # | ||
|
|
||
| . $STF_SUITE/tests/functional/acl/acl_common.kshlib | ||
| . $STF_SUITE/tests/functional/acl/cifs/cifs.kshlib | ||
|
|
||
| # | ||
| # DESCRIPTION: | ||
| # Verify the ability to continue writing to a file | ||
| # after opening the file read/write, and setting | ||
| # the DOS Readonly flag on that file. | ||
| # | ||
| # STRATEGY: | ||
| # Run the special program "dos_ro" | ||
|
|
||
| verify_runnable "both" | ||
|
|
||
| function cleanup | ||
| { | ||
| if [[ -n $gobject ]]; then | ||
| destroy_object $gobject | ||
| fi | ||
|
|
||
| for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do | ||
| mtpt=$(get_prop mountpoint $fs) | ||
| log_must rm -rf $mtpt/file.* $mtpt/dir.* | ||
| done | ||
|
|
||
| [[ -f $TESTFILE ]] && rm $TESTFILE | ||
| } | ||
|
|
||
| # | ||
| # Set the special attribute to the given node | ||
| # | ||
| # $1: The given node (file/dir) | ||
| # $2: The special attribute to be set | ||
| # | ||
| function set_attribute | ||
| { | ||
| typeset object=$1 | ||
| typeset attr=$2 | ||
|
|
||
| if [[ -z $attr ]]; then | ||
| attr="AHRSadimu" | ||
| if [[ -f $object ]]; then | ||
| attr="${attr}q" | ||
| fi | ||
| fi | ||
| chmod S+c${attr} $object | ||
| return $? | ||
| } | ||
|
|
||
| # | ||
| # Clear the special attribute to the given node | ||
| # | ||
| # $1: The given node (file/dir) | ||
| # $2: The special attribute to be cleared | ||
| # | ||
| function clear_attribute | ||
| { | ||
| typeset object=$1 | ||
| typeset attr=$2 | ||
|
|
||
| if [[ -z $attr ]]; then | ||
| if is_global_zone ; then | ||
| attr="AHRSadimu" | ||
| if [[ -f $object ]]; then | ||
| attr="${attr}q" | ||
| fi | ||
| else | ||
| attr="AHRS" | ||
| fi | ||
| fi | ||
|
|
||
| chmod S-c${attr} $object | ||
| return $? | ||
| } | ||
|
|
||
| FILES="file.0 file.1" | ||
| FS="$TESTPOOL $TESTPOOL/$TESTFS" | ||
| ATTRS="R" | ||
|
|
||
| TESTFILE=/tmp/tfile | ||
| TESTDIR=tdir | ||
| TESTATTR=tattr | ||
| TESTACL=user:$ZFS_ACL_OTHER1:write_data:allow | ||
| TESTMODE=777 | ||
| TESTSTR="ZFS test suites" | ||
|
|
||
| log_assert "Verify writable open handle still works after " \ | ||
| "setting the DOS Readonly flag on a file." | ||
| log_onexit cleanup | ||
|
|
||
| echo "$TESTSTR" > $TESTFILE | ||
|
|
||
| typeset gobject | ||
| typeset gattr | ||
| for fs in $FS ; do | ||
| mtpt=$(get_prop mountpoint $fs) | ||
| chmod 777 $mtpt | ||
| for user in root $ZFS_ACL_STAFF1; do | ||
| log_must set_cur_usr $user | ||
| for file in $FILES ; do | ||
| gobject=$mtpt/$file | ||
| create_object "file" $gobject $ZFS_ACL_CUR_USER | ||
| log_must dos_ro $gobject | ||
| destroy_object $gobject | ||
| done | ||
| done | ||
| done | ||
|
|
||
| log_pass "Writable handle OK after setting DOS R/O flag." |
Oops, something went wrong.