smecontribs/smeserver-fail2ban
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sun Oct 05 2025 Brian Read <brianr@koozali.org> 0.1.18-41.sme

Browse Source 
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
This commit is contained in:
Brian Read
2025-10-06 08:13:54 +01:00
parent cfbbb61a94
commit c3c7c72640
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
root/usr/share/smanager/lib/SrvMngr/Controller/Fail2ban.pm
View File

@@ -26,7 +26,7 @@ use Data::Validate::IP;
use SrvMngr qw( theme_list init_session ip_number );
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n";
my $cdb;
my %defaultval=('FilterLocalNetworks'=> "enabled",
'FilterValidRemoteHosts'=> "enabled",
@@ -51,6 +51,7 @@ sub main {
my $c = shift;
$c->app->log->info($c->log_req);
$cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my %f2b_datas = ();
my $title = $c->l('f2b_FORM_TITLE');
@@ -83,6 +84,7 @@ sub do_action {
my $c = shift;
$c->app->log->info($c->log_req);
$cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $rt = $c->current_route;
@@ -138,6 +140,7 @@ sub do_action_get {
my $c = shift;
$c->app->log->info($c->log_req);
$cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my ($res, $result) = '';
@@ -195,6 +198,7 @@ sub do_changes {
my $c = shift;
my %conf;
$cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
# 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.
@@ -272,6 +276,7 @@ sub do_changes {
return $c->l('f2b_ERROR_UPDATING');
}
$cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
if ( $rec->prop('status') eq 'disabled' ) {
unless ( `/etc/init.d/fail2ban stop` ) {
return $c->l('f2b_ERROR_STOPPING');
@@ -427,7 +432,7 @@ sub get_valid_from {
my $rec = $cdb->get('fail2ban');
if ( $rec ) {
my @vals = (split ',', $rec->prop('IgnoreIP'));
my @vals = (split ',', $rec->prop('IgnoreIP') // '');
@vals_sorted = sort ip_sort @vals if @vals;
# @vals_sorted = @vals;
}
@@ -451,5 +456,4 @@ sub ip_sort(@) {
}
1;
1;

5
smeserver-fail2ban.spec
View File

@@ -1,5 +1,5 @@
%define version 0.1.18
%define release 40
%define release 41
%define name smeserver-fail2ban
Summary: fail2ban integration on SME Server
@@ -25,6 +25,9 @@ AutoReqProv: no
Configure fail2ban on SME Server
%changelog
* Sun Oct 05 2025 Brian Read <brianr@koozali.org> 0.1.18-41.sme
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
* Sat Oct 04 2025 Brian Read <brianr@koozali.org> 0.1.18-40.sme
- Remove smanager-refresh from spec file [SME: 13212]