h3xx
/
you-dont-need-pihole
mirror of https://codeberg.org/h3xx/you-dont-need-pihole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: h3xx:dc38b1a3764030d5f8a02db46abeb7446cc4c7b0
Branches Tags
h3xx:main
h3xx:v0.2.0
h3xx:v0.1.0
...
compare: h3xx:85d9a5feca07ede379ef69a06865f3e7a1d71970
Branches Tags
h3xx:main
h3xx:v0.2.0
h3xx:v0.1.0

4 Commits
dc38b1a376 ... 85d9a5feca

Author SHA1 Message Date
Dan Church 85d9a5feca
Configure Getopt::Long with better options 2024-04-22 10:17:45 -05:00
Dan Church 7d9188c6fa
Require Perl 5.12 
Fix some postfix 'if' statements too.
 2023-09-04 10:50:30 -05:00
Dan Church 133b271208
Combine GetOpt::Long options 2023-09-04 10:08:36 -05:00
Dan Church 41ba29d218
Remove Perl 4 sigils (PBP) 2023-09-04 10:08:00 -05:00
1 changed files with 25 additions and 17 deletions
Show Stats Expand all files Collapse all files

42
make-block.pl
View File

@ -13,10 +13,10 @@
# You may NOT use this software for commercial purposes. # You may NOT use this software for commercial purposes.
############################################################################### ###############################################################################
use strict; use 5.012;
use warnings; use warnings;
use Getopt::Long qw/ GetOptions :config no_ignore_case /; use Getopt::Long qw/ GetOptions :config bundling no_getopt_compat no_ignore_case /;
use FindBin qw//; use FindBin qw//;
my %domains; my %domains;
@ -25,16 +25,18 @@ my $skip = 0;
my $removed_allowed = 0; my $removed_allowed = 0;
sub add_domain_list { sub add_domain_list {
my $file = shift; my $file = shift;
foreach my $line (&read_stripped($file)) { foreach my $line (read_stripped($file)) {
my $domain = lc $line; my $domain = lc $line;
++$dupes if defined $domains{$domain}; if (defined $domains{$domain}) {
++$dupes;
}
$domains{$domain} = 1; $domains{$domain} = 1;
} }
} }
sub add_host_file { sub add_host_file {
my $file = shift; my $file = shift;
foreach my $line (&read_stripped($file)) { foreach my $line (read_stripped($file)) {
my @parts = split /\s+/, $line; my @parts = split /\s+/, $line;
die "Malformed line in $file: $line; @parts" die "Malformed line in $file: $line; @parts"
unless @parts > 1; unless @parts > 1;
@ -47,7 +49,9 @@ sub add_host_file {
next; next;
} }
my $domain = lc $parts[1]; my $domain = lc $parts[1];
++$dupes if defined $domains{$domain}; if (defined $domains{$domain}) {
++$dupes;
}
$domains{$domain} = 1; $domains{$domain} = 1;
} }
} }
@ -71,11 +75,9 @@ MAIN: {
my $block_ip = '0.0.0.0 ::'; my $block_ip = '0.0.0.0 ::';
my $workdir = $FindBin::RealBin; my $workdir = $FindBin::RealBin;
unless (&GetOptions( unless (GetOptions(
'out=s' => \$out, 'out|O=s' => \$out,
'O=s' => \$out, 'block-ip|i=s' => \$block_ip,
'i=s' => \$block_ip,
'block-ip=s' => \$block_ip,
)) { )) {
exit 2; exit 2;
} }
@ -85,16 +87,16 @@ MAIN: {
my @allow_lists = glob "$workdir/allowlists/*.domains"; my @allow_lists = glob "$workdir/allowlists/*.domains";
foreach my $listfile (@domain_lists) { foreach my $listfile (@domain_lists) {
&add_domain_list($listfile); add_domain_list($listfile);
} }
foreach my $hostfile (@hosts_lists) { foreach my $hostfile (@hosts_lists) {
&add_host_file($hostfile); add_host_file($hostfile);
} }
# Apply allowlists # Apply allowlists
my @allow_domains; my @allow_domains;
foreach my $allowlist (@allow_lists) { foreach my $allowlist (@allow_lists) {
push @allow_domains, &read_stripped($allowlist); push @allow_domains, read_stripped($allowlist);
} }
my $before = %domains; my $before = %domains;
delete %domains{@allow_domains}; delete %domains{@allow_domains};
@ -119,7 +121,13 @@ MAIN: {
printf STDERR "%d domains written to %s from\n", $written, $out // 'STDOUT'; printf STDERR "%d domains written to %s from\n", $written, $out // 'STDOUT';
printf STDERR " - %d .domains files\n", (scalar @domain_lists); printf STDERR " - %d .domains files\n", (scalar @domain_lists);
printf STDERR " - %d .hosts files\n", (scalar @hosts_lists); printf STDERR " - %d .hosts files\n", (scalar @hosts_lists);
printf STDERR "(%d duplicates)\n", $dupes if $dupes; if ($dupes) {
printf STDERR "(%d domains removed via allowlist)\n", $removed_allowed if $removed_allowed; say STDERR "($dupes duplicates)";
printf STDERR "(%d skipped)\n", $skip if $skip; }
if ($removed_allowed) {
say STDERR "($removed_allowed domains removed via allowlist)";
}
if ($skip) {
say STDERR "($skip skipped)";
}
} }