(#1) Pull in bodgitlib for LDAP value validation

bodgit · May 15, 2016 · a220518 · a220518
1 parent 43ba55c
commit a220518
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/manifests/domain.pp b/manifests/domain.pp
@@ -473,21 +473,28 @@
   validate_string($userdel_cmd)
   if $ldap_uri {
     validate_array($ldap_uri)
+    validate_ldap_uri($ldap_uri)
   }
   if $ldap_backup_uri {
     validate_array($ldap_backup_uri)
+    validate_ldap_uri($ldap_backup_uri)
   }
   if $ldap_chpass_uri {
     validate_array($ldap_chpass_uri)
+    validate_ldap_uri($ldap_chpass_uri)
   }
   if $ldap_chpass_backup_uri {
     validate_array($ldap_chpass_backup_uri)
+    valdiate_ldap_uri($ldap_chpass_backup_uri)
   }
   validate_string($ldap_search_base)
   if $ldap_schema {
     validate_re($ldap_schema, '^(rfc2307(bis)?|ipa|ad)$')
   }
-  validate_string($ldap_default_bind_dn)
+  if $ldap_default_bind_dn {
+    validate_string($ldap_default_bind_dn)
+    validate_ldap_dn($ldap_default_bind_dn)
+  }
   if $ldap_default_authtok_type {
     validate_re($ldap_default_authtok_type, '^(obfuscated_)?password$')
   }
@@ -664,7 +671,10 @@
   if $ldap_chpass_update_last_change {
     validate_bool($ldap_chpass_update_last_change)
   }
-  validate_string($ldap_access_filter)
+  if $ldap_access_filter {
+    validate_string($ldap_access_filter)
+    validate_ldap_filter($ldap_access_filter)
+  }
   if $ldap_account_expire_policy {
     validate_re($ldap_account_expire_policy, '^(shadow|ad|rhds|ipa|389ds|nds)$')
   }

diff --git a/metadata.json b/metadata.json
@@ -56,6 +56,10 @@
       "name": "puppetlabs/stdlib",
       "version_requirement": ">=4.6.0 <5.0.0"
     },
+    {
+      "name": "bodgit/bodgitlib",
+      "version_requirement": ">=1.0.0 <2.0.0"
+    },
     {
       "name": "richardc/datacat",
       "version_requirement": ">=0.6.1 <1.0.0"