handle DENY ace for DELETE, WRITE_OWNER, and NAMED_ATTRS
Subsystems (2)
PATCH 1/1 handle DENY ace for DELETE, WRITE_OWNER, and NAMED_ATTRS
Don't ignore setting or viewing DENY ace for DELETE, WRITE_OWNER, and NAMED_ATTRS.
--- include/libacl_nfs4.h | 8 ++------ libnfs4acl/nfs4_new_ace.c | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-)
include/libacl_nfs4.h +2 -6
@@ -95,15 +95,11 @@#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \ | NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE) -#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \ - | NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS)/* XXX not sure about the following. Note that e.g. DELETE_CHILD is wrong in * general (should only be ignored on files). */ #define MASK_EQUAL (mask1, mask2) \ - (((mask1) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \ - ~NFS4_ACE_DELETE_CHILD) \ - == ((mask2) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \ - ~NFS4_ACE_DELETE_CHILD)) + (((mask1) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_DELETE_CHILD) \ + == ((mask2) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_DELETE_CHILD))/* * NFS4_MAX_ACESIZE -- the number of bytes in the string representation we
libnfs4acl/nfs4_new_ace.c +0 -3
@@ -51,9 +51,6 @@ struct nfs4_ace * nfs4_new_ace(int is_directory, u32 type, u32 flag, u32 access_ ace->type = type; ace->flag = flag; -if ( type ==NFS4_ACE_ACCESS_DENIED_ACE_TYPE ) - access_mask = access_mask & ~(NFS4_ACE_MASK_IGNORE ); -/* Castrate delete_child if we aren't a directory */ if (!is_directory) access_mask &= ~NFS4_ACE_DELETE_CHILD ;
Signature · 1 line
1.9.3
Quoted 2 lines · Olga Kornievskaia
Don't ignore setting or viewing DENY ace for DELETE,
WRITE_OWNER, andNAMED_ATTRS.
Agreed, it's trying to enforce some sort of policy when it should just be leaving the ACL untouched and letting the server sort it out.
Looks like we may as well remove MASK_EQUAL too, though, I can't see any user.
Applying as follows.
--b.
commit 47f4fae9b746
Author: Olga Kornievskaia <[email protected]> Date: Mon Nov 3 14:46:51 2014 -0500
handle DENY ace for DELETE, WRITE_OWNER, and NAMED_ATTRS
Don't ignore setting or viewing DENY ace for DELETE, WRITE_OWNER, and NAMED_ATTRS.
include/libacl_nfs4.h +0 -10
@@ -95,16 +95,6 @@#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \ | NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE) -#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \ - | NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS) -/* XXX not sure about the following. Note that e.g. DELETE_CHILD is wrong in -* general (should only be ignored on files). */ -#define MASK_EQUAL (mask1, mask2) \ - (((mask1) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \ - ~NFS4_ACE_DELETE_CHILD) \ - == ((mask2) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \ - ~NFS4_ACE_DELETE_CHILD)) -/* * NFS4_MAX_ACESIZE -- the number of bytes in the string representation we * read in (not the same as on-the-wire, which is also not the same as how
libnfs4acl/nfs4_new_ace.c +0 -3
@@ -51,9 +51,6 @@ struct nfs4_ace * nfs4_new_ace(int is_directory, u32 type, u32 flag, u32 access_ ace->type = type; ace->flag = flag; -if ( type ==NFS4_ACE_ACCESS_DENIED_ACE_TYPE ) - access_mask = access_mask & ~(NFS4_ACE_MASK_IGNORE ); -/* Castrate delete_child if we aren't a directory */ if (!is_directory) access_mask &= ~NFS4_ACE_DELETE_CHILD ;
Quoted 11 lines · J. Bruce Fields
Quoted 2 lines · Olga Kornievskaia
Don't ignore setting or viewing DENY ace for DELETE,
WRITE_OWNER, andNAMED_ATTRS.Agreed, it's trying to enforce some sort of policy when it should just be leaving the ACL untouched and letting the server sort it out.
Looks like we may as well remove
MASK_EQUALtoo, though, I can't see any user.Applying as follows.
Thank you, Bruce.
Quoted 50 lines
--b.
commit
47f4fae9b746Author: Olga Kornievskaia <[email protected]> Date: Mon Nov 3 14:46:51 2014 -0500handle DENY ace for DELETE,
WRITE_OWNER, andNAMED_ATTRSDon't ignore setting or viewing DENY ace for DELETE,
WRITE_OWNER, andNAMED_ATTRS.Signed-off-by Olga Kornievskaia <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>include/libacl_nfs4.h +0
-10@@ -95,16 +95,6 @@#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \ | NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE) -#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \ - | NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS) -/* XXX not sure about the following. Note that e.g. DELETE_CHILD is wrong in -* general (should only be ignored on files). */ -#define MASK_EQUAL (mask1, mask2) \ - (((mask1) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \ - ~NFS4_ACE_DELETE_CHILD) \ - == ((mask2) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \ - ~NFS4_ACE_DELETE_CHILD)) -/* * NFS4_MAX_ACESIZE -- the number of bytes in the string representation we * read in (not the same as on-the-wire, which is also not the same as how libnfs4acl/nfs4_new_ace.c +0
-3@@ -51,9 +51,6 @@ struct nfs4_ace * nfs4_new_ace(int is_directory, u32 type, u32 flag, u32 access_ ace->type = type; ace->flag = flag; -if ( type ==NFS4_ACE_ACCESS_DENIED_ACE_TYPE ) - access_mask = access_mask & ~(NFS4_ACE_MASK_IGNORE ); -/* Castrate delete_child if we aren't a directory */ if (!is_directory) access_mask &= ~NFS4_ACE_DELETE_CHILD ;