webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pmueller/temp-c164-development' into next

Browse Source
This commit is contained in:
Michael Tremer
2022-02-02 19:46:13 +00:00
parent fb28b637ae 0c8888da24
commit c053efdcd1
4 changed files with 90 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/164/filelists/files
View File

@@ -5,6 +5,7 @@ etc/rc.d/init.d/partresize
etc/rc.d/init.d/squid
etc/suricata/suricata.yaml
etc/sysctl.conf
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/optionsfw.cgi

1
html/cgi-bin/ids.cgi
View File

@@ -1644,7 +1644,6 @@ END
;
&Header::closebox();
}
}
#
## Function to show section for add/edit a provider.

16
src/initscripts/system/firewall
View File

@@ -141,17 +141,15 @@ iptables_init() {
# Log and drop any traffic from and to networks known as being hostile, posing
# a technical threat to our users (i. e. listed at Spamhaus DROP et al.)
iptables -N HOSTILE
if [ "$DROPHOSTILE" == "on" ]; then
iptables -N DROP_HOSTILE
iptables -A DROP_HOSTILE -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE "
iptables -A INPUT -i $IFACE -m geoip --src-cc XD -j DROP_HOSTILE
iptables -A FORWARD -i $IFACE -m geoip --src-cc XD -j DROP_HOSTILE
iptables -A FORWARD -o $IFACE -m geoip --dst-cc XD -j DROP_HOSTILE
iptables -A OUTPUT -o $IFACE -m geoip --src-cc XD -j DROP_HOSTILE
iptables -A DROP_HOSTILE -j DROP -m comment --comment "DROP_HOSTILE"
iptables -A HOSTILE -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE "
iptables -A INPUT -i $IFACE -m geoip --src-cc XD -j HOSTILE
iptables -A FORWARD -i $IFACE -m geoip --src-cc XD -j HOSTILE
iptables -A FORWARD -o $IFACE -m geoip --dst-cc XD -j HOSTILE
iptables -A OUTPUT -o $IFACE -m geoip --src-cc XD -j HOSTILE
fi
iptables -A HOSTILE -j DROP -m comment --comment "DROP_HOSTILE"
# P2PBLOCK
iptables -N P2PBLOCK

2
src/pakfire/lib/functions.pl
View File

@@ -524,13 +524,13 @@ sub dblist {
foreach $line (sort @db) {
next unless ($line =~ /.*;.*;.*;/ );
$use_color = "";
$count++;
@templine = split(/\;/,$line);
if ("$filter" eq "notinstalled") {
next if ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
} elsif ("$filter" eq "installed") {
next unless ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
}
$count++;
if ("$forweb" eq "forweb")
{
if ("$filter" eq "notinstalled") {