From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d2b54a312f520291539637ac891b874dd34ef436 Date: Wed, 08 May 2019 18:20:33 +0100 Message-ID: <20190508172034.069E584FDC0@people01.i.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9188511229386306341==" List-Id: --===============9188511229386306341== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d2b54a312f520291539637ac891b874dd34ef436 (commit) from bf62652ecfbe1331f0eef5d198b8ac6db417a4d4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d2b54a312f520291539637ac891b874dd34ef436 Author: Stefan Schantl Date: Tue May 7 19:17:16 2019 +0200 guardian: Remove snort related options. =20 IPFire has moved to suricata as IDS/IPS system, therefore all snort relat= ed options has become obsolete. =20 Signed-off-by: Stefan Schantl Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.de.pl | 4 +--- config/guardian/guardian.en.pl | 4 +--- config/guardian/guardian.tr.pl | 4 +--- html/cgi-bin/guardian.cgi | 51 +++++-----------------------------------= -- lfs/guardian | 2 +- 5 files changed, 10 insertions(+), 55 deletions(-) Difference in files: diff --git a/config/guardian/guardian.de.pl b/config/guardian/guardian.de.pl index 344d04543..c03c98525 100644 --- a/config/guardian/guardian.de.pl +++ b/config/guardian/guardian.de.pl @@ -6,7 +6,7 @@ 'guardian block httpd brute-force' =3D> 'httpd-Brute-Force-Erkennung', 'guardian block owncloud brute-force' =3D> 'Owncloud-Brute-Force-Erkennung', 'guardian block ssh brute-force' =3D> 'SSH-Brute-Force-Erkennung', -'guardian blockcount' =3D> 'Trefferschwelle (Snort)', +'guardian blockcount' =3D> 'Trefferschwelle', 'guardian blocked hosts' =3D> 'Aktuell geblockte Hosts', 'guardian blocking of this address is not allowed' =3D> 'Diese Addresse darf= nicht geblockt werden.', 'guardian blocktime' =3D> 'Blockzeit (Sekunden)', @@ -36,9 +36,7 @@ 'guardian priolevel_medium' =3D> '2 - Mittel', 'guardian priolevel_low' =3D> '3 - Niedrig', 'guardian priolevel_very_low' =3D> '4 - Sehr niedrig', -'guardian priority level' =3D> 'Priorit=C3=A4tslevel (Snort)', 'guardian service' =3D> 'Guardian-Dienst', -'guardian watch snort alertfile' =3D> 'Snort-Alarme auswerten', =20 ); =20 diff --git a/config/guardian/guardian.en.pl b/config/guardian/guardian.en.pl index f6be8654d..c94484f7e 100644 --- a/config/guardian/guardian.en.pl +++ b/config/guardian/guardian.en.pl @@ -6,7 +6,7 @@ 'guardian block httpd brute-force' =3D> 'httpd Brute Force Detection', 'guardian block owncloud brute-force' =3D> 'Owncloud Brute Force detection', 'guardian block ssh brute-force' =3D> 'SSH Brute Force Detection', -'guardian blockcount' =3D> 'Strike Threshold (Snort)', +'guardian blockcount' =3D> 'Strike Threshold', 'guardian blocked hosts' =3D> 'Currently blocked hosts', 'guardian blocking of this address is not allowed' =3D> 'Blocking of the giv= en address is not allowed.', 'guardian blocktime' =3D> 'Block Time (seconds)', @@ -36,9 +36,7 @@ 'guardian priolevel_medium' =3D> '2 - Medium', 'guardian priolevel_low' =3D> '3 - Low', 'guardian priolevel_very_low' =3D> '4 - Very low', -'guardian priority level' =3D> 'Priority Level (Snort)', 'guardian service' =3D> 'Guardian Service', -'guardian watch snort alertfile' =3D> 'Monitor Snort Alert File', =20 ); =20 diff --git a/config/guardian/guardian.tr.pl b/config/guardian/guardian.tr.pl index cb64a358d..c4d9c5aab 100644 --- a/config/guardian/guardian.tr.pl +++ b/config/guardian/guardian.tr.pl @@ -6,7 +6,7 @@ 'guardian block httpd brute-force' =3D> 'httpd kaba kuvvet alg=C4=B1lama', 'guardian block owncloud brute-force' =3D> 'Owncloud kaba kuvvet alg=C4=B1la= ma', 'guardian block ssh brute-force' =3D> 'SSH kaba kuvvet alg=C4=B1lama', -'guardian blockcount' =3D> 'Vurgu e=C5=9Fi=C4=9Fi (Snort)', +'guardian blockcount' =3D> 'Vurgu e=C5=9Fi=C4=9Fi', 'guardian blocked hosts' =3D> '=C5=9Eu anda engellenen ana makineler', 'guardian blocking of this address is not allowed' =3D> 'Verilen adresin eng= ellenmesine izin verilmiyor.', 'guardian blocktime' =3D> 'Engelleme zaman=C4=B1 (saniye)', @@ -36,9 +36,7 @@ 'guardian priolevel_medium' =3D> '2 - Orta', 'guardian priolevel_low' =3D> '3 - D=C3=BC=C5=9F=C3=BCk', 'guardian priolevel_very_low' =3D> '4 - =C3=87ok d=C3=BC=C5=9F=C3=BCk', -'guardian priority level' =3D> '=C3=96ncelik seviyesi (Snort)', 'guardian service' =3D> 'Koruyucu servisi', -'guardian watch snort alertfile' =3D> 'Snort uyar=C4=B1 dosyas=C4=B1', =20 ); =20 diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 6144aca02..36d84bb5b 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -52,7 +52,6 @@ my $ignorefile =3D'/var/ipfire/guardian/guardian.ignore'; # file locations on IPFire systems. my %module_file_locations =3D ( "HTTPD" =3D> "/var/log/httpd/error_log", - "SNORT" =3D> "/var/log/snort/alert", "SSH" =3D> "/var/log/messages", ); =20 @@ -78,7 +77,6 @@ our %ignored =3D (); $settings{'ACTION'} =3D ''; =20 $settings{'GUARDIAN_ENABLED'} =3D 'off'; -$settings{'GUARDIAN_MONITOR_SNORT'} =3D 'on'; $settings{'GUARDIAN_MONITOR_SSH'} =3D 'on'; $settings{'GUARDIAN_MONITOR_HTTPD'} =3D 'on'; $settings{'GUARDIAN_MONITOR_OWNCLOUD'} =3D ''; @@ -88,7 +86,6 @@ $settings{'GUARDIAN_BLOCKCOUNT'} =3D '3'; $settings{'GUARDIAN_BLOCKTIME'} =3D '86400'; $settings{'GUARDIAN_FIREWALL_ACTION'} =3D 'DROP'; $settings{'GUARDIAN_LOGFILE'} =3D '/var/log/guardian/guardian.log'; -$settings{'GUARDIAN_SNORT_PRIORITY_LEVEL'} =3D '3'; =20 my $errormessage =3D ''; =20 @@ -379,9 +376,6 @@ sub showMainBox() { $checked{'GUARDIAN_ENABLED'}{'on'} =3D ''; $checked{'GUARDIAN_ENABLED'}{'off'} =3D ''; $checked{'GUARDIAN_ENABLED'}{$settings{'GUARDIAN_ENABLED'}} =3D 'checked'; - $checked{'GUARDIAN_MONITOR_SNORT'}{'off'} =3D ''; - $checked{'GUARDIAN_MONITOR_SNORT'}{'on'} =3D ''; - $checked{'GUARDIAN_MONITOR_SNORT'}{$settings{'GUARDIAN_MONITOR_SNORT'}} =3D= "checked=3D'checked'"; $checked{'GUARDIAN_MONITOR_SSH'}{'off'} =3D ''; $checked{'GUARDIAN_MONITOR_SSH'}{'on'} =3D ''; $checked{'GUARDIAN_MONITOR_SSH'}{$settings{'GUARDIAN_MONITOR_SSH'}} =3D "ch= ecked=3D'checked'"; @@ -394,7 +388,6 @@ sub showMainBox() { =20 $selected{'GUARDIAN_LOG_FACILITY'}{$settings{'GUARDIAN_LOG_FACILITY'}} =3D = 'selected'; $selected{'GUARDIAN_LOGLEVEL'}{$settings{'GUARDIAN_LOGLEVEL'}} =3D 'selecte= d'; - $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{$settings{'GUARDIAN_SNORT_PRIORI= TY_LEVEL'}} =3D 'selected'; $selected{'GUARDIAN_FIREWALL_ACTION'}{$settings{'GUARDIAN_FIREWALL_ACTION'}= } =3D 'selected'; =20 &Header::openpage($Lang::tr{'guardian configuration'}, 1, ''); @@ -447,19 +440,6 @@ sub showMainBox() { \$("#GUARDIAN_LOG_FACILITY").change(update_options); \$("#GUARDIAN_LOGLEVEL").change(update_options); update_options(); - - // Show / Hide snort priority level option, based if - // snort is enabled / disabled. - if (\$('input[name=3DGUARDIAN_MONITOR_SNORT]:checked').val() =3D=3D 'on')= { - \$('.GUARDIAN_SNORT_PRIORITY_LEVEL').show(); - } else { - \$('.GUARDIAN_SNORT_PRIORITY_LEVEL').hide(); - } - - // Show/Hide snort priority level when GUARDIAN_MONITOR_SNORT get changed. - \$('input[name=3DGUARDIAN_MONITOR_SNORT]').change(function() { - \$('.GUARDIAN_SNORT_PRIORITY_LEVEL').toggle(); - }); }); END @@ -533,12 +513,6 @@ END
=20 - - $Lang::tr{'guardian watch snort alertfi= le'} - on / - off - - $Lang::tr{'guardian block ssh brute-for= ce'} on / @@ -580,17 +554,15 @@ END =20 - +
=20 - - $Lang::tr{'guardian priority level'}: - + + =20 $Lang::tr{'guardian blockcount'}: @@ -602,12 +574,6 @@ END =20 - $Lang::tr{'guardian firewallaction'}: - - $Lang::tr{'guardian blocktime'}: @@ -977,11 +943,6 @@ sub BuildConfiguration() { =20 # Module settings. print FILE "\n# Module settings.\n"; - # Check if SNORT is enabled and add snort priority. - if ($settings{'GUARDIAN_MONITOR_SNORT'} eq "on") { - print FILE "SnortPriorityLevel =3D $settings{'GUARDIAN_SNORT_PRIORITY_LEVE= L'}\n"; - } - close(FILE); =20 # Generate ignore file. diff --git a/lfs/guardian b/lfs/guardian index 2eaf77212..d84ca64f3 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -33,7 +33,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) =20 PROG =3D guardian -PAK_VER =3D 15 +PAK_VER =3D 16 =20 DEPS =3D "perl-inotify2 perl-Net-IP" =20 hooks/post-receive -- IPFire 2.x development tree --===============9188511229386306341==--