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

* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 1.3.1-28.sme

Browse Source 
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
This commit is contained in:
Brian Read
2025-10-07 14:55:28 +01:00
parent b8731843ed
commit 8253bc0805
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,13 @@ use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session ); use SrvMngr qw( theme_list init_session );
# our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; # our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my ($cdb); my ($cdb);
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; 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 $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE')));
my %xtg_datas = (); my %xtg_datas = ();
$xtg_datas{'choice'} = ''; $xtg_datas{'choice'} = '';
@@ -36,7 +36,7 @@ sub main {
sub do_display { sub do_display {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; 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 $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE')));
my $choice = $c->param('Choice'); my $choice = $c->param('Choice');
my $result; my $result;
@@ -107,7 +107,7 @@ sub do_display {
sub do_action { sub do_action {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $rt = $c->current_route; my $rt = $c->current_route;
my $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE'))); my $title = $c->render_to_string(inline => ($c->l('xtg_FORM_TITLE')));
my %xtg_datas = (); my %xtg_datas = ();
@@ -198,7 +198,7 @@ sub do_action {
sub get_badcountries { sub get_badcountries {
my $c = shift; my $c = shift;
my $full = shift; my $full = shift;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $badc = $cdb->get_prop("masq", "BadCountries") || ""; my $badc = $cdb->get_prop("masq", "BadCountries") || "";
return $badc unless $full; return $badc unless $full;
my $rev = (($cdb->get_prop("masq", "XTGeoipRev") || "disabled") eq "enabled") ? "!=" : "=="; my $rev = (($cdb->get_prop("masq", "XTGeoipRev") || "disabled") eq "enabled") ? "!=" : "==";
@@ -233,7 +233,7 @@ sub get_stat_geoip {
sub get_stat_license_key { sub get_stat_license_key {
my $c = shift; my $c = shift;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; 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', 'status') || 'disabled') eq 'enabled') {
if (($cdb->get_prop('geoip', 'LicenseKey') || '') ne '') { if (($cdb->get_prop('geoip', 'LicenseKey') || '') ne '') {
@@ -257,7 +257,7 @@ sub get_srv_name {
sub get_services_table { sub get_services_table {
my $c = shift; my $c = shift;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $choice = shift || 'sel'; my $choice = shift || 'sel';
my @services; my @services;
my @serv_rec; my @serv_rec;
@@ -280,7 +280,7 @@ sub get_services_table {
sub get_srv_badcountries { sub get_srv_badcountries {
my ($c, $name, $full) = @_; my ($c, $name, $full) = @_;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $badc = $cdb->get_prop($name, "BadCountries") || ""; my $badc = $cdb->get_prop($name, "BadCountries") || "";
return $badc unless $full; return $badc unless $full;
my $rev = (($cdb->get_prop($name, "XTGeoipRev") || "disabled") eq "enabled") ? "!=" : "=="; my $rev = (($cdb->get_prop($name, "XTGeoipRev") || "disabled") eq "enabled") ? "!=" : "==";
@@ -349,7 +349,7 @@ sub generateCodes {
#Subroutine to list other services codes #Subroutine to list other services codes
sub otherServices { sub otherServices {
my ($c, $choice) = @_; my ($c, $choice) = @_;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; 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")); my %serv_ok = map { $_ => 1 } split(/,/, $cdb->get_prop("masq", "XtServices"));
# unless $choice eq 'all'; # unless $choice eq 'all';
@@ -370,7 +370,7 @@ sub otherServices {
#Subroutine to update list services codes #Subroutine to update list services codes
sub do_otherServices { sub do_otherServices {
my $c = shift; my $c = shift;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $serv1 = ($cdb->get_prop("masq", "XtServices")) || ''; my $serv1 = ($cdb->get_prop("masq", "XtServices")) || '';
my $serv2 = join(',', @{ $c->every_param('Selectedservices') }); my $serv2 = join(',', @{ $c->every_param('Selectedservices') });
$cdb->set_prop("masq", "XtServices", $serv2) if ($serv1 ne $serv2); $cdb->set_prop("masq", "XtServices", $serv2) if ($serv1 ne $serv2);
@@ -379,7 +379,7 @@ sub do_otherServices {
sub change_settings { sub change_settings {
my $c = shift; my $c = shift;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $mq_bc = get_badcountries(); my $mq_bc = get_badcountries();
my $mq_gp = get_geoip(); my $mq_gp = get_geoip();
my $masq = $cdb->get('masq') || "disabled"; my $masq = $cdb->get('masq') || "disabled";
@@ -438,7 +438,7 @@ sub must_exist {
sub remove_serv { sub remove_serv {
my ($c) = @_; my ($c) = @_;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $name = $c->param('Name'); my $name = $c->param('Name');
# Untaint $name before use in system() # Untaint $name before use in system()
@@ -464,7 +464,7 @@ sub remove_serv {
sub modify_serv { sub modify_serv {
my ($c) = @_; my ($c) = @_;
our $cdb = esmith::ConfigDB->open() or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB::UTF8->open() or die "Couldn't open ConfigDB::UTF8\n";
my $name = $c->param('Name'); my $name = $c->param('Name');
# Untaint $name before use in system() # Untaint $name before use in system()

5
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 27 %define release 28
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,9 @@ rm -rf %{name}-%{version}
%changelog %changelog
* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 1.3.1-28.sme
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
* Sat Oct 04 2025 Brian Read <brianr@koozali.org> 1.3.1-27.sme * Sat Oct 04 2025 Brian Read <brianr@koozali.org> 1.3.1-27.sme
- Remove smanager-refresh from spec file [SME: 13212] - Remove smanager-refresh from spec file [SME: 13212]