smeserver-fail2ban/contribs9/smeserver-fail2ban-0.1.18.bz10767-adminpanel.patch

diff -Nur smeserver-fail2ban-0.1.18.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fail2ban smeserver-fail2ban-0.1.18/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fail2ban
--- smeserver-fail2ban-0.1.18.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fail2ban      1969-12-31 19:00:00.000000000 -0500
+++ smeserver-fail2ban-0.1.18/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fail2ban  2019-04-09 22:32:20.723000000 -0400
@@ -0,0 +1,190 @@
+<lexicon lang="en-us">
+    <entry>
+       <base>SERVICE_STATUS</base>
+       <trans>Fail2ban service status.</trans>
+    </entry>
+    <entry>
+       <base>STATUS</base>
+       <trans>Status</trans>
+    </entry>
+    <entry>
+        <base>FilterLocalNetworks_STATUS</base>
+        <trans>Whitelist all the local network defined.</trans>
+    </entry>
+    <entry>
+        <base>FilterLocalNetworks</base>
+        <trans>FilterLocalNetworks status</trans>
+    </entry>
+    <entry>
+        <base>FilterValidRemoteHosts_STATUS</base>
+        <trans>Whitelist all the authorized remote hosts allowed to acces server-manager.</trans>
+    </entry>
+    <entry>
+        <base>FilterValidRemoteHosts</base>
+        <trans>FilterValidRemoteHosts status</trans>
+    </entry>
+    <entry>
+        <base>BANTIME</base>
+        <trans>Set the default ban time for jails (Initial default is 1800 seconds).</trans>
+    </entry>
+    <entry>
+        <base>DEFAULT_BANTIME</base>
+        <trans>Bantime</trans>
+    </entry>
+    <entry>
+        <base>FINDTIME</base>
+        <trans>>Set the default find time for jails (Initial default is 900 seconds).</trans>
+    </entry>
+    <entry>
+        <base>DEFAULT_FINDTIME</base>
+        <trans>Findtime</trans>
+    </entry>
+    <entry>
+        <base>MAXRETRY</base>
+        <trans>Set the default max retry allowed before being ban (Initial default is 3).</trans>
+    </entry>
+    <entry>
+        <base>DEFAULT_MAXRETRY</base>
+        <trans>Maxretry</trans>
+    </entry>
+    <entry>
+        <base>SSHD_STATUS</base>
+        <trans>Status of sshd jail.</trans>
+    </entry>
+    <entry>
+        <base>SSHD</base>
+        <trans>sshd</trans>
+    </entry>
+    <entry>
+        <base>QPSMTPD_STATUS</base>
+        <trans>Status of qpsmtpd (incoming emails) jail.</trans>
+    </entry>
+    <entry>
+        <base>QPSMTPD</base>
+        <trans>qpsmtpd</trans>
+    </entry>
+    <entry>
+        <base>IMAP_STATUS</base>
+        <trans>Status of dovecot (imap service to retrieve emails) jail.</trans>
+    </entry>
+    <entry>
+        <base>IMAP</base>
+        <trans>dovecot</trans>
+    </entry>
+    <entry>
+        <base>HTTPD_STATUS</base>
+        <trans>Status of httpd jails. Multiple features are enabled at once there.</trans>
+    </entry>
+    <entry>
+        <base>HTTPD</base>
+        <trans>httpd</trans>
+    </entry>
+    <entry>
+        <base>FTP_STATUS</base>
+        <trans>Status of proftpd jail.</trans>
+    </entry>
+    <entry>
+        <base>FTP</base>
+        <trans>proftpd</trans>
+    </entry>
+    <entry>
+        <base>LEMONLDAP_STATUS</base>
+        <trans>Status of LemonLDAP jail, if installed. Nothing is running if LemonLDAP is not installed or disabled.</trans>
+    </entry>
+    <entry>
+        <base>LEMONLDAP</base>
+        <trans>LemonLDAP</trans>
+    </entry>
+    <entry>
+        <base>EJABBERD_STATUS</base>
+        <trans>Status of ejabberd jail, if installed. Nothing is running if ejabberd is not installed or disabled.</trans>
+    </entry>
+    <entry>
+        <base>EJABBERD</base>
+        <trans>ejabberd</trans>
+    </entry>
+    <entry>
+        <base>SOGOD_STATUS</base>
+        <trans>Status of SOGO jail, if installed. Nothing is running if SOGO is not installed or disabled.</trans>
+    </entry>
+    <entry>
+        <base>SOGOD</base>
+        <trans>SOGO</trans>
+    </entry>
+    <entry>
+        <base>WORDPRESS_STATUS</base>
+        <trans>Status of wordpress jails. You need to activate it manually whether you have it in an ibay or use the contrib. Please also install the plugin in all your wordpress instances.</trans>
+    </entry>
+    <entry>
+        <base>WORDPRESS</base>
+        <trans>wordpress</trans>
+    </entry>
+    <entry>
+       <base>VALIDFROM_DESC</base>
+       <trans>
+           <![CDATA[ <hr class="sectionbar" /><h2>Allowed Hosts</h2>
+           <p>This is a list of hosts that will not be blocked by fail2ban.</p>
+           ]]>
+       </trans>
+    </entry>
+    <entry>
+       <base>NO_ENTRIES_YET</base>
+       <trans>No Entries Yet</trans>
+    </entry>
+    <entry>
+       <base>DESC_ADD_IP</base>
+       <trans>To add a new allowed network, enter the details below.</trans>
+    </entry>
+    <entry>
+        <base>ADD_IP</base>
+        <trans>Authorized network</trans>
+    </entry>
+    <entry>
+        <base>DESC_ADD_BITS</base>
+        <trans>To add a new allowed network, enter the associated subnet using bits eg 22, 25 or 32).</trans>
+    </entry>
+    <entry>
+        <base>ADD_BITS</base>
+        <trans>Authorized network subnet</trans>
+    </entry>
+    <entry>
+       <base>CURRENT_DENY_DESC</base>
+       <trans>
+           <![CDATA[ <h2>Blocked Hosts</h2>
+           <p>This is a list of hosts that are currently blocked.
+           ]]>
+       </trans>
+    </entry>
+    <entry>
+       <base>FIRST_SEEN</base>
+       <trans>Host first seen</trans>
+    </entry>
+    <entry>
+       <base>SUCCESS</base>
+       <trans>The new fail2ban settings have been saved.</trans>
+    </entry>
+    <entry>
+       <base>ERR_NO_RECORD</base>
+       <trans>Unable to locate fail2ban record in configuration db</trans>
+    </entry>
+    <entry>
+       <base>ERROR_STOPPING</base>
+       <trans>Error while trying to stop service</trans>
+    </entry>            
+    <entry>
+        <base>SUCCESS_IP</base>
+        <trans>The following IP has been unbanned</trans>
+    </entry>
+    <entry>
+        <base>SUCCESS_IP_WHITE</base>
+        <trans>The following IP has been unbanned and whitelisted</trans>
+    </entry>
+    <entry>
+        <base>ERROR_UPDATING</base>
+        <trans>Unable to unban</trans>
+    </entry>
+    <entry>
+        <base>ERROR_UPDATING_WHITE</base>
+        <trans>Unable to unban and whitelist</trans>
+    </entry>
+</lexicon>
diff -Nur smeserver-fail2ban-0.1.18.old/root/etc/e-smith/web/functions/fail2ban smeserver-fail2ban-0.1.18/root/etc/e-smith/web/functions/fail2ban
--- smeserver-fail2ban-0.1.18.old/root/etc/e-smith/web/functions/fail2ban       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-fail2ban-0.1.18/root/etc/e-smith/web/functions/fail2ban   2019-04-09 22:33:38.413000000 -0400
@@ -0,0 +1,143 @@
+#!/usr/bin/perl -wT
+# vim: ft=xml ts=8 sw=4 noet:
+#----------------------------------------------------------------------
+# heading     : Security
+# description : Fail2Ban
+# navigation  : 5000 5250
+#----------------------------------------------------------------------
+
+use strict;
+use esmith::FormMagick::Panel::fail2ban;
+my $f = esmith::FormMagick::Panel::fail2ban->new();
+$f->display();
+
+__DATA__
+<form title="Fail2Ban" header="/etc/e-smith/web/common/head.tmpl"
+    footer="/etc/e-smith/web/common/foot.tmpl">
+    <page name="First"  post-event="change_settings()"
+       pre-event="print_status_message()">
+
+       <field type="select" id="status"
+           options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+           value="get_prop('fail2ban', 'status')">
+           <label>STATUS</label>
+           <description>SERVICE_STATUS</description>
+       </field>
+        <field type="select" id="FilterLocalNetworks"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('fail2ban', 'FilterLocalNetworks')">
+            <label>FilterLocalNetworks</label>
+            <description>FilterLocalNetworks_STATUS</description>
+        </field>
+        <field type="select" id="FilterValidRemoteHosts"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('fail2ban', 'FilterValidRemoteHosts')">
+            <label>FilterValidRemoteHosts</label>
+            <description>FilterValidRemoteHosts_STATUS</description>
+        </field>
+
+        <field type="select" id="Mail"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('fail2ban', 'Mail')">
+            <label>MAIL</label>
+            <description>SEND_MAIL_STATUS</description>
+        </field>
+
+        <field type="text" id="BanTime" value="get_prop('fail2ban', 'BanTime')"
+            validation="">
+            <description>BANTIME</description>
+            <label>DEFAULT_BANTIME</label>
+        </field>
+
+        <field type="text" id="FindTime" value="get_prop('fail2ban', 'FindTime')"
+            validation="">
+            <description>FINDTIME</description>
+            <label>DEFAULT_FINDTIME</label>
+        </field>
+        <field type="text" id="MaxRetry" value="get_prop('fail2ban', 'MaxRetry')"
+            validation="">
+            <description>MAXRETRY</description>
+            <label>DEFAULT_MAXRETRY</label>
+        </field>
+
+        <field type="select" id="sshd"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('sshd', 'Fail2Ban')">
+            <label>SSHD</label>
+            <description>SSHD_STATUS</description>
+        </field>
+        <field type="select" id="qpsmtpd"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('qpsmtpd', 'Fail2Ban')">
+            <label>QPSMTPD</label>
+            <description>QPSMTPD_STATUS</description>
+        </field>        
+       <field type="select" id="dovecot"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('dovecot', 'Fail2Ban')">
+            <label>IMAP</label>
+            <description>IMAP_STATUS</description>
+        </field>
+        <field type="select" id="httpd-e-smith"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('httpd-e-smith', 'Fail2Ban')">
+            <label>HTTPD</label>
+            <description>HTTPD_STATUS</description>
+        </field>
+        <field type="select" id="ftp"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('ftp', 'Fail2Ban')">
+            <label>FTP</label>
+            <description>FTP_STATUS</description>
+        </field>
+        <field type="select" id="lemonldap"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('lemonldap', 'Fail2Ban')">
+            <label>LEMONLDAP</label>
+            <description>LEMONLDAP_STATUS</description>
+        </field>
+        <field type="select" id="ejabberd"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('ejabberd', 'Fail2Ban')">
+            <label>EJABBERD</label>
+            <description>EJABBERD_STATUS</description>
+        </field>
+        <field type="select" id="sogod"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('sogod', 'Fail2Ban')">
+            <label>SOGOD</label>
+            <description>SOGOD_STATUS</description>
+        </field>
+        <field type="select" id="wordpress"
+            options=" 'enabled' => 'ENABLED', 'disabled' => 'DISABLED'"
+            value="get_prop('fail2ban', 'wordpress')">
+            <label>WORDPRESS</label>
+            <description>WORDPRESS_STATUS</description>
+        </field>
+
+
+
+       <subroutine src="show_valid_from_list()"/>
+       <field type="text" id="ip" value=""
+           validation="ip_number_or_blank">
+           <description>DESC_ADD_IP</description>
+           <label>ADD_IP</label>
+       </field>
+        <field type="text" id="bits" value=""
+            validation="subnet_mask_bit, validate_network_and_mask">
+            <description>DESC_ADD_BITS</description>
+            <label>ADD_BITS</label>
+        </field>
+
+
+       <subroutine src="print_button('SAVE')" />
+
+       <subroutine src="show_current_deny()"/>
+    </page>
+    <page name="Second"  
+        pre-event="RemoveIP()">
+       <subroutine src="print_status_message()" />
+       <subroutine src="back()" />
+    </page>
+</form>
+
diff -Nur smeserver-fail2ban-0.1.18.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm smeserver-fail2ban-0.1.18/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm
--- smeserver-fail2ban-0.1.18.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-fail2ban-0.1.18/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm      2019-04-09 22:35:27.295000000 -0400
@@ -0,0 +1,419 @@
+#!/usr/bin/perl -w
+
+package    esmith::FormMagick::Panel::fail2ban;
+
+use strict;
+use esmith::ConfigDB;
+use esmith::FormMagick;
+use esmith::util;
+use esmith::cgi;
+use File::Basename;
+use Exporter;
+use Carp;
+use Data::Validate::IP;
+
+our @ISA = qw(esmith::FormMagick Exporter);
+
+our @EXPORT = qw(get_value get_prop change_settings RemoveIP);
+
+our $VERSION = sprintf '%d.%03d', q$Revision: 1.00 $ =~ /: (\d+).(\d+)/;
+our $db = esmith::ConfigDB->open
+    || warn "Couldn't open configuration database (permissions problems?)";
+my $scriptname = basename($0);
+
+#TODO 
+#- translation
+#- userpanel without settings
+
+my %defaultval=('FilterLocalNetworks'=> "enabled",
+       'FilterValidRemoteHosts'=> "enabled",
+       "Mail" => "enabled",
+        "BanTime" => '1800',
+        "FindTime" => '900',
+        "MaxRetry" =>  '3',
+        "sshd" => 'enabled',
+        "qpsmtpd" => 'enabled',
+        "dovecot" => 'enabled',
+       "httpd-e-smith" => 'enabled',
+        "ftp" => 'enabled',
+       "lemonldap" => 'enabled',
+        "ejabberd"  => 'enabled',
+        "sogod"  => 'enabled',
+        "wordpress" => 'disabled',
+         
+ ) ;
+
+sub new {
+    shift;
+    my $self = esmith::FormMagick->new();
+    $self->{calling_package} = (caller)[0];
+    bless $self;
+    return $self;
+}
+
+sub get_prop
+{
+    my $fm   = shift;
+    my $item = shift;
+    my $prop = shift;
+    my $value = $db->get_prop($item, $prop) || '';
+    if ( $value eq "" && exists($defaultval{$prop})  && $item eq "fail2ban")
+       {
+               $value=$defaultval{$prop};
+       }
+    elsif ( $value eq "" && exists($defaultval{$item}) && $prop eq "Fail2Ban" && $item ne "fail2ban" )
+        {
+                $value=$defaultval{$item};
+        }
+    return $value;
+}
+
+sub get_value {
+    my $fm = shift;
+    my $item = shift;
+    return ($db->get($item)->value());
+}
+
+sub ip_number_or_blank
+{
+    my $self = shift;
+    my $ip = shift;
+
+    if (!defined($ip) || $ip eq "")
+    {
+        return 'OK';
+    }
+    return CGI::FormMagick::Validator::ip_number($self, $ip);
+}
+
+sub subnet_mask_bit 
+{
+    my ($self, $mask) = @_;
+    my @allowed = (8,9,12,14,16,17,20,22,24,25,28,30,32);
+#    if ($self->ip_number_or_blank($mask) eq 'OK')
+    if ( !defined($mask) || $mask eq "" || grep( /^$mask$/, @allowed ) )
+    {
+        return "OK";
+    }
+    return "INVALID_SUBNET_MASK";
+}
+
+sub validate_network_and_mask
+{
+  my $self = shift;
+  my $mask = shift || "";
+
+  my $net = $self->cgi->param('ip') || "";
+  if ($net xor $mask)
+  {
+    return $self->localise('ERR_INVALID_PARAMS');
+  }
+  return 'OK';
+}
+
+
+
+sub _get_valid_from
+{
+    my $self = shift;
+
+    my $rec = $db->get('fail2ban');
+    return undef unless($rec);
+    my @vals = (split ',', ($rec->prop('IgnoreIP') || ''));
+    return @vals;
+}
+
+sub ip_sort(@)
+{
+    return esmith::util::IPquadToAddr($a) <=> esmith::util::IPquadToAddr($b);
+}
+
+sub show_valid_from_list
+{
+    my $self = shift;
+    my $q = $self->{cgi};
+
+    print '<tr><td colspan=2>',$q->p($self->localise('VALIDFROM_DESC')),'</td></tr>';
+
+    my @vals = $self->_get_valid_from();
+    if (@vals)
+    {
+        print '<tr><td colspan=2>',
+              $q->start_table({class => "sme-border"}),"\n";
+        print $q->Tr(
+                esmith::cgi::genSmallCell($q, $self->localise('NETWORK'),"header"),
+                esmith::cgi::genSmallCell($q, $self->localise('REMOVE'),"header"));
+       my @vals_sorted= sort ip_sort @vals;
+        my @cbGroup = $q->checkbox_group(-name => 'validFromRemove',
+                -values => [@vals_sorted], -labels => { map {$_ => ''} @vals_sorted });
+        foreach my $val (@vals_sorted)
+        {
+            print $q->Tr(
+                    esmith::cgi::genSmallCell($q, $val, "normal"),
+                    esmith::cgi::genSmallCell($q, shift(@cbGroup),
+                        "normal"));
+        }
+        print '</table></td></tr>';
+    }
+    else
+    {
+        print $q->Tr($q->td($q->b($self->localise('NO_ENTRIES_YET'))));
+    }
+    return '';
+}
+
+sub show_current_deny
+{
+    my $self = shift;
+    my $q = $self->{cgi};
+
+    print '<tr><td colspan=2>',$q->p($self->localise('CURRENT_DENY_DESC')),'</td></tr>';
+
+    my %vals = ();
+    if (open(DENY, "/etc/hosts.deny_ssh") ) {
+        %vals = map { m{DenyHosts: (.*) \| (.*)$}; $2 => $1; } grep /DenyHosts:/, <DENY>;
+        close DENY;
+    }
+    my @strvals = `/usr/bin/sfail2ban`;
+    
+    if (%vals)
+    {
+        print '<tr><td colspan=2>',
+              $q->start_table({class => "sme-border"}),"\n";
+        print $q->Tr(
+                esmith::cgi::genSmallCell($q, $self->localise('IP_ADDRESS'),"header"),
+                esmith::cgi::genSmallCell($q, $self->localise('JAIL'),"header"),
+               esmith::cgi::genSmallCell($q, $self->localise('ACTION'),"header"));
+       foreach my $sval (@strvals)
+       {
+           my @ssval= split(':',$sval);
+           my $curjail=$ssval[0];
+           my @ssvalip = split(' ',$ssval[1]);
+           foreach my $sssval (@ssvalip)
+           {
+           my $ip=$sssval;
+            my $action3 ="<a href=\"$scriptname?page=0&page_stack=&Next=Next&action=RemoveIP&IP=$ip&jail=$curjail&wherenext=Second\">".$self->localise('REMOVE')."</a>" .
+                          " <a href=\"$scriptname?page=0&page_stack=&Next=Next&action=RemoveIP&IP=$ip&jail=$curjail&wherenext=Second&Whitelist=true\">".$self->localise('WHITELIST')."</a>" ;
+ 
+               print $q->Tr(
+                    esmith::cgi::genSmallCell($q, $ip, "normal"),
+                    esmith::cgi::genSmallCell($q, $curjail, "normal"),
+                    esmith::cgi::genSmallCell($q, $action3, "normal"));
+           }
+
+
+       }
+        print '</table></td></tr>';
+    }
+    else
+    {
+        print $q->Tr($q->td($q->b($self->localise('NO_ENTRIES_YET'))));
+    }
+    return '';
+}
+
+sub add_new_valid_from
+{
+    my $self = shift;
+    my $q = $self->{cgi};
+
+    my $ip = $q->param('ip');
+    my $bits = $q->param('bits');
+    # do nothing if no ip was added
+    return 1 unless ($ip);
+
+    my $rec = $db->get('fail2ban');
+    unless ($rec)
+    {
+        return $self->error('ERR_NO_RECORD');
+    }
+
+    my $prop = $rec->prop('IgnoreIP') || '';
+
+    my @vals = split /,/, $prop;
+    return '' if (grep /^$ip\/$bits$/, @vals); # already have this entry
+
+        if ($prop ne '')
+        {
+            $prop .= ",$ip/$bits";
+        }
+        else
+        {
+            $prop = "$ip/$bits";
+        }
+    $rec->set_prop('IgnoreIP', $prop);
+    $q->delete('ip');
+    $q->delete('bits');
+    return 1;
+}
+
+sub remove_valid_from
+{
+    my $self = shift;
+    my $q = $self->{cgi};
+
+    my @remove = $q->param('validFromRemove');
+    my @vals = $self->_get_valid_from();
+
+    foreach my $entry (@remove)
+    {
+        return undef unless $entry;
+
+        unless (@vals)
+        {
+            print STDERR "ERROR: unable to load IgnoreIP property from conf db\n";
+            return undef;
+        }
+
+        @vals = (grep { $entry ne $_ } @vals);
+    }
+
+    my $prop;
+    if (@vals)
+    {
+        $prop = join ',',@vals;
+    }
+    else
+    {
+        $prop = '';
+    }
+    $db->get('fail2ban')->set_prop('IgnoreIP', $prop);
+    $q->delete('validFromRemove');
+
+    return 1;
+}
+
+sub change_settings {
+    my ($fm) = @_;
+    my $q = $fm->{'cgi'};
+
+    my %conf;
+
+    # Don't process the form unless we clicked the Save button. The event is
+    # called even if we chose the Remove link or the Add link.
+    return unless($q->param('Next') eq $fm->localise('SAVE'));
+
+    my $ip = ($q->param ('ip') || '');
+    my $status = ($q->param ('status') || 'status');
+    my $FilterLocalNetworks = ($q->param ('FilterLocalNetworks') || "enabled");
+    my $FilterValidRemoteHosts= ($q->param ('FilterValidRemoteHosts') || "enabled");
+    my $Mail= ($q->param ("Mail") || "enabled");
+    my $BanTime= ($q->param ("BanTime") || '1800');
+    my $FindTime= ($q->param ("FindTime") || '900');
+    my $MaxRetry= ($q->param ("MaxRetry") ||  '3');
+    # those are stored in a different key dedicated to the service
+    my %services;
+    $services{'sshd'}= ($q->param ("sshd") ||'enabled');
+    $services{'qpsmtp'}= ($q->param ("qpsmtpd") ||'enabled');
+    $services{'dovecot'}= ($q->param ("dovecot") ||'enabled');
+    $services{'httpd-e-smith'}= ($q->param ("httpd-e-smith") ||'enabled');
+    $services{'ftp'}= ($q->param ("ftp") ||'enabled');
+    $services{'lemonldap'}= ($q->param ("lemonldap") ||'enabled');
+    $services{'ejabberd'}= ($q->param ("ejabberd" ) ||'enabled');
+    $services{'sogod'}= ($q->param ("sogod" ) ||'enabled');
+    $services{'wordpress'}= ($q->param ("wordpress") ||'enabled');
+
+
+    #------------------------------------------------------------
+    # Looks good; go ahead and change the access.
+    #------------------------------------------------------------
+
+    my $rec = $db->get('fail2ban');
+    if ($rec)
+    {
+       $rec->set_prop('status', $status);
+       # unless prop empty and value eq default
+       $rec->set_prop('FilterLocalNetworks', $FilterLocalNetworks) unless ( ! $db->get_prop('fail2ban','FilterLocalNetworks') && $FilterLocalNetworks eq $defaultval{'FilterLocalNetworks'}  );
+       $rec->set_prop('FilterValidRemoteHosts', $FilterValidRemoteHosts) unless ( ! $db->get_prop('fail2ban','FilterValidRemoteHosts') && $FilterValidRemoteHosts  eq $defaultval{'FilterValidRemoteHosts'}  );
+       $rec->set_prop('Mail', $Mail) unless ( ! $db->get_prop('fail2ban','Mail') && $Mail eq $defaultval{'Mail'}  );
+       $rec->set_prop('BanTime', $BanTime) unless ( ! $db->get_prop('fail2ban','BanTime') && $BanTime eq $defaultval{'BanTime'}  );
+        $rec->set_prop('FindTime', $FindTime) unless ( ! $db->get_prop('fail2ban','FindTime') && $FindTime eq $defaultval{'FindTime'}  );
+        $rec->set_prop('MaxRetry', $MaxRetry) unless ( ! $db->get_prop('fail2ban','MaxRetry') && $MaxRetry eq $defaultval{'MaxRetry'}  );
+    }
+    # for the 9 services update unless key does not exist and property does not exist and value eq default
+       foreach my $key (keys %services)
+    {
+       $rec = $db->get($key);
+       my $getprop = $db->get_prop($key,'Fail2Ban') || "";
+       $rec->set_prop('Fail2Ban', $services{$key}  ) unless ( ! $rec || (! $db->get_prop($key,'Fail2Ban') && $services{$key} eq $defaultval{$key} )  );   
+    }
+# this seems to prevent reload of service if we update something and remove or add an ip...
+#    return '' unless $fm->add_new_valid_from;
+#    return '' unless $fm->remove_valid_from;
+    
+    unless ( system( "/sbin/e-smith/signal-event", "fail2ban-update" ) == 0 )
+    {
+       $fm->error('ERROR_UPDATING');
+       return undef;
+    }
+       
+    if ( $rec->prop('status') eq 'disabled' )
+    {
+        unless ( `/etc/init.d/fail2ban stop`  )
+        {
+            $fm->error('ERROR_STOPPING');
+            return undef;
+        }
+    }
+    
+    $fm->success('SUCCESS');
+}
+
+# validate subnet
+
+
+
+# RemoveIP after validation
+sub RemoveIP {
+    my $fm = shift;
+    my $q = $fm->{'cgi'};
+    my %conf;
+    my $ip = ($q->param('IP') || ''); 
+    my $whitelist = ($q->param('Whitelist'))? "true" : '';
+    #check ip
+    my $validator=Data::Validate::IP->new;
+
+    unless ($validator->is_ipv4($ip))
+       {
+          $fm->error('ERROR_STOPPING');
+          return undef;
+       }
+    $ip = $validator->is_ipv4($ip);
+    # validate and untaint jail
+    my $jail = ($q->param('jail') || '');
+    # could be [a-zA-Z0-9_\-]
+    $jail = $jail =~ /([a-zA-Z0-9_\-]+)/ ? $1 : undef; 
+       $fm->error('ERROR_UPDATING') unless $jail;
+       return undef unless $jail;
+    unless ( system( "/usr/bin/fail2ban-client set $jail unbanip  $ip ".' >/dev/null 2>&1'  ) == 0 )
+       {
+           $fm->error('ERROR_UPDATING');
+           return undef;
+       }
+    if ($whitelist ne "" ) {
+       # add $ip to whitelist for the current $jail
+       warn "/sbin/e-smith/db configuration setprop fail2ban IgnoreIP  `/sbin/e-smith/db configuration getprop fail2ban IgnoreIP`,$ip/32";
+       unless ( system( "/sbin/e-smith/db configuration setprop fail2ban  IgnoreIP  `/sbin/e-smith/db configuration getprop fail2ban IgnoreIP`,$ip/32 ".' >/dev/null 2>&1'  ) == 0 
+       && system( "/usr/bin/fail2ban-client reload ".' >/dev/null 2>&1'  ) == 0 
+       )
+        {
+           $fm->error('ERROR_UPDATING_WHITE');
+           return undef;
+        }
+       
+       $fm->success($fm->localise('SUCCESS_IP_WHITE').": $ip",'First');
+    }
+    else
+    {
+        $fm->success($fm->localise('SUCCESS_IP').": $ip",'First');
+    }
+}
+
+sub back {
+    my $fm = shift;
+    my $q = $fm->{'cgi'};
+    print "<a href='$scriptname'>".$fm->localise('Back')."</a>";
+return;
+}
+
+1;
diff -Nur smeserver-fail2ban-0.1.18.old/usr/bin/sfail2ban smeserver-fail2ban-0.1.18/usr/bin/sfail2ban
--- smeserver-fail2ban-0.1.18.old/usr/bin/sfail2ban     1969-12-31 19:00:00.000000000 -0500
+++ smeserver-fail2ban-0.1.18/usr/bin/sfail2ban 2019-04-09 22:34:41.216000000 -0400
@@ -0,0 +1,6 @@
+#!/bin/bash
+for SERVI in $(fail2ban-client status|grep 'Jail list'|cut -d':' -f2|sed 's/, / /g'| sed -e 's/^[ \t]*//')
+do
+fail2ban-client status $SERVI |grep -E 'IP list|Status for the jail' |sed 'N;s/\n/:/'|cut -d: -f2,4
+done
+