forked from ungleich-public/cdist
		
	Add support for ACL mask.
This commit is contained in:
		
					parent
					
						
							
								d18584b4ff
							
						
					
				
			
			
				commit
				
					
						45e9ed441e
					
				
			
		
					 4 changed files with 25 additions and 3 deletions
				
			
		| 
						 | 
					@ -19,5 +19,8 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -e "/$__object_id" ]
 | 
					if [ -e "/$__object_id" ]
 | 
				
			||||||
then getfacl "/$__object_id" | grep -E '^((default:|)(user|group)):[a-z]' || true
 | 
					then
 | 
				
			||||||
 | 
					    getfacl "/$__object_id" \
 | 
				
			||||||
 | 
					        | grep -E '^((default:)?(user|group):[^:]|(default:)?mask::)' \
 | 
				
			||||||
 | 
					        || true
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -37,7 +37,18 @@ do
 | 
				
			||||||
        then echo "default:$parameter:$l"
 | 
					        then echo "default:$parameter:$l"
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
    done < "$__object/parameter/$parameter"
 | 
					    done < "$__object/parameter/$parameter"
 | 
				
			||||||
done )"
 | 
					done
 | 
				
			||||||
 | 
					if [ -f "$__object/parameter/mask" ]
 | 
				
			||||||
 | 
					then
 | 
				
			||||||
 | 
					    l=$( cat "$__object/parameter/mask" )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    echo "mask::$l"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if [ -f "$__object/parameter/default" ]
 | 
				
			||||||
 | 
					    then echo "default:mask::$l"
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
setfacl_exec='setfacl'
 | 
					setfacl_exec='setfacl'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,6 +13,12 @@ ACL must be defined as 3-symbol combination, using `r`, `w`, `x` and `-`.
 | 
				
			||||||
See setfacl(1) and acl(5) for more details.
 | 
					See setfacl(1) and acl(5) for more details.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					OPTIONAL PARAMETERS
 | 
				
			||||||
 | 
					-------------------
 | 
				
			||||||
 | 
					mask
 | 
				
			||||||
 | 
					   Add mask ACL entry.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
OPTIONAL MULTIPLE PARAMETERS
 | 
					OPTIONAL MULTIPLE PARAMETERS
 | 
				
			||||||
----------------------------
 | 
					----------------------------
 | 
				
			||||||
user
 | 
					user
 | 
				
			||||||
| 
						 | 
					@ -46,7 +52,8 @@ EXAMPLES
 | 
				
			||||||
        --user alice:rwx \
 | 
					        --user alice:rwx \
 | 
				
			||||||
        --user bob:r-x \
 | 
					        --user bob:r-x \
 | 
				
			||||||
        --group project-group:rwx \
 | 
					        --group project-group:rwx \
 | 
				
			||||||
        --group some-other-group:r-x
 | 
					        --group some-other-group:r-x \
 | 
				
			||||||
 | 
					        --mask r-x
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
AUTHORS
 | 
					AUTHORS
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								cdist/conf/type/__acl/parameter/optional
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cdist/conf/type/__acl/parameter/optional
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					mask
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue