From patchwork Wed Jan 10 14:38:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7444 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9mq44r7Cz3wmD for ; Thu, 11 Jan 2024 14:13:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4T9mq12nFxz1D3; Thu, 11 Jan 2024 14:13:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9mq04CL1z32h2; Thu, 11 Jan 2024 14:13:16 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T99R01zD8z2xDH for ; Wed, 10 Jan 2024 14:38:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4T99Qv6PyrzLW; Wed, 10 Jan 2024 14:38:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1704897528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LVwXkhs1GQvB8RM+zo2vKaFtRp6YoN84By8rji6gsCk=; b=QCqY2VlDNhEMlP2eN3+xrx192nv5FPFf6o3ozbY3jdAbXH0uOlAkt8cwdxTN+gY4KSxNsb 4maDxSb1DJoivPBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1704897528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LVwXkhs1GQvB8RM+zo2vKaFtRp6YoN84By8rji6gsCk=; b=Kba0FYcmK0C7pEhL7o+A/4vIonwXoF+i5WSSBQX4LqVGP+w+9rzJdJ/NS8RTSbV5s9g+vt y/Tl2nEDmbI/XpZ9pvxZ5qLkF+gyR66pq9d3VlVefCtc6habYUmeZhGfUIKXGUTkW8oG3Q NiR2Vvs5uT4U+XAxvnKPjAl5OBFFSX/1ww2qsxh0GpIeYuI6X5WgAkQZls22Iwfg1G9+iE mKdUUGLWxw5XPoGLV8Q3kO5VloRX2merP/3tK+7m4Y0Ak484PVCfSdj16sLrLPyA2UJiAu IgZypnX9DTflk2hw7rH3MeiaD50tAbXkpvw1q4fi3Ot0tasuLECA8wWQKx7FrA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 1/4] optionsfw.cgi: Fix bug12981 - Add option to log or not log dropped hostile traffic Date: Wed, 10 Jan 2024 15:38:42 +0100 Message-ID: <20240110143845.12957-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 3DII55VJ3MDHD47G7F7UKSEGDL6IIVPJ X-Message-ID-Hash: 3DII55VJ3MDHD47G7F7UKSEGDL6IIVPJ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Added option with drop hostile section to decide if the dropped traffic should be logged or not. Fixes: bug12981 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/optionsfw.cgi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index fbff67b2f..a2a0058f7 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -94,6 +94,9 @@ if (!$settings{'DROPSPOOFEDMARTIAN'}) { if (!$settings{'DROPHOSTILE'}) { $settings{'DROPHOSTILE'} = 'off'; } +if (!$settings{'LOGDROPHOSTILE'}) { + $settings{'LOGDROPHOSTILE'} = 'on'; +} if (!$settings{'LOGDROPCTINVALID'}) { $settings{'LOGDROPCTINVALID'} = 'on'; } @@ -125,6 +128,9 @@ $checked{'DROPSPOOFEDMARTIAN'}{$settings{'DROPSPOOFEDMARTIAN'}} = "checked='chec $checked{'DROPHOSTILE'}{'off'} = ''; $checked{'DROPHOSTILE'}{'on'} = ''; $checked{'DROPHOSTILE'}{$settings{'DROPHOSTILE'}} = "checked='checked'"; +$checked{'LOGDROPHOSTILE'}{'off'} = ''; +$checked{'LOGDROPHOSTILE'}{'on'} = ''; +$checked{'LOGDROPHOSTILE'}{$settings{'LOGDROPHOSTILE'}} = "checked='checked'"; $checked{'LOGDROPCTINVALID'}{'off'} = ''; $checked{'LOGDROPCTINVALID'}{'on'} = ''; $checked{'LOGDROPCTINVALID'}{$settings{'LOGDROPCTINVALID'}} = "checked='checked'"; @@ -279,6 +285,13 @@ END $Lang::tr{'off'} + + $Lang::tr{'log drop hostile'} + + $Lang::tr{'on'} / + $Lang::tr{'off'} + +
From patchwork Wed Jan 10 14:38:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7445 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9mq850bDz3wmD for ; Thu, 11 Jan 2024 14:13:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4T9mq73Yhbz2Qr; Thu, 11 Jan 2024 14:13:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9mq72bFRz2yNY; Thu, 11 Jan 2024 14:13:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T99R02D4Pz32h2 for ; Wed, 10 Jan 2024 14:38:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4T99Qx0CW3z1kZ; Wed, 10 Jan 2024 14:38:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1704897529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCw49O5t9V2LOIqMmgrBTcO2r91b9MdoC6euxPj3yUU=; b=DlOGi8ZzldwONEZ/zgqhhcjbZYCo50AEHhas2qdB6J4VZIepKxgJLNP/R3cA1O6sie5egz u+02ajNPUKISAPDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1704897529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCw49O5t9V2LOIqMmgrBTcO2r91b9MdoC6euxPj3yUU=; b=EbjRGdiACBHxdVeXnpa++0wUnjekRrhA0YZ2WEXgZTtgPPSAYqdDl+VtZORUQRT/rceB/c 1SwrdLA+D0kgEF9PDX9WYoliDXrvB+ojxtDkmSo7v2Sa/5sNl95s6csk+4CY0Ngu/udDff loVyhoxagdNyChlnC/p03I4xWFxwYZ5fki21q9TgiEfDS0ijR7MkjBYIU0yqDGgKgQSZTX qjVKaXWi8nGLg6OL/AsWUeAn8pjNqn+Ty5SolzDWQO2jlwIftweAc5Nxeh+Hbi+rID1oE2 mI3FJO0zZXyGmnWaXzZcgEFhIuPNI8w4D+WcQeFTm/IkKSz8G6dgH6F3nCfWhA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 2/4] firewall: Fixes bug12981 - add if loop to log or not log dropped hostile traffic Date: Wed, 10 Jan 2024 15:38:43 +0100 Message-ID: <20240110143845.12957-2-adolf.belka@ipfire.org> In-Reply-To: <20240110143845.12957-1-adolf.belka@ipfire.org> References: <20240110143845.12957-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: VMQSGQVP663OJ3JY7GRQTWEOF3QHAVOT X-Message-ID-Hash: VMQSGQVP663OJ3JY7GRQTWEOF3QHAVOT X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: <> List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Dependent on the choice in optionsfw.cgi this loop will either log or not log the dropped hostile traffic. Fixes: bug12981 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- src/initscripts/system/firewall | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 50f2b3e02..352ae2496 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -177,7 +177,9 @@ iptables_init() { iptables -A OUTPUT -j HOSTILE iptables -N HOSTILE_DROP - iptables -A HOSTILE_DROP -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE " + if [ "$LOGDROPHOSTILE" == "on" ]; then + iptables -A HOSTILE_DROP -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE " + fi iptables -A HOSTILE_DROP -j DROP -m comment --comment "DROP_HOSTILE" # IP Address Blocklist chains From patchwork Wed Jan 10 14:38:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7443 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9lVw4jNSz3wdf for ; Thu, 11 Jan 2024 13:14:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4T9lVm0PL2z1wp; Thu, 11 Jan 2024 13:14:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9lVl6Zntz2yX3; Thu, 11 Jan 2024 13:14:07 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T99R02s16z32h3 for ; Wed, 10 Jan 2024 14:38:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4T99Qx6C0tz2KC; Wed, 10 Jan 2024 14:38:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1704897529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bBJIVy/m5q0GRnLyif5BHmhX/p9HwgrQriqlRI+9Vzg=; b=7REqoONgsHn2SxlP8RiT7Lh0L0WzpS7Yl43SShI15pOnlXJKaIj3YuNhJdyOI8eQ2KDgCR +6NX+0LMXoZianBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1704897529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bBJIVy/m5q0GRnLyif5BHmhX/p9HwgrQriqlRI+9Vzg=; b=Dgv8pdsiTv+eNp7hAdedZpm+t/CVoMJdKEJRmrVb+7pAvSK/3U2mgGvKoNZpYpu5Cj8WWX 9q1renIF6uiYn7qqsDdSETnL3dgHDPguwg968SpQ9Z2rJQKCZLWlq51Q3x2LiTVvEtimN7 UxUZyzgGa2f0qq9IJoTITt9w8RGZX+ScbxL+iIyQmfYT6Xal07n9BWZRflLqo1zEG2Y6Yr 76YlbFS9+ZeMqTliQb2DwdDSQITMNHXrPdue4Hq3kFoskG9YkxOmAi10SNNMAI1BRXkMdq eo13WcOLk9ZawBiUUFTNn47Pr+MeKF7kBAPvj/QBqDiwwQuQVdkmtiLq5YApzg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 3/4] en.pl: Fixes bug12981 - adds english language input for choice of drop hostile logging Date: Wed, 10 Jan 2024 15:38:44 +0100 Message-ID: <20240110143845.12957-3-adolf.belka@ipfire.org> In-Reply-To: <20240110143845.12957-1-adolf.belka@ipfire.org> References: <20240110143845.12957-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 7LYKIK5NO2EOPP6BZBURLEGKVIHQBWVH X-Message-ID-Hash: 7LYKIK5NO2EOPP6BZBURLEGKVIHQBWVH X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Fixes: bug12981 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 8 ++++++++ langs/en/cgi-bin/en.pl | 1 + 11 files changed, 18 insertions(+) diff --git a/doc/language_issues.de b/doc/language_issues.de index 4fd5a0819..cb8e5b16d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -929,6 +929,7 @@ WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: optional = Optional diff --git a/doc/language_issues.en b/doc/language_issues.en index b4327cb78..0fc63ca96 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1247,6 +1247,7 @@ WARNING: untranslated string: locationblock country is allowed = Incoming traffi WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: WARNING: untranslated string: log = Log +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log lines per page = Lines per page WARNING: untranslated string: log server address = Syslog server: diff --git a/doc/language_issues.es b/doc/language_issues.es index 45ffdf5d7..eca4efa68 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -991,6 +991,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: no data = unknown string WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired diff --git a/doc/language_issues.fr b/doc/language_issues.fr index cacfb1ec6..a4fca67ea 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -947,6 +947,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. diff --git a/doc/language_issues.it b/doc/language_issues.it index 68ff12c86..63d1aee15 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1159,6 +1159,7 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE diff --git a/doc/language_issues.nl b/doc/language_issues.nl index d1a637215..85086e48d 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1166,6 +1166,7 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 893f73211..8fd00f03a 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1315,6 +1315,7 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: mac filter = MAC filter diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 64c9b5095..05fac8a9e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1313,6 +1313,7 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: mac filter = MAC filter diff --git a/doc/language_issues.tr b/doc/language_issues.tr index eadbd33c7..e0b04e947 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1089,6 +1089,7 @@ WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address +WARNING: untranslated string: log drop hostile = Log dropped packets from and to hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: meltdown = Meltdown WARNING: untranslated string: mitigated = Mitigated diff --git a/doc/language_missings b/doc/language_missings index 28ae29c2b..cfa9ee461 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -66,6 +66,7 @@ < ipsec invalid ip address or fqdn for rw endpoint < ipsec roadwarrior endpoint < link-layer encapsulation +< log drop hostile < netbios nameserver daemon < no entries < notes @@ -115,6 +116,7 @@ < extrahd not mounted < hardware vulnerabilities < invalid ip or hostname +< log drop hostile < openvpn cert expires soon < openvpn cert has expired < reiserfs warning1 @@ -138,6 +140,7 @@ < extrahd not mounted < g.dtm < g.lite +< log drop hostile < reiserfs warning1 < reiserfs warning2 < spec rstack overflow @@ -464,6 +467,7 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile < log dropped conntrack invalids < log server protocol < masquerade blue @@ -985,6 +989,7 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile < log dropped conntrack invalids < log server protocol < masquerade blue @@ -1819,6 +1824,7 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile < log dropped conntrack invalids < log server protocol < mac filter @@ -2812,6 +2818,7 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile < log dropped conntrack invalids < log server protocol < mac filter @@ -3368,6 +3375,7 @@ < legacy architecture warning < link-layer encapsulation < local ip address +< log drop hostile < log dropped conntrack invalids < meltdown < mitigated diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 16a3061b4..4731613b2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1686,6 +1686,7 @@ 'locationblock enable feature' => 'Enable Location based blocking:', 'locationblock flag' => 'Flag', 'log' => 'Log', +'log drop hostile' => 'Log dropped packets from and to hostile networks', 'log dropped conntrack invalids' => 'Log dropped packets classified as INVALID by connection tracking', 'log enabled' => 'Log Enabled', 'log level' => 'Log Level', From patchwork Wed Jan 10 14:38:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7442 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9lVr1V84z3wdf for ; Thu, 11 Jan 2024 13:14:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4T9lVk2b9wz1k6; Thu, 11 Jan 2024 13:14:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9lVk1wxJz2xcr; Thu, 11 Jan 2024 13:14:06 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T99R05c1Wz32h5 for ; Wed, 10 Jan 2024 14:38:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4T99Qy2zb8z2P1; Wed, 10 Jan 2024 14:38:50 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1704897530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSff+H6gwKLqN8/VnNTAjoirovxKyxUYlKEOSHO2OyU=; b=14KP8VsgUky71ug/vSJxNmTg3yxOjkc9VKqEf0gHP1lyFX/q2gKRgMKTysaOJNFOcYehMJ 8JZ1hzPva+jSq9AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1704897530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSff+H6gwKLqN8/VnNTAjoirovxKyxUYlKEOSHO2OyU=; b=HSYnheHEu+iUDCDrB+XrByNCnMocmXoq1mIIvkUIHQMZGD+j8EzCY51DktrH5eLvsbMBSs nKBJ00a/TRRqU++PRgY/06b46G/UDbKkm1emwA/J0/s7icUU9ps7fHj60TM/trZAuKiCKB KyOZIH8rq9g7+LNk8f6FdA8LHrZwkas4EjE0Qm3F+ODKU0DdIwDn4VBKq7NK8iQGVOvgg7 XVj73lnfbPit1GOgOGrSPl/SnEfMXoHXUrflz+aWJP5c+2pRrIPXMkOosDIA0e7OqxjrWi fUAelSOW7fTGq8c9JdrepjzXOI3t0RiX0Wn8i9A7DMKi43xQLDhq8DrFkZiSFw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 4/4] optionsfw.cgi: Move Logging section to after all Firewall Options Drop commands Date: Wed, 10 Jan 2024 15:38:45 +0100 Message-ID: <20240110143845.12957-4-adolf.belka@ipfire.org> In-Reply-To: <20240110143845.12957-1-adolf.belka@ipfire.org> References: <20240110143845.12957-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: GWWYRP43PQ5KYNV5KND3MQ737YZS3U7P X-Message-ID-Hash: GWWYRP43PQ5KYNV5KND3MQ737YZS3U7P X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Moved the Logging section to after all Firewall Options Drop commands as discussed at January 2024 Video Call. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/optionsfw.cgi | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index a2a0058f7..6f80f1901 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -218,6 +218,29 @@ END
+ + + + + + + + +
$Lang::tr{'fw red'}
$Lang::tr{'drop hostile'} + $Lang::tr{'on'} / + $Lang::tr{'off'} +
+
+ + + + + +
$Lang::tr{'fw blue'}
$Lang::tr{'drop proxy'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop samba'}$Lang::tr{'on'} / + $Lang::tr{'off'}
+
+ @@ -295,28 +318,6 @@ END
$Lang::tr{'fw logging'}

- - - - - - - - -
$Lang::tr{'fw red'}
$Lang::tr{'drop hostile'} - $Lang::tr{'on'} / - $Lang::tr{'off'} -
-
- - - - - -
$Lang::tr{'fw blue'}
$Lang::tr{'drop proxy'}$Lang::tr{'on'} / - $Lang::tr{'off'}
$Lang::tr{'drop samba'}$Lang::tr{'on'} / - $Lang::tr{'off'}
-
$Lang::tr{'fw settings'}
$Lang::tr{'fw settings color'}$Lang::tr{'on'} /