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

Fix for XT_geoip

Browse Source
This commit is contained in:
John Crisp
2025-10-22 11:57:56 +02:00
parent 8253bc0805
commit 3caa8642cb
15 changed files with 220 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
createlinks
View File

@@ -7,7 +7,7 @@ use esmith::Build::CreateLinks qw(:all);
#-------------------------------------------------- #--------------------------------------------------
# links to add # links to add
panel_link("xt_geoip","manager"); panel_link("xtgeoip","manager");
# templates to expand # templates to expand
for my $event (qw(xt_geoip-modify xt_geoip-update xt_geoip-service for my $event (qw(xt_geoip-modify xt_geoip-update xt_geoip-service

10
root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustXt_Geoip
View File

@@ -61,6 +61,16 @@ EOF
} }
} }
# [SME: 12445] do not block Remote authorized access
# TO DO : allow pin point per service eg this UK ip/network even if UK is filtered
(($masq{XTAcceptValidRemoteHosts} || 'enabled') eq 'enabled'){
foreach (split /[,;]/, (${'httpd-admin'}{'ValidFrom'} || '')){
my ($ip,$bits) = Net::IPv4Addr::ipv4_parse("$_");
$OUT .= " /sbin/iptables -A \$NEW_XTGeoIP -s $ip/$bits -j RETURN\n" unless "$ip" eq '0.0.0.0';
}
}
my @services = split(/,/, $masq{'XtServices'}); my @services = split(/,/, $masq{'XtServices'});
foreach my $servName (@services) foreach my $servName (@services)

316
root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm
View File

