strickter loglevel syntax verification

puppetlabs · Mar 27, 2023 · 0c60c68 · 0c60c68
1 parent 00138a1
commit 0c60c68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
@@ -10,6 +10,7 @@
     'warn mod_ssl.c:info',
     'warn ssl_module:info',
     'trace4',
+    'ssl:info',
   ].each do |allowed_value|
     it { is_expected.to allow_value(allowed_value) }
   end
@@ -19,6 +20,7 @@
     '',
     [],
     ['info'],
+    'thisiswarning',
   ].each do |invalid_value|
     it { is_expected.not_to allow_value(invalid_value) }
   end

diff --git a/types/loglevel.pp b/types/loglevel.pp
@@ -24,4 +24,4 @@
 # * `trace8`
 #
 # @see https://httpd.apache.org/docs/current/mod/core.html#loglevel
-type Apache::LogLevel = Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
+type Apache::LogLevel = Pattern[/\A(([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])\W*)+\Z/]