Merge pull request #25 from jordiprats/master

improved regex
NTTCom-MS · Dec 9, 2019 · 2a43a2b · 2a43a2b
2 parents e518038 + 6bcf321
commit 2a43a2b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.31
+
+* improved regex for sudoers.d files
+
 ## 0.1.30
 
 * bugfix: sudo files cannot contain dots

diff --git a/manifests/cmdalias.pp b/manifests/cmdalias.pp
@@ -7,7 +7,7 @@
   #TODO: refer per tindre dependencies automatiques
   include ::sudoers
 
-  $cmdname_cleanup = regsubst($cmdname, '[^a-zA-Z]+', '_')
+  $cmdname_cleanup = regsubst($cmdname, '[^a-zA-Z0-9]+', '_', 'G')
 
   file { "/etc/sudoers.d/${order}_00_cmdalias_${cmdname_cleanup}":
     owner   => 'root',

diff --git a/manifests/defaults.pp b/manifests/defaults.pp
@@ -7,8 +7,8 @@
 
   include ::sudoers
 
-  $username_cleanup = regsubst($username, '[^a-zA-Z]+', '_')
-  $defaults_cleanup = regsubst($default_name, '[^a-zA-Z]+', '_')
+  $username_cleanup = regsubst($username, '[^a-zA-Z0-9]+', '_', 'G')
+  $defaults_cleanup = regsubst($default_name, '[^a-zA-Z0-9]+', '_', 'G')
 
   # Defaults:nrpe !requiretty
   file { "/etc/sudoers.d/${order}_defaults_${defaults_cleanup}_${username_cleanup}":

diff --git a/manifests/sudo.pp b/manifests/sudo.pp
@@ -18,7 +18,7 @@
                     ) {
   include ::sudoers
 
-  $name_cleanup = regsubst($name, '[^a-zA-Z]+', '_')
+  $name_cleanup = regsubst($name, '[^a-zA-Z0-9]+', '_', 'G')
 
   file { "/etc/sudoers.d/${order}_10_sudo_${name_cleanup}":
     ensure  => $ensure,

diff --git a/manifests/useralias.pp b/manifests/useralias.pp
@@ -7,12 +7,12 @@
   #TODO: refer per tindre dependencies automatiques
   include ::sudoers
 
-  validate_array($users)
-
   #NAME ::= [A-Z]([A-Z][0-9]_)*
   validate_re($useraliasname, '[A-Z]([A-Z][0-9]_)*')
 
-  file { "/etc/sudoers.d/${order}_00_useralias_${useraliasname}":
+  $useraliasname_cleanup = regsubst($useraliasname, '[^A-Z0-9]+', '_', 'G')
+
+  file { "/etc/sudoers.d/${order}_00_useralias_${useraliasname_cleanup}":
     owner   => 'root',
     group   => 'root',
     mode    => '0440',

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-sudoers",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "author": "eyp",
   "summary": "manages sudoers",
   "license": "Apache-2.0",