michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-04 04:10:22 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #557 from gnadelwartz/hofix-filter_chain

Browse Source 
hotfix filter chain #555
This commit is contained in:
Jamie Cameron
2017-05-10 10:49:03 -07:00
committed by GitHub
parent 41c5bd30ea f5927981a6
commit c455b93573
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firewall/config.info
View File

@@ -11,4 +11,4 @@ after_apply_cmd=Command to run after applying configuration,3,None
line1=System configuration,11
save_file=IPtables save file to edit,3,Use operating system or Webmin default
direct=Directly edit firewall rules instead of save file?,1,1-Yes,0-No
filter_chain=Comma sepeated list of regexes to filter out chains not managed by firewall,0
filter_chain=List of regexes to filter out chains not managed by firewall. You must activate "direct edit firewall rules" to use this feature,0

2
firewall/config.info.de
View File

@@ -11,4 +11,4 @@ after_apply_cmd=Befehle zum Anwendung der Konfiguration,3,Keiner
line1=System Konfiguration,11
save_file=IPtables Speicherdatei zum Bearbeiten,3,Verwendung des Betriebssystems oder Webmin Standard
direct=Direktes Bearbeiten der Firewall-Regeln anstatt von gespeicherter Datei?,1,1-Ja,0-Nein
filter_chain=Komma getrennte Liste von Regex zum Ausfiltern von Ketten die nicht von Firewall verwaltet werden,0
filter_chain=Liste von RegEx zum Ausfiltern von Ketten die nicht von Firewall verwaltet werden. Die Option "Direktes Bearbeiten der Firewall-Regeln" muss aktiv sein,0

9
firewall/firewall-lib.pl
View File

@@ -58,16 +58,13 @@ while(<FILE>) {
local $read_comment;
s/\r|\n//g;
# regex to filter out chains not managed by firewall, i.e. fail2ban
if ($config{'filter_chain'}) {
if ($config{'direct'} && $config{'filter_chain'}) {
foreach $filter (split(',', $config{'filter_chain'})) {
# :chain ... -> skip line if machtes filter_chain
if (/^.?:(\S+)\s+.*/) {
next LINE if($1 =~ /^$filter$/);
}
# NOTE: keep ":chain ..." as reference to avoid error when rebuild active config
# -A|-I chain ... -j chain -> skip line if machtes filter_chain
if (/^.?-(A|I)\s+(\S+).*\s+-j\s+(.*)/) {
next LINE if($2 =~ /^$filter$/);
next LINE if($3 =~ /^$filter$/);
#next LINE if($3 =~ /^$filter$/);
}
}
}