Merge pull request #107 from coreone/filters

Add filter options
voxpupuli · Jan 24, 2019 · bfc03b8 · bfc03b8
2 parents 0c12580 + c6f814f
commit bfc03b8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/manifests/jail.pp b/manifests/jail.pp
@@ -4,6 +4,8 @@
   Optional[String] $filter_includes = undef,
   Optional[String] $filter_failregex = undef,
   Optional[String] $filter_ignoreregex = undef,
+  Optional[Integer] $filter_maxlines = undef,
+  Optional[String] $filter_datepattern = undef,
   $filter_additional_config = undef,
   Boolean $enabled = true,
   Optional[String] $action = undef,
@@ -37,7 +39,9 @@
         filter_additional_config => $filter_additional_config,
         filter_failregex         => $filter_failregex,
         filter_ignoreregex       => $filter_ignoreregex,
-        journalmatch             => $journalmatch
+        filter_maxlines          => $filter_maxlines,
+        filter_datepattern       => $filter_datepattern,
+        journalmatch             => $journalmatch,
       }
     ),
     owner   => $config_file_owner,

diff --git a/spec/defines/fail2ban_jail_spec.rb b/spec/defines/fail2ban_jail_spec.rb
@@ -12,8 +12,10 @@
 
       let(:params) do
         {
-          'logpath'          => '/var/log/syslog',
-          'filter_failregex' => 'Login failed for user .* from <HOST>'
+          'logpath'            => '/var/log/syslog',
+          'filter_failregex'   => 'Login failed for user .* from <HOST>',
+          'filter_maxlines'    => 10,
+          'filter_datepattern' => '%%Y-%%m-%%d %%H:%%M(?::%%S)?'
         }
       end
 
@@ -36,6 +38,22 @@
           'content' => %r{failregex = Login failed for user .* from <HOST>}
         )
       end
+
+      it do
+        is_expected.to contain_file('custom_filter_spec_test_jail').with(
+          'ensure'  => 'file',
+          'notify'  => 'Service[fail2ban]',
+          'content' => %r{maxlines = 10}
+        )
+      end
+
+      it do
+        is_expected.to contain_file('custom_filter_spec_test_jail').with(
+          'ensure'  => 'file',
+          'notify'  => 'Service[fail2ban]',
+          'content' => %r{datepattern = %%Y-%%m-%%d %%H:%%M(?::%%S)?}
+        )
+      end
     end
   end
 end
diff --git a/templates/common/custom_filter.conf.epp b/templates/common/custom_filter.conf.epp
@@ -5,6 +5,12 @@
 <% if $journalmatch { -%>
 journalmatch = <%= $journalmatch %>
 <% } -%>
+<% if $filter_maxlines { -%>
+maxlines = <%= $filter_maxlines %>
+<% } -%>
+<% if $filter_datepattern { -%>
+datepattern = <%= $filter_datepattern %>
+<% } -%>
 
 <% if $findtime { -%>
 [INCLUDES]