From f3af13f5019f320b1e51897102e59a628871759a Mon Sep 17 00:00:00 2001 From: mxwasilewski Date: Fri, 24 Mar 2023 16:16:53 +0100 Subject: [PATCH 1/3] strickter loglevel syntax verification --- spec/type_aliases/loglevel_spec.rb | 2 ++ types/loglevel.pp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb index 265ecc8e61..4307ad8ce2 100644 --- 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 index 3d45adab39..dedfeee7f6 100644 --- 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/] From 30b738c6300cc2c7f947fa48c01adb57fc9d7470 Mon Sep 17 00:00:00 2001 From: igt-marcin-wasilewski <90308695+igt-marcin-wasilewski@users.noreply.github.com> Date: Thu, 15 Jun 2023 08:37:35 +0200 Subject: [PATCH 2/3] Update loglevel_spec.rb --- spec/type_aliases/loglevel_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb index 4307ad8ce2..0580094219 100644 --- a/spec/type_aliases/loglevel_spec.rb +++ b/spec/type_aliases/loglevel_spec.rb @@ -21,6 +21,7 @@ [], ['info'], 'thisiswarning', + 'errorerror', ].each do |invalid_value| it { is_expected.not_to allow_value(invalid_value) } end From ffdc076a5b7d41fe221cba21636fe226054d781a Mon Sep 17 00:00:00 2001 From: igt-marcin-wasilewski <90308695+igt-marcin-wasilewski@users.noreply.github.com> Date: Thu, 15 Jun 2023 08:38:00 +0200 Subject: [PATCH 3/3] Update types/loglevel.pp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Romain Tartière --- types/loglevel.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/loglevel.pp b/types/loglevel.pp index dedfeee7f6..d4950b14c0 100644 --- 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[/\A(([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])\W*)+\Z/] +type Apache::LogLevel = Pattern[/\A([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])(\s+([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8]))*\Z/]