From patchwork Sun Jan 21 11:45:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7478 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 4THs4p0FjHz3xPl for ; Sun, 21 Jan 2024 11:46:18 +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 4THs4k6DG1z2s7; Sun, 21 Jan 2024 11:46:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4THs4k4W0Bz303X; Sun, 21 Jan 2024 11:46:14 +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 4THs4W663nz303c for ; Sun, 21 Jan 2024 11:46:03 +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 4THs4W4cnnzFD; Sun, 21 Jan 2024 11:46:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1705837563; 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=gzi6SkG5AIJNQ3Wv3ZVFFfJM5WrWgJcSYcpUQbaJ/SM=; b=jHcFgPPLcLuhxkUxuKRbL4nW3gQMixkiQK0+7wuIjINe9/thFD5lqYlDCzgX44zuBc00Yp 9QtbWuUCYRtathAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1705837563; 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=gzi6SkG5AIJNQ3Wv3ZVFFfJM5WrWgJcSYcpUQbaJ/SM=; b=r1JkIJVq8zCHk0X+LxYrCBTsxcYekeKvQqosVL8x1jcgOm0DTrnlIcOViqtf7Sa/InAntz /Mr/XOPoZ/Z7y1wFXwy0xHKJAriR7oBzkdGgaC7Tm7PPWGYNzgXIfaGyb+01Ub51ej8xnw gJTl6cmYpQ3Ytl+4GWn2rsTQvYek1OznbHbVAplKMeOfh0g1gKUlJQ4ExuccGjPGEaD42B 0x+hAaE9Qgg3R8cgehpOa86gc9jt27NjnsaAxX9j2QmDJBHGmoYLuPrfU52xPq+POs+oBn N6ljXgsolhAahLEa1/qT1hYOwMOk9pj39ZGp2K5EL1szJcNNYb79/kjnBxplJw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v3 7/7] optionsfw.cgi: Move Firewall Options Drop commands to before the logging section Date: Sun, 21 Jan 2024 12:45:53 +0100 Message-ID: <20240121114553.5182-7-adolf.belka@ipfire.org> In-Reply-To: <20240121114553.5182-1-adolf.belka@ipfire.org> References: <20240121114553.5182-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: ZUMVJD4W4R4MODGS7ZAA4HK6GTLURNCZ X-Message-ID-Hash: ZUMVJD4W4R4MODGS7ZAA4HK6GTLURNCZ 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 Firewall Options Drop commands to before the logging section, as discussed at January 2024 Video Call. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/optionsfw.cgi | 47 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 52ac1b01e..60b1bdd91 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -224,6 +224,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'}
+
+ @@ -308,28 +331,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'} /