@@ -4,7 +4,7 @@
# Copyright (c) Michel Begue 2017 # Copyright (c) Michel Begue 2017
# Xt_GeoIP Administration panel # Xt_GeoIP Administration panel
#------------------------------------------- #-------------------------------------------
package esmith::FormMagick::Panel::xt_geoip; package esmith::FormMagick::Panel::xt_geoip;
use strict; use strict;
#use warnings; #use warnings;
@@ -95,8 +95,8 @@ sub new
my $self = esmith::FormMagick->new(); my $self = esmith::FormMagick->new();
$self->{calling_package} = (caller)[0]; $self->{calling_package} = (caller)[0];
bless $self; bless $self;
# $self->debug(1); # $self->debug(1);
return $self; return $self;
} }
=head2 get_prop =head2 get_prop
@@ -105,17 +105,17 @@ sub new
sub get_prop sub get_prop
{ {
my $fm = shift if (ref($_[0]) ); my $fm = shift if (ref($_[0]) );
my $item = shift; my $item = shift;
my $prop = shift; my $prop = shift;
my $record = $db->get($item); my $record = $db->get($item);
if ($record) { if ($record) {
return $record->prop($prop); return $record->prop($prop);
} }
else { else {
return ''; return '';
} }
} }
=head2 get_value =head2 get_value
@@ -124,16 +124,16 @@ sub get_prop
sub get_value sub get_value
{ {
my $fm = shift; my $fm = shift;
my $item = shift; my $item = shift;
my $record = $db->get($item); my $record = $db->get($item);
#return ($db->get("masq")->prop($item)); #return ($db->get("masq")->prop($item));
if ($record) { if ($record) {
return $record->value(); return $record->value();
} }
else { else {
return ''; return '';
} }
} }
=head2 get_badcountries =head2 get_badcountries
@@ -171,7 +171,7 @@ sub get_reverse
my $fm = shift; my $fm = shift;
my $item = shift; my $item = shift;
my $prop = shift; my $prop = shift;
$item = ($item eq 'masq') ? $item : $fm->cgi->param('name'); $item = ($item eq 'masq') ? $item : $fm->cgi->param('name');
return $db->get_prop("$item", "$prop") || "disabled"; return $db->get_prop("$item", "$prop") || "disabled";
} }
@@ -183,16 +183,16 @@ method to retrieve the status of geoip (module and filtering) for the form
sub get_stat_geoip sub get_stat_geoip
{ {
my $fm = shift; my $fm = shift;
if ( system ( "/bin/test -f /lib/modules/`/bin/uname -r`/weak-updates/xtables-addons/xt_geoip.ko") != 0 ) { if ( system ( "/bin/test -f /lib/modules/`/bin/uname -r`/weak-updates/xtables-addons/xt_geoip.ko") != 0 ) {
return $fm->localise('ERROR_MISSING_MODULE'); return $fm->localise('ERROR_MISSING_MODULE');
} elsif ( system ( "/sbin/lsmod | grep 'xt_geoip' > /dev/null") != 0 ) { } elsif ( system ( "/sbin/lsmod | grep 'xt_geoip' > /dev/null") != 0 ) {
return $fm->localise('ERROR_UNLOADED_MODULE'); return $fm->localise('ERROR_UNLOADED_MODULE');
} elsif ( get_geoip() eq 'enabled' && system ( "/sbin/iptables -L -n | grep 'XTGeoIP' > /dev/null") != 0 ) { } elsif ( get_geoip() eq 'enabled' && system ( "/sbin/iptables -L -n | grep 'XTGeoIP' > /dev/null") != 0 ) {
return $fm->localise('ERROR_FILTER_CHAIN_MISSING'); return $fm->localise('ERROR_FILTER_CHAIN_MISSING');
} else { } else {
return ''; return '';
} }
} }
@@ -205,9 +205,9 @@ sub get_stat_license_key {
my $fm = shift; my $fm = shift;
if ((get_prop( 'geoip','status' ) || 'disabled') eq 'enabled' ) { if ((get_prop( 'geoip','status' ) || 'disabled') eq 'enabled' ) {
if ( (get_prop( 'geoip','LicenseKey' ) || '') ne '' ) { if ( (get_prop( 'geoip','LicenseKey' ) || '') ne '' ) {
return ''; return '';
} }
} }
return $fm->localise('ERROR_LICENSE_KEY'); return $fm->localise('ERROR_LICENSE_KEY');
@@ -231,38 +231,38 @@ Sub to change settings as per user input in the panel
sub change_settings sub change_settings
{ {
my $self = shift; my $self = shift;
my $q = $self->{'cgi'}; my $q = $self->{'cgi'};
my $mq_bc = get_badcountries(); my $mq_bc = get_badcountries();
my $mq_gp = get_geoip(); my $mq_gp = get_geoip();
my $masq = $db->get('masq') || "disabled"; my $masq = $db->get('masq') || "disabled";
my $mq_rv = $masq->prop('XTGeoipRev') || 'disabled'; my $mq_rv = $masq->prop('XTGeoipRev') || 'disabled';
my $mq_ot = $masq->prop('XTGeoipOther') || 'disabled'; my $mq_ot = $masq->prop('XTGeoipOther') || 'disabled';
my $n_mq_bc = $q->param("masq_badcountries"); my $n_mq_bc = $q->param("masq_badcountries");
my $n_mq_gp = $q->param("masq_geoip") || $mq_gp; my $n_mq_gp = $q->param("masq_geoip") || $mq_gp;
my $n_upd_gp = $q->param("update_geoip") || ''; my $n_upd_gp = $q->param("update_geoip") || '';
my $n_mq_rv = $q->param("masq_reverse") || $mq_rv ; my $n_mq_rv = $q->param("masq_reverse") || $mq_rv ;
my $n_mq_ot = $q->param("masq_others") || $mq_ot ; my $n_mq_ot = $q->param("masq_others") || $mq_ot ;
if (($n_mq_bc eq $mq_bc) && ($n_mq_gp eq $mq_gp) && ($n_upd_gp eq 'NO') && ($n_mq_rv eq $mq_rv) && ($n_mq_ot eq $mq_ot)) { if (($n_mq_bc eq $mq_bc) && ($n_mq_gp eq $mq_gp) && ($n_upd_gp eq 'NO') && ($n_mq_rv eq $mq_rv) && ($n_mq_ot eq $mq_ot)) {
return $self->success("NO_CHANGE") return $self->success("NO_CHANGE")
} }
$db->set_prop("masq", "BadCountries", $n_mq_bc); $db->set_prop("masq", "BadCountries", $n_mq_bc);
$db->set_prop("masq", "GeoIP", $n_mq_gp); $db->set_prop("masq", "GeoIP", $n_mq_gp);
$db->set_prop("masq", "XTGeoipRev", $n_mq_rv); $db->set_prop("masq", "XTGeoipRev", $n_mq_rv);
$db->set_prop("masq", "XTGeoipOther", $n_mq_ot); $db->set_prop("masq", "XTGeoipOther", $n_mq_ot);
my $eventloc = "xt_geoip-modify"; my $eventloc = "xt_geoip-modify";
$eventloc = "xt_geoip-update" if $n_upd_gp eq 'YES'; $eventloc = "xt_geoip-update" if $n_upd_gp eq 'YES';
unless ( system ( "/sbin/e-smith/signal-event", $eventloc ) == 0 ) unless ( system ( "/sbin/e-smith/signal-event", $eventloc ) == 0 )
{ {
$self->error("ERROR_UPDATING"); $self->error("ERROR_UPDATING");
return undef; return undef;
} }
return $self->success("SUCCESS"); return $self->success("SUCCESS");
} }
@@ -278,14 +278,14 @@ sub must_exist
my $listerr = ""; my $listerr = "";
my @mq_bcs = split /[,:]/, $q->param("masq_badcountries"); my @mq_bcs = split /[,:]/, $q->param("masq_badcountries");
if (@mq_bcs) { if (@mq_bcs) {
my $ctr = @mq_bcs; my $ctr = @mq_bcs;
return $self->localise('ERROR_COUNTRY_MAX: {$ctr}', {ctr=> "$ctr"}) if ($ctr > 50); return $self->localise('ERROR_COUNTRY_MAX: {$ctr}', {ctr=> "$ctr"}) if ($ctr > 50);
foreach my $bcs (@mq_bcs) { foreach my $bcs (@mq_bcs) {
my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4"; my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4";
if (! -f $file) { $listerr .= $bcs . ","; } if (! -f $file) { $listerr .= $bcs . ","; }
} }
return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr; return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr;
} }
return 'OK'; return 'OK';
} }
@@ -305,41 +305,41 @@ sub print_custom_button
#Subroutine to list statistics #Subroutine to list statistics
sub generateStats sub generateStats
{ {
my $self = shift; my $self = shift;
my $q = $self->{cgi}; my $q = $self->{cgi};
$self->turn_off_buttons(); $self->turn_off_buttons();
# Untaint $name before use in system() # Untaint $name before use in system()
my $stats_type = $q->param ('type'); my $stats_type = $q->param ('type');
$stats_type =~ /(.+)/; $stats_type = $1; $stats_type =~ /(.+)/; $stats_type = $1;
if ($stats_type ne "ipt" && $stats_type ne "ssh" && $stats_type ne "f2b") if ($stats_type ne "ipt" && $stats_type ne "ssh" && $stats_type ne "f2b")
{ {
print $q->p($q->b($self->localise('INVALID_STATS_TYPE')." ". print $q->p($q->b($self->localise('INVALID_STATS_TYPE')." ".
$stats_type)); $stats_type));
return ''; return '';
} else { } else {
# my $now_string = $self->gen_locale_date_string(); # my $now_string = $self->gen_locale_date_string();
my $file = "/var/lib/xt_geoip/extA_" . $stats_type . "_country.lst"; my $file = "/var/lib/xt_geoip/extA_" . $stats_type . "_country.lst";
my $filetime = ( -e $file ) ? (stat($file))[9] : 0; my $filetime = ( -e $file ) ? (stat($file))[9] : 0;
my $date_string = strftime("%Y/%m/%d %H:%M", localtime( $filetime )) || ''; my $date_string = strftime("%Y/%m/%d %H:%M", localtime( $filetime )) || '';
print $q->h3($self->localise('STATS_GENERATED'), "[", $stats_type, "]", $date_string); print $q->h3($self->localise('STATS_GENERATED'), "[", $stats_type, "]", $date_string);
open( XTGEOIPSTATS, $file ); open( XTGEOIPSTATS, $file );
print "<pre>\n"; print "<pre>\n";
while (<XTGEOIPSTATS>) while (<XTGEOIPSTATS>)
{ {
print; print;
} }
close XTGEOIPSTATS; close XTGEOIPSTATS;
print "</pre>\n"; print "</pre>\n";
print $q->h3($self->localise('END_OF_STATS')); print $q->h3($self->localise('END_OF_STATS'));
#$self->wherenext('First'); #$self->wherenext('First');
return ''; return '';
} }
} }
sub get_srv_name sub get_srv_name
@@ -363,10 +363,10 @@ sub print_service_table {
my $self = shift; my $self = shift;
my $q = $self->{cgi}; my $q = $self->{cgi};
my $servname = $self->localise('NAME'); my $servname = $self->localise('NAME');
my $port = $self->localise('PORT'); my $port = $self->localise('PORT');
my $status = $self->localise('STATUS'); my $status = $self->localise('STATUS');
my $access = $self->localise('ACCESS'); my $access = $self->localise('ACCESS');
my $servBC = $self->localise('BADCOUNTRIES'); my $servBC = $self->localise('BADCOUNTRIES');
my $modify = $self->localise('MODIFY'); my $modify = $self->localise('MODIFY');
my $remove = $self->localise('REMOVE'); my $remove = $self->localise('REMOVE');
my $action_h = $self->localise('ACTION'); my $action_h = $self->localise('ACTION');
@@ -393,30 +393,30 @@ sub print_service_table {
foreach my $servname (@services) foreach my $servname (@services)
{ {
my $i = $db->get($servname); my $i = $db->get($servname);
next if not defined $i; next if not defined $i;
my $port = $i->prop('TCPPort'); my $port = $i->prop('TCPPort');
my $status = $i->prop('status'); my $status = $i->prop('status');
my $access = $i->prop('access'); my $access = $i->prop('access');
my $servBC = $i->prop('BadCountries') || ' '; my $servBC = $i->prop('BadCountries') || ' ';
my $servRev = (( $i->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!='; my $servRev = (( $i->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!=';
my $params = $self->build_serv_cgi_params($servname, $i->props()); my $params = $self->build_serv_cgi_params($servname, $i->props());
my $href = "$scriptname?$params&action=modify&wherenext="; my $href = "$scriptname?$params&action=modify&wherenext=";
my $actionModify = '&nbsp;'; my $actionModify = '&nbsp;';
$actionModify .= $q->a({href => "${href}SrvModify"},$modify) $actionModify .= $q->a({href => "${href}SrvModify"},$modify)
. '&nbsp;'; . '&nbsp;';
my $actionRemove = '&nbsp;'; my $actionRemove = '&nbsp;';
$actionRemove .= $q->a({href => "${href}SrvRemove"}, $remove) $actionRemove .= $q->a({href => "${href}SrvRemove"}, $remove)
. '&nbsp'; . '&nbsp';
my $color = 'red'; my $color = 'red';
my $deco= "none"; my $deco= "none";
if ($servRev eq '!=' ) { $color = 'green'; } if ($servRev eq '!=' ) { $color = 'green'; }
if ($status eq 'disabled' || $access ne 'public') { $color = 'grey'; $deco= "line-through"; } if ($status eq 'disabled' || $access ne 'public') { $color = 'grey'; $deco= "line-through"; }
print $q->Tr ( print $q->Tr (
esmith::cgi::genSmallCell($q, $servname,"normal"), esmith::cgi::genSmallCell($q, $servname,"normal"),
@@ -449,9 +449,9 @@ sub remove_serv {
my ($self) = @_; my ($self) = @_;
my $name = $self->cgi->param('name'); my $name = $self->cgi->param('name');
if (my $serv = $db->get($name)) { if (my $serv = $db->get($name)) {
my $servBC = $serv->prop('BadCountries') || ''; my $servBC = $serv->prop('BadCountries') || '';
if ($servBC ne '') { if ($servBC ne '') {
my $tps = $db->set_prop_and_delete($name, "BadCountries"); my $tps = $db->set_prop_and_delete($name, "BadCountries");
$tps = $db->get_prop_and_delete($name, "XTGeoipRev"); $tps = $db->get_prop_and_delete($name, "XTGeoipRev");
# Untaint $name before use in system() # Untaint $name before use in system()
# $name =~ /(.+)/; $name = $1; # $name =~ /(.+)/; $name = $1;
@@ -475,24 +475,24 @@ sub modify_serv {
my ($self) = @_; my ($self) = @_;
my $name = $self->cgi->param('name'); my $name = $self->cgi->param('name');
if (my $serv = $db->get($name)) { if (my $serv = $db->get($name)) {
my $servBC = $serv->prop('BadCountries') || ''; my $servBC = $serv->prop('BadCountries') || '';
my $servRev = $serv->prop('XTGeoipRev') || 'disabled'; my $servRev = $serv->prop('XTGeoipRev') || 'disabled';
my $q = $self->{'cgi'}; my $q = $self->{'cgi'};
my $n_servBC = $q->param("masq_srv_badcountries"); my $n_servBC = $q->param("masq_srv_badcountries");
my $n_servRev = $q->param("masq_srv_reverse") || $servRev; my $n_servRev = $q->param("masq_srv_reverse") || $servRev;
if ($n_servBC eq $servBC && $n_servRev eq $servRev ) { if ($n_servBC eq $servBC && $n_servRev eq $servRev ) {
return $self->success("NO_CHANGE") return $self->success("NO_CHANGE")
} }
$db->set_prop($name, "BadCountries", $n_servBC); $db->set_prop($name, "BadCountries", $n_servBC);
$db->set_prop($name, "XTGeoipRev", $n_servRev); $db->set_prop($name, "XTGeoipRev", $n_servRev);
if (system ( "/sbin/e-smith/signal-event", "xt_geoip-service" ) == 0 ) if (system ( "/sbin/e-smith/signal-event", "xt_geoip-service" ) == 0 )
{ {
return $self->success("SUCCESS"); return $self->success("SUCCESS");
} else { } else {
return $self->error("ERROR_UPDATING"); return $self->error("ERROR_UPDATING");
} }
} else { } else {
$self->error('CANT_FIND_SERV'); $self->error('CANT_FIND_SERV');
@@ -507,14 +507,14 @@ sub srv_must_exist
my $listerr = ""; my $listerr = "";
my @mq_bcs = split /[,:]/, $q->param("masq_srv_badcountries"); my @mq_bcs = split /[,:]/, $q->param("masq_srv_badcountries");
if (@mq_bcs) { if (@mq_bcs) {
my $ctr = @mq_bcs; my $ctr = @mq_bcs;
return $self->localise('ERROR_COUNTRY_MAX: {$ctr}', {ctr=> "$ctr"}) if ($ctr > 50); return $self->localise('ERROR_COUNTRY_MAX: {$ctr}', {ctr=> "$ctr"}) if ($ctr > 50);
foreach my $bcs (@mq_bcs) { foreach my $bcs (@mq_bcs) {
my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4"; my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4";
if (! -f $file) { $listerr .= $bcs . ","; } if (! -f $file) { $listerr .= $bcs . ","; }
} }
return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr; return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr;
} }
return 'OK'; return 'OK';
} }
@@ -523,32 +523,32 @@ sub srv_must_exist
#Subroutine to list counries codes #Subroutine to list counries codes
sub generateCodes sub generateCodes
{ {
my $self = shift; my $self = shift;
my $q = $self->{cgi}; my $q = $self->{cgi};
$self->turn_off_buttons(); $self->turn_off_buttons();
my $file = "/usr/share/xt_geoip/geoip_countries_list.txt"; my $file = "/usr/share/xt_geoip/geoip_countries_list.txt";
unless ( -e $file ) { unless ( -e $file ) {
print $q->p($q->b($self->localise('INVALID_CODES_LIST'))); print $q->p($q->b($self->localise('INVALID_CODES_LIST')));
return ''; return '';
} }
print $q->h3($self->localise('COUNTRY_LIST')); print $q->h3($self->localise('COUNTRY_LIST'));
open( XTGEOIPCODES, $file ); open( XTGEOIPCODES, $file );
print "<pre>\n"; print "<pre>\n";
while (<XTGEOIPCODES>) while (<XTGEOIPCODES>)
{ {
print; print;
} }
close XTGEOIPCODES; close XTGEOIPCODES;
print "</pre>\n"; print "</pre>\n";
print $q->h3($self->localise('END_OF_CODES')); print $q->h3($self->localise('END_OF_CODES'));
return ''; return '';
} }
@@ -556,24 +556,24 @@ sub generateCodes
#Subroutine to list other services codes #Subroutine to list other services codes
sub otherServices sub otherServices
{ {
my ($self, $choice) = @_; my ($self, $choice) = @_;
my %serv_ok = map { $_ => 1} split(/,/, $db->get_prop("masq", "XtServices")); my %serv_ok = map { $_ => 1} split(/,/, $db->get_prop("masq", "XtServices"));
# unless $choice eq 'all'; # unless $choice eq 'all';
my @serv_others = (); my @serv_others = ();
for ($db->get_all_by_prop(type => 'service')) for ($db->get_all_by_prop(type => 'service'))
{ {
next unless $_->prop('TCPPort'); next unless $_->prop('TCPPort');
# if ( $_->prop('TCPPort')) { # if ( $_->prop('TCPPort')) {
# push @serv_others, $_->key unless exists( $serv_ok{$_->key}); # push @serv_others, $_->key unless exists( $serv_ok{$_->key});
push @serv_others, $_->key unless $choice eq 'sel' and not exists( $serv_ok{$_->key}); push @serv_others, $_->key unless $choice eq 'sel' and not exists( $serv_ok{$_->key});
# } # }
} }
return \@serv_others; return \@serv_others;
} }

494
root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm
View File

@@ -1,494 +0,0 @@
package SrvMngr::Controller::Xt_geoip;
#----------------------------------------------------------------------
# heading : Network
# description : GeoIP IP filtering
# navigation : 6000 610
# name : xt_geoip, method : get, url : /xt_geoip, ctlact : Xt_geoip#main
# name : xt_geoipd, method : post, url : /xt_geoip, ctlact : Xt_geoip#do_display
# name : xt_geoipc, method : get, url : /xt_geoipb, ctlact : Xt_geoip#do_display
# name : xt_geoipu, method : post, url : /xt_geoipb, ctlact : Xt_geoip#do_action
#
# routes : end
#----------------------------------------------------------------------
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
use POSIX qw(strftime);
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session );
# our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my ($cdb);
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE')));
my %xtg_datas = ();
$xtg_datas{'choice'} = '';
$c->stash(title => $title, xtg_datas => \%xtg_datas);
$c->render('xt_geoip');
} ## end sub main
sub do_display {
my $c = shift;
$c->app->log->info($c->log_req);
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE')));
my $choice = $c->param('Choice');
my $result;
my %xtg_datas = ();
$xtg_datas{'choice'} = $choice;
if ($choice eq 'LCOD') {
$result = $c->generateCodes();
# $c->stash( title => $title, modul => $result, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_lst');
} ## end if ($choice eq 'LCOD')
if ($choice eq 'LF2B') {
$result = $c->generateStats('f2b');
# $result = $c->render_to_string(inline => generateStats($c, 'f2b'));
# $c->stash( title => $title, modul => $result, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_lst');
} ## end if ($choice eq 'LF2B')
if ($choice eq 'LSSH') {
$result = $c->generateStats('ssh');
# $result = $c->render_to_string(inline => generateStats($c, 'ssh'));
# $c->stash( title => $title, modul => $result, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_lst');
} ## end if ($choice eq 'LSSH')
if ($choice eq 'LIPT') {
$result = $c->generateStats('ipt');
# $c->stash( title => $title, modul => $result, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_lst');
} ## end if ($choice eq 'LIPT')
if ($choice eq 'LSRV') {
# $c->stash( title => $title, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_lsrv');
} ## end if ($choice eq 'LSRV')
if ($choice eq 'UPDT') {
# $c->stash( title => $title, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_updt');
} ## end if ($choice eq 'UPDT')
if ($choice eq 'UPDS') {
$xtg_datas{name} = $c->param('Name');
# $c->stash( title => $title, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_upds');
} ## end if ($choice eq 'UPDS')
if ($choice eq 'REMS') {
$xtg_datas{name} = $c->param('Name');
# $c->stash( title => $title, xtg_datas => \%xtg_datas );
# return $c->render('xt_geoip_rems');
} ## end if ($choice eq 'REMS')
$c->stash(title => $title, modul => $result, xtg_datas => \%xtg_datas);
return $c->render('xt_geoip_lst') if ($choice ~~ [ 'LCOD', 'LF2B', 'LSSH', 'LIPT' ]);
return $c->render('xt_geoip' . '_' . lc($choice)) if ($choice ~~ [ 'UPDT', 'UPDS', 'REMS', 'LSRV' ]);
$c->redirect_to('/xt_geoip');
} ## end sub do_display
sub do_action {
my $c = shift;
$c->app->log->info($c->log_req);
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $rt = $c->current_route;
my $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE')));
my %xtg_datas = ();
my $choice = $c->param('Choice');
$xtg_datas{'choice'} = $choice;
my ($res, $result) = '';
if ($choice eq 'LSRV') {
#$result .= 'Blocked for testing ! Avoid updates for now ';
$res = '';
if (!$result) {
$res = $c->do_otherServices();
$result .= $res unless $res eq 'OK';
if (!$result) {
$result = $c->l('xtg_SERVICE_SUCCESS');
}
} ## end if (!$result)
} ## end if ($choice eq 'LSRV')
if ($choice eq 'UPDT') {
$res = $c->must_exist();
$result .= $res unless $res eq 'OK';
#$result .= 'Blocked for testing ! Avoid updates for now ';
$res = '';
if (!$result) {
$res = $c->change_settings();
$result .= $res unless $res eq 'OK';
if (!$result) {
$result = $c->l('xtg_SUCCESS');
}
} ## end if (!$result)
} ## end if ($choice eq 'UPDT')
if ($choice eq 'REMS') {
#$result .= 'Blocked for testing ! Avoid updates for now ';
my $name = $c->param('Name');
$xtg_datas{name} = $name;
$res = '';
if (!$result) {
$res = $c->remove_serv();
$result .= $res unless $res eq 'OK';
if (!$result) {
$result = $c->l('xtg_SUCCESSFULLY_DELETED_SERVICE');
}
} ## end if (!$result)
} ## end if ($choice eq 'REMS')
if ($choice eq 'UPDS') {
#$result .= 'Blocked for testing ! Avoid updates for now ';
my $name = $c->param('Name');
$xtg_datas{name} = $name;
$res = '';
if (!$result) {
$res = $c->modify_serv();
$result .= $res unless $res eq 'OK';
if (!$result) {
$result = $c->l('xtg_SERVICE_SUCCESS');
}
} ## end if (!$result)
} ## end if ($choice eq 'UPDS')
# common parts
if ($res ne 'OK') {
$c->stash(error => $result);
$c->stash(title => $title, xtg_datas => \%xtg_datas);
return $c->render('xt_geoip' . '_' . lc($choice));
}
my $message = "xt_geoip updates $choice DONE";
$c->app->log->info($message);
$c->flash(success => $result);
## $c->flash( error => 'No changes applied !!' );
#return to 'xt_geoip' route !!!
$c->redirect_to('/xt_geoip');
} ## end sub do_action
sub get_badcountries {
my $c = shift;
my $full = shift;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $badc = $cdb->get_prop("masq", "BadCountries") || "";
return $badc unless $full;
my $rev = (($cdb->get_prop("masq", "XTGeoipRev") || "disabled") eq "enabled") ? "!=" : "==";
return "$rev $badc ";
} ## end sub get_badcountries
sub get_geoip {
return $cdb->get_prop("masq", "GeoIP") || 'disabled';
}
sub get_reverse {
my $c = shift;
my $item = shift;
my $prop = shift;
$item = ($item eq 'masq') ? $item : $c->param('Name');
return $cdb->get_prop("$item", "$prop") || "disabled";
} ## end sub get_reverse
sub get_stat_geoip {
my $c = shift;
if (system("/bin/test -f /lib/modules/`/bin/uname -r`/weak-updates/xtables-addons/xt_geoip.ko") != 0) {
return $c->l('xtg_ERROR_MISSING_MODULE');
} elsif (system("/sbin/lsmod | grep 'xt_geoip' > /dev/null") != 0) {
return $c->l('xtg_ERROR_UNLOADED_MODULE');
} elsif (get_geoip() eq 'enabled' && system("/sbin/iptables -L -n | grep 'XTGeoIP' > /dev/null") != 0) {
return $c->l('xtg_ERROR_FILTER_CHAIN_MISSING');
} else {
return '';
}
} ## end sub get_stat_geoip
sub get_stat_license_key {
my $c = shift;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
if (($cdb->get_prop('geoip', 'status') || 'disabled') eq 'enabled') {
if (($cdb->get_prop('geoip', 'LicenseKey') || '') ne '') {
return '';
}
} ## end if (($cdb->get_prop('geoip'...)))
return $c->l('xtg_ERROR_LICENSE_KEY');
} ## end sub get_stat_license_key
sub get_date_update {
#my $file = "/usr/share/xt_geoip/LE/A1.iv4";
my $file = "/usr/share/xt_geoip/A1.iv4";
my $filetime = (-e $file) ? (stat($file))[9] : 0;
return strftime("%Y/%m/%d %H:%M", localtime($filetime)) || '';
} ## end sub get_date_update
sub get_srv_name {
my ($c) = @_;
return $c->param('Name');
}
sub get_services_table {
my $c = shift;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $choice = shift || 'sel';
my @services;
my @serv_rec;
if ($choice ne 'all') {
@services = split(/,/, $cdb->get_prop("masq", "XtServices"));
for (@services) {
my $rec = $cdb->get($_);
push @serv_rec, $rec if ($rec && $rec->prop('TCPPort'));
}
} else {
for ($cdb->get_all_by_prop(type => 'service')) {
push @serv_rec, $_ if ($_->prop('TCPPort'));
}
} ## end else [ if ($choice ne 'all') ]
return \@serv_rec;
} ## end sub get_services_table
sub get_srv_badcountries {
my ($c, $name, $full) = @_;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $badc = $cdb->get_prop($name, "BadCountries") || "";
return $badc unless $full;
my $rev = (($cdb->get_prop($name, "XTGeoipRev") || "disabled") eq "enabled") ? "!=" : "==";
return "$rev $badc ";
} ## end sub get_srv_badcountries
#Subroutine to list statistics
sub generateStats {
my $c = shift;
my $stats_type = shift;
my $out = '';
# Untaint $name before use in system()
$stats_type =~ /(.+)/;
$stats_type = $1;
if ($stats_type ne "ipt" and $stats_type ne "ssh" and $stats_type ne "f2b") {
$out .= sprintf("<h3>%s %s </h3>", $c->l('xtg_INVALID_STATS_TYPE'), $stats_type);
return $out;
}
# my $now_string = $c->gen_locale_date_string();
my $file = "/var/lib/xt_geoip/extA_" . $stats_type . "_country.lst";
my $filetime = (-e $file) ? (stat($file))[9] : 0;
my $date_string = strftime("%Y/%m/%d %H:%M", localtime($filetime)) || '';
$out .= sprintf("<h3>%s %s %s</h3>", $c->l('xtg_STATS_GENERATED'), $stats_type, $date_string);
open(Xt_GEOIPSTATS, $file);
$out .= sprintf "<pre>";
while (<Xt_GEOIPSTATS>) {
$out .= sprintf("%s", $_);
}
close Xt_GEOIPSTATS;
$out .= sprintf "</pre>";
$out .= sprintf("<h3>%s</h3>", $c->l('xtg_END_OF_STATS'));
return $out;
} ## end sub generateStats
#Subroutine to list countries codes
sub generateCodes {
my $c = shift;
my $out = '';
# my $now_string = $c->gen_locale_date_string();
my $file = "/usr/share/xt_geoip/geoip_countries_list.txt";
unless (-e $file) {
$out .= "<br>" . $c->l('xtg_INVALID_CODES_LIST');
return $out;
}
my $filetime = (-e $file) ? (stat($file))[9] : 0;
my $date_string = strftime("%Y/%m/%d %H:%M", localtime($filetime)) || '';
$out .= sprintf("<h3>%s %s </h3>", $c->l('xtg_COUNTRY_LIST'), $date_string);
open(Xt_GEOIPCODES, $file);
$out .= sprintf "<pre>";
while (<Xt_GEOIPCODES>) {
$out .= sprintf("%s", $_);
}
close Xt_GEOIPCODES;
$out .= sprintf "</pre>";
$out .= sprintf("<h3>%s</h3>", $c->l('xtg_END_OF_CODES'));
return $out;
} ## end sub generateCodes
#Subroutine to list other services codes
sub otherServices {
my ($c, $choice) = @_;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my %serv_ok = map { $_ => 1 } split(/,/, $cdb->get_prop("masq", "XtServices"));
# unless $choice eq 'all';
my @serv_others = ();
for ($cdb->get_all_by_prop(type => 'service')) {
next unless $_->prop('TCPPort');
# if ( $_->prop('TCPPort')) {
# push @serv_others, $_->key unless exists( $serv_ok{$_->key});
push @serv_others, $_->key unless $choice eq 'sel' and not exists($serv_ok{ $_->key });
# }
} ## end for ($cdb->get_all_by_prop...)
return \@serv_others;
} ## end sub otherServices
#Subroutine to update list services codes
sub do_otherServices {
my $c = shift;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $serv1 = ($cdb->get_prop("masq", "XtServices")) || '';
my $serv2 = join(',', @{ $c->every_param('Selectedservices') });
$cdb->set_prop("masq", "XtServices", $serv2) if ($serv1 ne $serv2);
return 'OK';
} ## end sub do_otherServices
sub change_settings {
my $c = shift;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $mq_bc = get_badcountries();
my $mq_gp = get_geoip();
my $masq = $cdb->get('masq') || "disabled";
my $mq_rv = $masq->prop('XTGeoipRev') || 'disabled';
my $mq_ot = $masq->prop('XTGeoipOther') || 'disabled';
my $n_mq_bc = $c->param("Masq_badcountries");
my $n_mq_gp = $c->param("Masq_geoip") || $mq_gp;
my $n_upd_gp = $c->param("Update_geoip") || '';
my $n_mq_rv = $c->param("Masq_reverse") || $mq_rv;
my $n_mq_ot = $c->param("Masq_others") || $mq_ot;
if ( ($n_mq_bc eq $mq_bc)
&& ($n_mq_gp eq $mq_gp)
&& ($n_upd_gp eq 'NO')
&& ($n_mq_rv eq $mq_rv)
&& ($n_mq_ot eq $mq_ot))
{
return 'OK';
} ## end if (($n_mq_bc eq $mq_bc...))
$cdb->set_prop("masq", "BadCountries", $n_mq_bc);
$cdb->set_prop("masq", "GeoIP", $n_mq_gp);
$cdb->set_prop("masq", "XTGeoipRev", $n_mq_rv);
$cdb->set_prop("masq", "XTGeoipOther", $n_mq_ot);
my $eventloc = "xt_geoip-modify";
$eventloc = "xt_geoip-update" if $n_upd_gp eq 'YES';
unless (system("/sbin/e-smith/signal-event", $eventloc) == 0) {
return $c->l("xtg_ERROR_UPDATING");
}
return 'OK';
} ## end sub change_settings
=head2 valid_badcountries
subroutine to validate countries.
=cut
sub must_exist {
my $c = shift;
my $listerr = "";
my @mq_bcs = split /[,:]/, $c->param("Masq_badcountries");
if (@mq_bcs) {
my $ctr = @mq_bcs;
return $c->l('xtg_ERROR_COUNTRY_MAX', $ctr) if ($ctr > 50);
foreach my $bcs (@mq_bcs) {
#my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4";
my $file = "/usr/share/xt_geoip/" . $bcs . ".iv4";
if (!-f $file) { $listerr .= $bcs . ","; }
}
return $c->l('xtg_ERROR_COUNTRY_NOT_EXIST', $listerr) if $listerr;
} ## end if (@mq_bcs)
return 'OK';
} ## end sub must_exist
sub remove_serv {
my ($c) = @_;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $name = $c->param('Name');
# Untaint $name before use in system()
$name =~ /(.+)/;
$name = $1;
if (my $serv = $cdb->get($name)) {
my $servBC = $serv->prop('BadCountries') || '';
if ($servBC ne '') {
my $tps = $cdb->get_prop_and_delete($name, "BadCountries");
$tps = $cdb->get_prop_and_delete($name, "XTGeoipRev");
unless (system("/sbin/e-smith/signal-event", "xt_geoip-service") == 0) {
return $c->l("xtg_ERROR_WHILE_DELETING_SERVICE") . ' ' . $name;
}
return 'OK';
} ## end if ($servBC ne '')
} else {
return $c->l('xtg_CANT_FIND_SERV');
}
} ## end sub remove_serv
sub modify_serv {
my ($c) = @_;
our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $name = $c->param('Name');
# Untaint $name before use in system()
$name =~ /(.+)/;
$name = $1;
if (my $serv = $cdb->get($name)) {
my $servBC = $serv->prop('BadCountries') || '';
my $servRev = $serv->prop('XTGeoipRev') || 'disabled';
my $n_servBC = $c->param("Masq_srv_badcountries");
my $n_servRev = $c->param("Masq_srv_reverse") || $servRev;
if ($n_servBC eq $servBC && $n_servRev eq $servRev) {
return 'OK';
}
$cdb->set_prop($name, "BadCountries", $n_servBC);
$cdb->set_prop($name, "XTGeoipRev", $n_servRev);
unless (system("/sbin/e-smith/signal-event", "xt_geoip-service") == 0) {
return $c->l("xtg_ERROR_UPDATING") . ' ' . $name;
}
return 'OK';
} else {
return $c->l('xtg_CANT_FIND_SERV');
}
} ## end sub modify_serv
1;

69
root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Xt_geoip/xt_geoip_en.lex
View File

@@ -1,69 +0,0 @@
'xtg_FORM_TITLE' => 'XTABLES-ADDONS Administration<br>GeoIP',
'xtg_ERROR_UPDATING' => 'There was an error while updating xt_geoip.',
'xtg_SUCCESS' => 'Successful change... Now IP filtering takes into account the countries entered.',
'xtg_SERVICE_SUCCESS' => 'Successful change... Now IP filtering takes into account the new services list.',
'xtg_XT_GEOIP_STATUS_DESCRIPTION' => ' <ul><li>IP filtering can be enabled or disabled with the appropriate button</li>
<li>Codes of the countries to be banished can be entered in the corresponding field</li>
<li>An immediate update of the table can be requested here</li></ul>
<p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ',
'xtg_NO_CHANGE' => 'No change... no update !',
'xtg_LABEL_GEOIP_STATUS' => 'Current GEOIP filtering : ',
'xtg_LABEL_GEOIP' => 'GEOIP filtering desired : ',
'xtg_DESC_GEOIP' => 'Should filtering by country of origin be activated ?',
'xtg_ERROR_STATUS_GEOIP' => ' <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ',
'xtg_LABEL_BADCOUNTRIES_STATUS' => 'Current list of banished country codes : ',
'xtg_ERROR_COUNTRY_NOT_EXIST' => 'Country code(s) does not exist on the server: [_1]',
'xtg_LABEL_BADCOUNTRIES' => 'New country codes to be used :',
'xtg_DESC_BADCOUNTRIES' => 'List of country codes (uppercase et comma-separated).',
'xtg_LABEL_DATE_UPDATE_STATUS' => 'Last update of GeoIP table :',
'xtg_LABEL_UPDATE' => 'Force the update of GeoIP table :',
'xtg_DESC_UPDATE' => 'GeoIP table is updated every week, but you can ...',
'xtg_IPT_LIST_DESCRIPTION' => '<ul><li>Click here to see the statistics of the prevented connections</li></ul> ',
'xtg_IPT_LIST' => 'Filtered',
'xtg_SSH_LIST_DESCRIPTION' => '<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ',
'xtg_SSH_LIST' => 'SSH errors',
'xtg_F2B_LIST_DESCRIPTION' => '<ul><li>Click here to see the statistics of the connections banned by fail2ban</li></ul> ',
'xtg_F2B_LIST' => 'F2b banned',
'xtg_STATS_GENERATED' => 'Statistics generated',
'xtg_END_OF_STATS' => 'End of Statistics',
'xtg_INVALID_STATS_TYPE' => 'Invalid type of statistics',
'xtg_STATS_DESCRIPTION' => '<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul>
<li>For 3 periods : Day, Week and Month</li>
<li>Banned Ips by country sorted by number</li>
<li>Ssh errors by country sorted by number</li>
<li>Fail2ban banned IPs by country sorted by number</li>
</ul><p><i>XX means Country not found !</i></p> ',
'xtg_COUNTRY_LIST_DESCRIPTION' => '<ul><li>Click here to see a <b>list of available country codes</b></li></ul> ',
'xtg_LABEL_COUNTRY_LIST' => 'Country codes : ',
'xtg_COUNTRY_LIST' => 'Country codes',
'xtg_CNTRY_LIST' => 'List',
'xtg_END_OF_CODES' => 'End of code list',
'xtg_SERVICE_DESCRIPTION' => 'Per service filtering for Xtables GeoIP',
'xtg_SERVICE_DESCRIPTION2' => '<ul><li>If you want different filtering based on services</li></ul>',
'xtg_LABEL_SERVICE' => 'Service name : ',
'xtg_PER_SERVICE_GEOIP' => 'Services',
'xtg_ADD_SERVICE' => 'Add or modify a per service filtering',
'xtg_ADD_DESC' => 'You are choosing a particular country filtering for this service',
'xtg_REMOVE_SERVICE' => 'Delete a per service filtering',
'xtg_REMOVE_DESC' => 'You are deleting a filtering by service. The general filtering will then apply.',
'xtg_SERV_NOT_BAN' => 'Unfiltered service.',
'xtg_NO_SERVICES' => 'No services.',
'xtg_LABEL_SERV_BADCOUNTRIES_STATUS' => 'List of rejected country codes for the service : ',
'xtg_SUCCESSFULLY_DELETED_SERVICE' => 'Per service filtering successfully deleted... New filtering taken into account.',
'xtg_BADCOUNTRIES' => 'Blacklist',
'xtg_ERROR_COUNTRY_MAX' => 'Too many countries chosen: [_1]',
'xtg_LABEL_REVERSE_MATCH' => 'Reject if',
'xtg_DESC_REVERSE_MATCH' => 'The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).',
'xtg_LABEL_OTHERS' => 'General filter only for services without rules',
'xtg_DESC_OTHERS' => 'Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.',
'xtg_SERVICE_LIST_DESCRIPTION' => '<ul><li>Click here to select <b>new </b>services among an <b>available services list</b></li></ul> ',
'xtg_LABEL_SERVICE_LIST' => 'Service codes : ',
'xtg_SERV_LIST' => 'List',
'xtg_DESC_AVAILABLE_SERVICES' => ' <h2> New Services selection</h2>
<ul><li>Select here among the other services not yet managed individually.
</li><li>You may select one or more elements. Generally <b>enabled and public</b> ones.</li></ul> ',
'xtg_LABEL_AVAILABLE_SERVICES' => 'Available Services',
'xtg_ERROR_LICENSE_KEY' => 'GEOIP license key unavailable. Downloading is <b>inactive</b>',
'xtg_ERROR_MISSING_MODULE' => 'Module xt_geoip is missing. GeoIP based filtering is <b>inactive</b>',
'xtg_ERROR_UNLOADED_MODULE' => 'Module xt_geoip not loaded. GeoIP based filtering is <b>inactive</b>',
'xtg_ERROR_FILTER_CHAIN_MISSING' => 'Filtering chain XTGeoIP is not in use. GeoIP based filtering is <b>inactive</b>',

4
root/usr/share/smanager/themes/default/templates/partials/_xtg_lcodes.html.ep
View File

@@ -2,7 +2,7 @@
<HR class='sme-copyrightbar'> <HR class='sme-copyrightbar'>
%= form_for '/xt_geoip' => (method => 'POST') => begin %= form_for '/xtgeoip' => (method => 'POST') => begin
%= $c->render_to_string(inline => l('xtg_COUNTRY_LIST_DESCRIPTION')); %= $c->render_to_string(inline => l('xtg_COUNTRY_LIST_DESCRIPTION'));
%= submit_button l 'xtg_CNTRY_LIST', class => 'action' %= submit_button l 'xtg_CNTRY_LIST', class => 'action'
@@ -11,4 +11,4 @@
% end % end
</div> </div>
<!-- button_to l('xtg_CNTRY_LIST') => "/xt_geoip" => (class => 'action') --> <!-- button_to l('xtg_CNTRY_LIST') => "/xgteoip" => (class => 'action') -->

72
root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep
View File

@@ -2,41 +2,41 @@
<HR class='sme-copyrightbar'> <HR class='sme-copyrightbar'>
%= form_for '/xt_geoip' => (method => 'POST') => begin %= form_for '/xtgeoip' => (method => 'POST') => begin
<h2> <h2>
%= l('xtg_SERVICE_DESCRIPTION') %= l('xtg_SERVICE_DESCRIPTION')
</h2> </h2>
%= $c->render_to_string(inline => l('xtg_SERVICE_DESCRIPTION2')); %= $c->render_to_string(inline => l('xtg_SERVICE_DESCRIPTION2'));
% my @services = @{$c->get_services_table('sel')}; % my @services = @{$c->get_services_table('sel')};
% if (scalar @services == 0) { % if (scalar @services == 0) {
%=l 'xtg_NO_SERVICES' %=l 'xtg_NO_SERVICES'
% } else { % } else {
<table class="sme-border"><tbody> <table class="sme-border"><tbody>
<tr><th class='sme-border'> <tr><th class='sme-border'>
%=l 'NAME' %=l 'NAME'
</th><th class='sme-border'> </th><th class='sme-border'>
%=l 'PORT' %=l 'PORT'
</th><th class='sme-border'> </th><th class='sme-border'>
%=l 'STATUS' %=l 'STATUS'
</th><th class='sme-border'> </th><th class='sme-border'>
%=l 'ACCESS' %=l 'ACCESS'
</th><th class='sme-border'> </th><th class='sme-border'>
%=l 'xtg_BADCOUNTRIES' %=l 'xtg_BADCOUNTRIES'
</th><th class='sme-border' colspan='2'> </th><th class='sme-border' colspan='2'>
%=l 'ACTION' %=l 'ACTION'
</th> </th>
</tr> </tr>
% foreach my $sv (@services) { % foreach my $sv (@services) {
% my $svBC = $sv->prop('BadCountries') || ' '; % my $svBC = $sv->prop('BadCountries') || ' ';
% my $svRev = (( $sv->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!='; % my $svRev = (( $sv->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!=';
% my $color = 'red'; % my $color = 'red';
% my $deco= "none"; % my $deco= "none";
% if ($svRev eq '!=' ) { $color = 'green'; } % if ($svRev eq '!=' ) { $color = 'green'; }
% if ($sv->prop('status') eq 'disabled' || $sv->prop('access') ne 'public') { $color = 'grey'; $deco= "line-through"; } % if ($sv->prop('status') eq 'disabled' || $sv->prop('access') ne 'public') { $color = 'grey'; $deco= "line-through"; }
% my $BC = "<font color='$color' style='text-decoration: $deco'>"."$svRev $svBC"."</font>"; % my $BC = "<font color='$color' style='text-decoration: $deco'>"."$svRev $svBC"."</font>";
<tr> <tr>
%= t td => (class => 'sme-border') => $sv->key %= t td => (class => 'sme-border') => $sv->key
@@ -45,15 +45,15 @@
%= t td => (class => 'sme-border') => $sv->prop('access') %= t td => (class => 'sme-border') => $sv->prop('access')
%= t td => (class => 'sme-border') => $c->render_to_string(inline => $BC) %= t td => (class => 'sme-border') => $c->render_to_string(inline => $BC)
% my $actionModify = "<a href='xt_geoipb?Choice=UPDS&Name=" . $sv->key . "'>" . l('MODIFY') . "</a>"; % my $actionModify = "<a href='xtgeoipb?Choice=UPDS&Name=" . $sv->key . "'>" . l('MODIFY') . "</a>";
% my $actionRemove = "<a href='xt_geoipb?Choice=REMS&Name=" . $sv->key . "'>" . l('REMOVE') . "</a>"; % my $actionRemove = "<a href='xtgeoipb?Choice=REMS&Name=" . $sv->key . "'>" . l('REMOVE') . "</a>";
<td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
<td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td> <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr> </tr>
% } % }
</tbody></table> </tbody></table>
% } % }
%= $c->render_to_string(inline => l('xtg_SERVICE_LIST_DESCRIPTION')); %= $c->render_to_string(inline => l('xtg_SERVICE_LIST_DESCRIPTION'));

6
root/usr/share/smanager/themes/default/templates/partials/_xtg_stats.html.ep
View File

@@ -4,7 +4,7 @@
%= $c->render_to_string(inline => l('xtg_STATS_DESCRIPTION')); %= $c->render_to_string(inline => l('xtg_STATS_DESCRIPTION'));
</h3> </h3>
%= form_for '/xt_geoip' => (method => 'POST') => begin %= form_for '/xtgeoip' => (method => 'POST') => begin
%= $c->render_to_string(inline => l('xtg_IPT_LIST_DESCRIPTION')); %= $c->render_to_string(inline => l('xtg_IPT_LIST_DESCRIPTION'));
%= submit_button l 'xtg_IPT_LIST', class => 'action' %= submit_button l 'xtg_IPT_LIST', class => 'action'
@@ -12,7 +12,7 @@
% end % end
%= form_for '/xt_geoip' => (method => 'POST') => begin %= form_for '/xtgeoip' => (method => 'POST') => begin
%= $c->render_to_string(inline => l('xtg_SSH_LIST_DESCRIPTION')); %= $c->render_to_string(inline => l('xtg_SSH_LIST_DESCRIPTION'));
@@ -21,7 +21,7 @@
% end % end
%= form_for '/xt_geoip' => (method => 'POST') => begin %= form_for '/xtgeoip' => (method => 'POST') => begin
%= $c->render_to_string(inline => l('xtg_F2B_LIST_DESCRIPTION')); %= $c->render_to_string(inline => l('xtg_F2B_LIST_DESCRIPTION'));

74
root/usr/share/smanager/themes/default/templates/xt_geoip.html.ep
View File

@@ -1,74 +0,0 @@
% layout 'default', title => "Smanager - xt_geoip";
% content_for 'module' => begin
<div id="module" class="module xt_geoip-panel">
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $xtg_datas
</p>
%}
% if ( stash 'error' ) {
<br><div class=sme-error>
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<h1><%= $title %></h1>
<br>
%= $c->render_to_string(inline => l('xtg_XT_GEOIP_STATUS_DESCRIPTION'));
<br>
%= form_for '/xt_geoip' => (method => 'POST') => begin
<p><span class=label>
%=l 'xtg_LABEL_GEOIP_STATUS'
</span><span class=input>
%= $c->get_geoip()
</span></p>
<p><span class=label>
%=l 'xtg_LABEL_BADCOUNTRIES_STATUS'
</span><span class=input>
%= $c->get_badcountries(1)
</span></p>
<p><span class=label>
%=l 'xtg_LABEL_DATE_UPDATE_STATUS'
</span><span class=input>
%= $c->get_date_update()
</span></p>
% if ( my $st_geoip = $c->get_stat_geoip() ) {
<div class=sme-error>
%= $c->render_to_string(inline => $st_geoip);
</div>
%}
% if ( my $st_lice_k = $c->get_stat_license_key() ) {
<div class=sme-error>
%= $c->render_to_string(inline => $st_lice_k);
</div>
%}
%= hidden_field 'Choice' => 'UPDT'
<div class='center'>
%= submit_button l('NEXT'), class => 'action'
</div>
%end
%= include 'partials/_xtg_lcodes'
%= include 'partials/_xtg_services'
%= include 'partials/_xtg_stats'
</div>
%end

44
root/usr/share/smanager/themes/default/templates/xt_geoip_lsrv.html.ep
View File

@@ -1,44 +0,0 @@
% layout 'default', title => "Smanager - xt_geoip";
% content_for 'module' => begin
<div id="module" class="module xt_geoip-panel">
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $xtg_datas
</p>
%}
% if ( stash 'error' ) {
<br><div class=sme-error>
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<h1><%= $title %></h1>
<br>
%= $c->render_to_string(inline => l('xtg_DESC_AVAILABLE_SERVICES'));
<br>
%= form_for '/xt_geoipb' => (method => 'POST') => begin
<p><span class=label>
%=l 'xtg_LABEL_AVAILABLE_SERVICES'
</span><span class=data>
% param 'Selectedservices' => $c->otherServices('sel') unless param 'Selectedservices';
%= select_field 'Selectedservices' => $c->otherServices('all'), class => 'input', multiple => "1"
</span></p>
%= hidden_field 'Choice' => 'LSRV'
<div class='center'>
%= submit_button l('NEXT'), class => 'action'
</div>
%end
</div>
%end

36
root/usr/share/smanager/themes/default/templates/xt_geoip_lst.html.ep
View File

@@ -1,36 +0,0 @@
% layout 'default', title => "Smanager - xt_geoip - List";
% content_for 'module' => begin
<div id="module" class="module xt_geoip-panel">
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $xtg_datas
</p>
%}
% if ( stash 'error' ) {
<br><div class=sme-error>
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<h1><%= $title %></h1>
%= form_for '/xt_geoip' => (method => 'GET') => begin
<br>
%= $c->render_to_string(inline => stash 'modul');
<br>
<div class='center'>
%= submit_button l('NEXT'), class => 'action'
</div>
%end
</div>
%end

53
root/usr/share/smanager/themes/default/templates/xt_geoip_rems.html.ep
View File

@@ -1,53 +0,0 @@
% layout 'default', title => "Smanager - xt_geoip";
% content_for 'module' => begin
<div id="module" class="module xt_geoip-panel">
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $xtg_datas
</p>
%}
% if ( stash 'error' ) {
<br><div class=sme-error>
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<h1><%= $title %></h1>
<h2>
%= l 'xtg_REMOVE_SERVICE'
</h2><br>
%= $c->render_to_string(inline => l('xtg_REMOVE_DESC'));
%= form_for '/xt_geoipb' => (method => 'POST') => begin
<p><span class=label>
%=l 'xtg_LABEL_SERVICE'
</span><span class=data>
%= $xtg_datas->{name}
</span></p>
<p><span class=label>
%=l 'xtg_LABEL_SERV_BADCOUNTRIES_STATUS'
</span><span class=data>
%= $c->get_srv_badcountries( $xtg_datas->{name}, 0 )
</span></p>
<div class='center'>
%= submit_button l('REMOVE'), class => 'action'
</div>
%= hidden_field 'Choice' => 'REMS'
%= hidden_field 'Name' => $xtg_datas->{name}
%end
</div>
%end

77
root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep
View File

@@ -1,77 +0,0 @@
% layout 'default', title => "Smanager - xt_geoip";
% content_for 'module' => begin
<div id="module" class="module xt_geoip-panel">
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $xtg_datas
</p>
%}
% if ( stash 'error' ) {
<br><div class=sme-error>
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<h1><%= $title %></h1>
<h2>
%= l 'xtg_ADD_SERVICE'
</h2><br>
%= $c->render_to_string(inline => l('xtg_ADD_DESC'));
%= form_for '/xt_geoipb' => (method => 'POST') => begin
<p><span class=label>
%=l 'xtg_LABEL_SERVICE'
</span><span class=data>
%= $xtg_datas->{name}
</span></p>
<p><span class=label>
%=l 'xtg_LABEL_BADCOUNTRIES_STATUS'
</span><span class=data>
%= $c->get_badcountries( 0 )
</span></p>
<p>
%=l 'xtg_DESC_REVERSE_MATCH'
<br><span class=label>
%=l 'xtg_LABEL_REVERSE_MATCH'
</span><span class=data>
% param 'Masq_srv_reverse' => $c->get_reverse('masq','XTGeoipRev') unless param 'Masq_srv_reverse';
%= select_field 'Masq_srv_reverse' => [['!=' => 'enabled'], ['==' => 'disabled']], class => 'input'
</span></p>
<p>
%=l 'xtg_DESC_BADCOUNTRIES'
<br><span class=label>
%=l 'xtg_LABEL_BADCOUNTRIES'
</span><span class=data>
% param 'Masq_srv_badcountries' => $c->get_srv_badcountries($xtg_datas->{name}, 0) unless param 'Masq_srv_badcountries';
%= text_field 'Masq_srv_badcountries', size => '64', class => 'input'
</span></p>
<p><span class=label>
%=l 'xtg_LABEL_SERV_BADCOUNTRIES_STATUS'
</span><span class=data>
%= $c->get_srv_badcountries( $xtg_datas->{name}, 1 )
</span></p>
<div class='center'>
%= submit_button l('SAVE'), class => 'action'
</div>
%= hidden_field 'Choice' => 'UPDS'
%= hidden_field 'Name' => $xtg_datas->{name}
%end
</div>
%end

83
root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep
View File

@@ -1,83 +0,0 @@
% layout 'default', title => "Smanager - xt_geoip";
% content_for 'module' => begin
<div id="module" class="module xt_geoip-panel">
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $xtg_datas
</p>
%}
% if ( stash 'error' ) {
<br><div class=sme-error>
%= $c->render_to_string(inline => stash 'error')
</div>
%}
<h1><%= $title %></h1>
%= form_for '/xt_geoipb' => (method => 'POST') => begin
<p>
%=l 'xtg_DESC_GEOIP'
<br><span class=label>
%=l 'xtg_LABEL_GEOIP'
</span><span class=data>
% param 'Masq_geoip' => $c->get_geoip() unless param 'Masq_geoip';
%= select_field 'Masq_geoip' => [[ (l 'YES') => 'enabled'], [ (l 'NO') => 'disabled']], class => 'input'
</span></p>
<p>
%=l 'xtg_DESC_REVERSE_MATCH'
<br><span class=label>
%=l 'xtg_LABEL_REVERSE_MATCH'
</span><span class=data>
% param 'Masq_reverse' => $c->get_reverse('masq','XTGeoipRev') unless param 'Masq_reverse';
%= select_field 'Masq_reverse' => [[ '!=' => 'enabled'], [ '==' => 'disabled']], class => 'input'
</span></p>
<p>
%=l 'xtg_DESC_BADCOUNTRIES'
<br><span class=label>
%=l 'xtg_LABEL_BADCOUNTRIES'
</span><span class=data>
% param 'Masq_badcountries' => $c->get_badcountries() unless param 'Masq_badcountries';
%= text_field 'Masq_badcountries', class => 'input'
</span></p>
<p><span class=label>
%=l 'xtg_LABEL_BADCOUNTRIES_STATUS'
</span><span class=input>
%= $c->get_badcountries();
</span></p>
<p>
%=l 'xtg_DESC_OTHERS'
<br><span class=label>
%=l 'xtg_LABEL_OTHERS'
</span><span class=data>
% param 'Masq_others' => $c->get_reverse('masq','XT_GeoipOther') unless param 'Masq_others';
%= select_field 'Masq_others' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input'
</span></p>
<p>
%=l 'xtg_DESC_UPDATE'
<br><span class=label>
%=l 'xtg_LABEL_UPDATE'
</span><span class=data>
%= select_field 'Update_geoip' => [[ (l 'NO') => 'NO'], [ (l 'YES') => 'YES']], class => 'input'
</span></p>
%= hidden_field 'Choice' => 'UPDT'
<div class='center'>
%= submit_button l('SAVE'), class => 'action'
</div>
%end
</div>
%end

7
smeserver-xt_geoip.spec
View File

@@ -1,6 +1,6 @@
%define name smeserver-xt_geoip %define name smeserver-xt_geoip
%define version 1.3.1 %define version 1.3.1
%define release 28 %define release 29
Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
Name: %{name} Name: %{name}
@@ -78,6 +78,11 @@ rm -rf %{name}-%{version}
%changelog %changelog
* Tue Oct 21 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.1-29.sme
- Fix SmartMatch errors [SME: 13240]
- Fix panel errors [SME: 13173]
- Do not block remote access authorized [SME: 12445]
* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 1.3.1-28.sme * Tue Oct 07 2025 Brian Read <brianr@koozali.org> 1.3.1-28.sme
- Add UTF8 and avoid potential DB caching problems [SME: 13209] - Add UTF8 and avoid potential DB caching problems [SME: 13209]