xtables-addons: geoip: update scripts for DBIP names, etc.
PATCH 1/1 xtables-addons: geoip: update scripts for DBIP names, etc.
From: Philip Prindeville <[email protected]>
Also change the default destination directory to /usr/share/xt_geoip as most distros use this now. Update the documentation.
--- geoip/xt_geoip_build | 4 +++- geoip/xt_geoip_build.1 | 10 +++++----- geoip/xt_geoip_fetch | 3 ++- geoip/xt_geoip_fetch.1 | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-)
geoip/xt_geoip_build +3 -1
@@ -5,6 +5,7 @@ # Copyright Philip Prindeville, 2018 # Copyright Arjen de Korte, 2020 # + use Getopt::Long; use Net::CIDR::Lite; use Socket qw(AF_INET AF_INET6 inet_pton);
@@ -17,8 +18,9 @@ my $csv = Text::CSV_XS->new({ binary => 1, eol => $/, }); # or Text::CSV + my $source_dir = "."; -my $target_dir = "."; +my $target_dir = "/usr/share/xt_geoip"; &Getopt::Long::Configure(qw(bundling)); &GetOptions(
geoip/xt_geoip_build.1 +5 -5
@@ -22,13 +22,13 @@ script requires it to be called with a path. .PP Options .TP \fB\-D\fP \fItarget_dir\fP -Specifies the target directory into which the files are to be put. Defaults to ".". +Specifies the target directory into which the files are to be put. +Defaults to "/usr/share/xt_geoip". .TP \fB\-S\fP \fIsource_dir\fP -Specifies the source directory from which to read the three files by the name -of \fBGeoLite2\-Country\-Blocks\-IPv4.csv\fP, -\fBGeoLite2\-Country\-Blocks\-IPv6.csv\fP and -\fBGeoLite2\-Country\-Locations\-en.csv\fP. Defaults to ".". +Specifies the source directory from which to read the file +\fBdbip-country-lite.csv\fP. +Defaults to ".". .SH Application .PP Shell commands to build the databases and put them to where they are expected:
geoip/xt_geoip_fetch +2 -1
@@ -3,6 +3,7 @@ # Utility to query GeoIP database # Copyright Philip Prindeville, 2018 # + use Getopt::Long; use Socket qw(AF_INET AF_INET6 inet_ntop); use warnings;
@@ -11,7 +12,7 @@ use strict; sub AF_INET_SIZE() { 4 } sub AF_INET6_SIZE() { 16 } -my $target_dir = "."; +my $target_dir = "/usr/share/xt_geoip"; my $ipv4 = 0; my $ipv6 = 0;
geoip/xt_geoip_fetch.1 +2 -1
@@ -15,7 +15,8 @@ further processing. .PP Options .TP \fB\-D\fP \fIdatabase_dir\fP -Specifies the directory into which the files have been put. Defaults to ".". +Specifies the directory into which the files have been put. +Defaults to "/usr/share/xt_geoip". .TP \fB-4\fP Specifies IPv4 data only.
Signature · 1 line
2.17.2
Quoted 3 lines · Philip Prindeville
Also change the default destination directory to
/usr/share/xt_geoipas most distros use this now. Update the documentation.
This would break the current expectation that an unprivileged user, using an unmodified incantation of the command, can run the program and not run into a permission error.
Maybe there are some "nicer" approaches? I'm calling for further inspirations.
Quoted 2 lines
(quoted diff) +1
-1-my $target_dir = "."; +my $target_dir = "/usr/share/xt_geoip";
Quoted 7 lines · Jan Engelhardt
Quoted 1 line · Philip Prindeville
Quoted 8 lines
Quoted 2 lines
Also change the default destination directory to
/usr/share/xt_geoipas most distros use this now. Update the documentation.This would break the current expectation that an unprivileged user, using an unmodified incantation of the command, can run the program and not run into a permission error.
Maybe there are some "nicer" approaches? I'm calling for further inspirations.
I’m open to suggestions.
We could default it to a system path only when running as root, for instance.
Quoted 3 lines
Quoted 3 lines
(quoted diff) +1
-1-my $target_dir = "."; +my $target_dir = "/usr/share/xt_geoip";
Quoted 6 lines · Philip Prindeville
Quoted 4 lines
Quoted 2 lines
Also change the default destination directory to
/usr/share/xt_geoipas most distros use this now. Update the documentation.Maybe there are some "nicer" approaches? I'm calling for further inspirations.
I’m open to suggestions.
This has been floating around my mind.
geoip/xt_geoip_build | 1 + geoip/xt_geoip_build.1 | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
geoip/xt_geoip_build +1 -0
@@ -24,6 +24,7 @@ my $target_dir = "."; &GetOptions( "D=s" => \$target_dir, "i=s" => \$input_file, + "s" => sub { $target_dir = "/usr/share/xt_geoip"; }, ); if (!-d $target_dir) {
geoip/xt_geoip_build.1 +6 -2
@@ -27,11 +27,15 @@ Specifies the target directory into which the files are to be put. Defaults to " \fB\-i\fP \fIinput_file\fP Specifies the source location of the DBIP CSV file. Defaults to "dbip-country-lite.csv". Use "-" to read from stdin. +.TP +\fB\-s\fP +"System mode". Equivalent to \fB\-D /usr/share/xt_geoip\fP. .SH Application .PP -Shell commands to build the databases and put them to where they are expected: +Shell commands to build the databases and put them to where they are expected +(usually run as root): .PP -xt_geoip_build \-D /usr/share/xt_geoip +xt_geoip_build \-s .SH See also .PP xt_geoip_dl(1)
Signature · 1 line
2.26.2
Quoted 14 lines · Jan Engelhardt
Quoted 6 lines · Philip Prindeville
Quoted 4 lines
Quoted 2 lines
Also change the default destination directory to
/usr/share/xt_geoipas most distros use this now. Update the documentation.Maybe there are some "nicer" approaches? I'm calling for further inspirations.
I’m open to suggestions.
This has been floating around my mind.
Problem with this change is that "-D foo -s” and “-s -D foo” have different semantics… Should probably make the two options mutually exclusive.
-Philip
Quoted 42 lines
geoip/xt_geoip_build | 1 +
geoip/xt_geoip_build.1 | 8 ++++++--2 files changed, 7 insertions(+), 2 deletions(-)geoip/xt_geoip_build +0
-0@@ -24,6 +24,7 @@ my $target_dir = ".";&GetOptions(
"D=s" => \$target_dir, "i=s" => \$input_file,geoip/xt_geoip_build +1
-0+ "s" => sub { $target_dir = "/usr/share/xt_geoip"; },);
if (!-d $target_dir) {
geoip/xt_geoip_build.1 +0
-0@@ -27,11 +27,15 @@ Specifies the target directory into which the files are to be put. Defaults to "\fB\-i\fP \fIinput_file\fP
Specifies the source location of the DBIP CSV file. Defaults to "dbip-country-lite.csv". Use "-" to read from stdin. +.TP
+\fB\-s\fP
+"System mode". Equivalent to \fB\-D /usr/share/xt_geoip\fP. .SH Application
.PPgeoip/xt_geoip_build.1 +2
-1-Shell commands to build the databases and put them to where they are expected: +Shell commands to build the databases and put them to where they are expected +(usually run as root):.PP
geoip/xt_geoip_build.1 +1
-1-xt_geoip_build \-D /usr/share/xt_geoip +xt_geoip_build \-s.SH See also
.PPxt_geoip_dl(1)Signature · 1 line
2.26.2