Skip to content

Add the ability to provide groups as an array or string. #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bschonec wants to merge 1 commit into
base: 2.0
Choose a base branch
from
Open

Add the ability to provide groups as an array or string. #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status](https://travis-ci.org/arnoudj/puppet-sudo.png?branch=master)](https://travis-ci.org/arnoudj/puppet-sudo)

Allow restricted root access for specified users. The name of the defined
type must consist of only letters, numbers and underscores and should be
type must consist of only letters, numbers, dashes and underscores and should be
unique. If the name has incorrect characters the defined type will fail.
Sudoers entries realised with the `sudo::sudoers` defined type will be
stored in `"/etc/sudoers.d/[typename]"`.
Expand Down Expand Up @@ -45,7 +45,7 @@ Array of users that are allowed to execute the command(s).

### group

Group that is allowed to execute the command(s). Cannot be combined with 'users'.
String or array of groups that are allowed to execute the command(s). Cannot be combined with 'users'.

### hosts

Expand Down
21 changes: 13 additions & 8 deletions manifests/sudoers.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# == Define: sudo
#
# Allow restricted root access for specified users. The name of the defined
# type must consist of only letters, numbers and underscores. If the name
# type must consist of only letters, numbers, dashes and underscores. If the name
# has incorrect characters the defined type will fail.
#
# === Parameters
Expand All @@ -16,7 +16,8 @@
# Array of users that are allowed to execute the command(s).
#
# [*group*]
# Group that can run the listed commands. Cannot be combined with users.
# String or array of groups that can run the listed commands.
# Cannot be combined with users.
#
# [*hosts*]
# Array of hosts that the command(s) can be executed on. Denying hosts using a
Expand Down Expand Up @@ -90,20 +91,24 @@
}

# filename as per the manual or aliases as per the sudoer spec must not
# contain dots.
# contain dots. Replaces dashes with underscores, too.
# As having dots in a username is legit, let's fudge
$sane_name = regsubst($name, '\.', '_', 'G')
$sane_name = regsubst($name, '[\.-]', '_', 'G')
$sudoers_user_file = "/etc/sudoers.d/${sane_priority}${sane_name}"

if $sane_name !~ /^[A-Za-z][A-Za-z0-9_]*$/ {
fail "Will not create sudoers file \"${sudoers_user_file}\" (for \"${name}\") should consist of letters numbers or underscores."
if $sane_name !~ /^[A-Za-z][A-Za-z0-9_\-]*$/ {
fail "Will not create sudoers file \"${sudoers_user_file}\" (for \"${name}\") should consist of letters, numbers, dashes or underscores."
}

if $users != undef and $group != undef {
fail 'You cannot define both a list of users and a group. Choose one.'
}

validate_string($group)

case type3x($group) {
'string': { $group_array = [ $group ] }
'array': { $group_array = $group }
default: { fail('$group must be a string or an array. ') }
}

if $ensure == 'present' {
file { $sudoers_user_file:
Expand Down
4 changes: 3 additions & 1 deletion templates/sudoers.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ Defaults!<%= @sane_name.upcase %>_CMNDS <%= @defaults.class == Array ? @defaults
<% if @users then -%>
<%= @sane_name.upcase %>_USERS <%= @sane_name.upcase %>_HOSTS = (<%= @sane_name.upcase %>_RUNAS) <%= tags %> <%= @sane_name.upcase %>_CMNDS
<% else -%>
%<%= @group %> <%= @sane_name.upcase %>_HOSTS = (<%= @sane_name.upcase %>_RUNAS) <%= tags %> <%= @sane_name.upcase %>_CMNDS
<% @group_array.each do |this_group| -%>
%<%= this_group %> <%= @sane_name.upcase %>_HOSTS = (<%= @sane_name.upcase %>_RUNAS) <%= tags %> <%= @sane_name.upcase %>_CMNDS
<% end -%>
<% end -%>