From patchwork Mon Feb 14 19:03:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 5162 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4JyDBr5NBrz3wsl for ; Mon, 14 Feb 2022 19:03: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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4JyDBp4pCCz3Yn; Mon, 14 Feb 2022 19:03:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4JyDBp4H1Wz2yWd; Mon, 14 Feb 2022 19:03: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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4JyDBn5DTjz2y3N for ; Mon, 14 Feb 2022 19:03:13 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4JyDBn0R6Yz1TX; Mon, 14 Feb 2022 19:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1644865393; 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=Uuo/NS/1lHUhnvhM5tld4YIxSV1y5qKOilrhnwLJF40=; b=ApepXsU9V/f4RLnV/j4QAHiOq6l6VAs/muFA2iCY46R2bm0f3TFlqcfA/hZ+PRm2IzoNcv aQ2+FGN62A+hd61f4AvHYVm3Sz7VQb0H9FqVGjLzXFXxWN5hClYb11Bi+/h9VX2JJ9eS25 RwSPO+J0VZ3zlTxsPjyZekr3VR8vkrAZ0iRBrzGXpdMRAr9MqE6DJUtnYoh2yK+NB7CSUV ipuq/thjyYmCCA9HOjXkgkrZHvQrZ2FBBt0pgr/nkCeGAF+F7QKWYuEvCl7dqeiLhncQMT 4OX4BriJ8CzokusWB3jovj4OPPVQAuyhP/ZKY2uHSW4GAGoRAFJaZJbeC0KOog== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1644865393; 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=Uuo/NS/1lHUhnvhM5tld4YIxSV1y5qKOilrhnwLJF40=; b=w5+4pLFgp6681aO3RwgRsaepRmZAKdVuHzfFn4UepkoBUEFiZjbSWTN0elkz808cQuxq6Z HQCMH1sAZuWSAoBg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/4] firewall: Drop support for blocking P2P protocols. Date: Mon, 14 Feb 2022 20:03:04 +0100 Message-Id: <20220214190307.4086-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The main P2P (peer-to-peer) aera has passed for several year now, so this kind of feature is realy out-dated. The feature only supports a handfull of P2P protocols (mostly unencrypted) for applications, which have been superseeded by various other applications and protocols. So, this fairly is not longer required and safely can be dropped. Signed-off-by: Stefan Schantl Acked-by: Peter Müller Acked-by: Michael Tremer --- config/firewall/rules.pl | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 9d280045a..fea6874a4 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -70,12 +70,9 @@ my %locationsettings = ( "LOCATIONBLOCK_ENABLED" => "off" ); -my @p2ps=(); - my $configfwdfw = "${General::swroot}/firewall/config"; my $configinput = "${General::swroot}/firewall/input"; my $configoutgoing = "${General::swroot}/firewall/outgoing"; -my $p2pfile = "${General::swroot}/firewall/p2protocols"; my $locationfile = "${General::swroot}/firewall/locationblock"; my $configgrp = "${General::swroot}/fwhosts/customgroups"; my $netsettings = "${General::swroot}/ethernet/settings"; @@ -125,9 +122,6 @@ sub main { &buildrules(\%configfwdfw); } - # Load P2P block rules. - &p2pblock(); - # Load Location block rules. &locationblock(); @@ -620,23 +614,6 @@ sub time_convert_to_minutes { return ($hrs * 60) + $min; } -sub p2pblock { - open(FILE, "<$p2pfile") or die "Unable to read $p2pfile"; - my @protocols = (); - foreach my $p2pentry () { - my @p2pline = split(/\;/, $p2pentry); - next unless ($p2pline[2] eq "off"); - - push(@protocols, "--$p2pline[1]"); - } - close(FILE); - - run("$IPTABLES -F P2PBLOCK"); - if (@protocols) { - run("$IPTABLES -A P2PBLOCK -m ipp2p @protocols -j DROP"); - } -} - sub locationblock { # Flush iptables chain. run("$IPTABLES -F LOCATIONBLOCK"); From patchwork Mon Feb 14 19:03:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 5163 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4JyDC94LyTz3wsl for ; Mon, 14 Feb 2022 19:03:33 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4JyDC85YRGz3vs; Mon, 14 Feb 2022 19:03:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4JyDC85MBBz2ywH; Mon, 14 Feb 2022 19:03:32 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4JyDC71sh7z2xLr for ; Mon, 14 Feb 2022 19:03:31 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4JyDC66HSNz2Nq; Mon, 14 Feb 2022 19:03:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1644865411; 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=LusZYnx7HA6B2wBFqruNdS1VsnOnunHwGdaSbb4FqKU=; b=ox0X/jvA08PfaccIoXoFyXv4rAG1Ac0GxNfo1gthq0MUk/8pWK1SWscgnvgCK+PstehUy+ ab9uQC63qnKQPGBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1644865411; 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=LusZYnx7HA6B2wBFqruNdS1VsnOnunHwGdaSbb4FqKU=; b=Sgp96DItgb03/DON05msskmoKEQRbU5MvJepu44FKABIE2QakFhZXJl9EOt0nDmPWECXxt Z4hX7DPx9rdwtHrMr/NEOoyHNQtm6kHeB1rAZQKOg+SfznnCnAUFaoxpLZ253GoB6fxKVk P4RrA6FO4m7zUAJjj313mh/9EKfRYCpP0HBeaO3VPgJgzXxqIr+QYy15ExFSY4ySCzB62c An8QXZF0O1b3HnuzYQlTofQoloP7fBMaApxnXoZryQD8GtnfLQq8mzTuojXpxF5/sk4n61 xEiA4wqgQXKSmDyFwG0u+9ck5IWLzK5iGpo2sbR3h4I9ko2MDdOsjE9N3gZfkg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/4] configroot: Drop config file for p2protocols. Date: Mon, 14 Feb 2022 20:03:05 +0100 Message-Id: <20220214190307.4086-2-stefan.schantl@ipfire.org> In-Reply-To: <20220214190307.4086-1-stefan.schantl@ipfire.org> References: <20220214190307.4086-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The support for creating P2P based rules has been removed from the firewall. So this file is not longer needed. Signed-off-by: Stefan Schantl Reviewed-by: Peter Müller Acked-by: Michael Tremer --- config/firewall/p2protocols | 9 --------- config/rootfiles/common/configroot | 1 - lfs/configroot | 1 - 3 files changed, 11 deletions(-) delete mode 100644 config/firewall/p2protocols diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols deleted file mode 100644 index d8998095c..000000000 --- a/config/firewall/p2protocols +++ /dev/null @@ -1,9 +0,0 @@ -Applejuice;apple;on; -Ares;ares;on; -Bittorrent;bit;on; -DirectConnect;dc;on; -Edonkey;edk;on; -Gnutella;gnu;on; -KaZaA;kazaa;on; -SoulSeek;soul;on; -WinMX;winmx;on; diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 904c718c3..fef5ffbcf 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -63,7 +63,6 @@ var/ipfire/firewall #var/ipfire/firewall/input #var/ipfire/firewall/locationblock #var/ipfire/firewall/outgoing -#var/ipfire/firewall/p2protocols #var/ipfire/firewall/settings var/ipfire/fwhosts #var/ipfire/fwhosts/customgroups diff --git a/lfs/configroot b/lfs/configroot index 9f3188aab..b836767c1 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -105,7 +105,6 @@ $(TARGET) : cp $(DIR_SRC)/config/firewall/convert-outgoingfw /usr/sbin/convert-outgoingfw cp $(DIR_SRC)/config/firewall/convert-dmz /usr/sbin/convert-dmz cp $(DIR_SRC)/config/firewall/convert-portfw /usr/sbin/convert-portfw - cp $(DIR_SRC)/config/firewall/p2protocols $(CONFIG_ROOT)/firewall/p2protocols cp $(DIR_SRC)/config/firewall/firewall-policy /usr/sbin/firewall-policy cp $(DIR_SRC)/config/fwhosts/icmp-types $(CONFIG_ROOT)/fwhosts/icmp-types cp $(DIR_SRC)/config/fwhosts/customservices $(CONFIG_ROOT)/fwhosts/customservices From patchwork Mon Feb 14 19:03:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 5164 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4JyDCC5CMYz3xgD for ; Mon, 14 Feb 2022 19:03:35 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4JyDC92rJYz4jy; Mon, 14 Feb 2022 19:03:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4JyDC866f3z30H2; Mon, 14 Feb 2022 19:03:32 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4JyDC75NSdz2xLr for ; Mon, 14 Feb 2022 19:03:31 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4JyDC720Xcz3gG; Mon, 14 Feb 2022 19:03:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1644865411; 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=srkULnAdgD9eTy+p8KLFR1vZP2/H0Xvs5Gbv/n66qnw=; b=xp+ebL8hloMQHdkOsZUHGFQm32fmwK2a9aOr5Lpu8hT/RBRqJO95yKUcuL9V1dfose9BM6 2uPLKDNGVb1raRAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1644865411; 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=srkULnAdgD9eTy+p8KLFR1vZP2/H0Xvs5Gbv/n66qnw=; b=AOKtFuQjPwst/6EDAnq/paCc3JX7MclRfUP4JbxqVF1nPb9sDmwrA8PcIRJ7dN5x7baI68 Va6NoMDo7gNpEiyT/8AktCJMVoAsXdG7m8OR1Ne8J/JmoRj6bzapOcPeCJNGs3oWUYkWNY Iz0Ech0NeVTH9VfH5LqGCe7xyEoKTi32JxWkmO6dotwzo+EjC96fPmaatvrbEnc/izxHQ2 9iCZxfBcKg/0LFM9/7GYDq/7WwYIikmnDew8OHbTrqPSjNzoz+FlAMKORkIhsCda0+BSZi 6o5AcSd+TzD+d122uIOsk0fUFd2njOZ62sra3mqrwIs9AnloiCJwJ5M8XpZbvw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 3/4] p2p-block.cgi: Drop CGI. Date: Mon, 14 Feb 2022 20:03:06 +0100 Message-Id: <20220214190307.4086-3-stefan.schantl@ipfire.org> In-Reply-To: <20220214190307.4086-1-stefan.schantl@ipfire.org> References: <20220214190307.4086-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The support for creating P2P based rules has been removed from the firewall. So this CGI file is not longer needed. Signed-off-by: Stefan Schantl Reviewed-by: Peter Müller Acked-by: Michael Tremer --- config/rootfiles/common/web-user-interface | 1 - html/cgi-bin/p2p-block.cgi | 154 --------------------- 2 files changed, 155 deletions(-) delete mode 100644 html/cgi-bin/p2p-block.cgi diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index a908053b1..a5973f9e4 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -62,7 +62,6 @@ srv/web/ipfire/cgi-bin/netovpnrw.cgi srv/web/ipfire/cgi-bin/netovpnsrv.cgi srv/web/ipfire/cgi-bin/optionsfw.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/p2p-block.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi deleted file mode 100644 index d14725504..000000000 --- a/html/cgi-bin/p2p-block.cgi +++ /dev/null @@ -1,154 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2013 # -# # -# 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### -# Author: Alexander Marx (Amarx@ipfire.org) # -############################################################################### - -use strict; -no warnings 'uninitialized'; -# enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -my $errormessage = ''; -my $notice; -my $p2pfile = "${General::swroot}/firewall/p2protocols"; - -my @p2ps = (); -my %fwdfwsettings = (); -my %color = (); -my %mainsettings = (); - -&General::readhash("${General::swroot}/main/settings", \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); - -&Header::showhttpheaders(); -&Header::getcgihash(\%fwdfwsettings); - -if ($fwdfwsettings{'ACTION'} eq 'togglep2p') { - open( FILE, "<$p2pfile") or die "Unable to read $p2pfile"; - @p2ps = ; - close FILE; - open( FILE, ">$p2pfile") or die "Unable to write $p2pfile"; - foreach my $p2pentry (sort @p2ps) { - my @p2pline = split( /\;/, $p2pentry); - if ($p2pline[1] eq $fwdfwsettings{'P2PROT'}) { - if ($p2pline[2] eq 'on') { - $p2pline[2] = 'off'; - } else { - $p2pline[2] = 'on'; - } - } - print FILE "$p2pline[0];$p2pline[1];$p2pline[2];\n"; - } - close FILE; - - &General::firewall_config_changed(); - - $notice = $Lang::tr{'p2p block save notice'}; -} - -&Header::openpage($Lang::tr{'p2p block'}, 1, ''); -&Header::openbigbox('100%', 'center', $errormessage); - -if ($notice) { - &Header::openbox('100%', 'left', $Lang::tr{'notice'}); - print "$notice"; - &Header::closebox(); -} - -my $gif; - -open(FILE, "<$p2pfile") or die "Unable to read $p2pfile"; -@p2ps = ; -close FILE; - -&Header::openbox('100%', 'center',); -print < - - - $Lang::tr{'protocol'} - - - $Lang::tr{'status'} - - -END -my $lines=0; -my $col=""; -foreach my $p2pentry (sort @p2ps) { - my @p2pline = split( /\;/, $p2pentry); - if ($p2pline[2] eq 'on') { - $gif = "/images/on.gif" - } else { - $gif = "/images/off.gif" - } - if ($lines % 2) { - print ""; - $col="bgcolor='$color{'color20'}'"; } - else { - print ""; - $col="bgcolor='$color{'color22'}'"; } - print < - $p2pline[0]: - - -
- - - -
- - -END -$lines++; -} - -print < - - - - - - - - -
- - - $Lang::tr{'outgoing firewall p2p allow'} -
- - - $Lang::tr{'outgoing firewall p2p deny'} -
-END - -&Header::closebox(); - -&Header::closebigbox(); -&Header::closepage(); From patchwork Mon Feb 14 19:03:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 5165 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4JyDCD4DC7z3wsl for ; Mon, 14 Feb 2022 19:03:36 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4JyDCB0Fwhz2Hr; Mon, 14 Feb 2022 19:03:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4JyDC96v1pz2ymg; Mon, 14 Feb 2022 19:03:33 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4JyDC829DPz2yWd for ; Mon, 14 Feb 2022 19:03:32 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4JyDC76QTvz2Nq; Mon, 14 Feb 2022 19:03:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1644865412; 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=B7WZ2SZA4ir82SxTl3RTqSKFMUdgJG7y7WcexZPfCAU=; b=MyGNQiP6YpfTOxmr6aS+wrnWGfluHl75rBXLFYTZRbnZK8O46jdofI/P9tMhx0RJozyEgc lT6m5NOjNQA/RtAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1644865412; 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=B7WZ2SZA4ir82SxTl3RTqSKFMUdgJG7y7WcexZPfCAU=; b=TuSUyXNCDQCtzE2Paoem058ej0uEAN+3jAm5/6qUNGEuVYDJ07DjEi9gh4u4JCdXWvGF0x Yjz4eBnb/e40s+8gwoJtd1NecZTWjZlK07tHrogPLVrofyZ7oB3DhdcB0qo5BtAhD+RnFq nLE21aDuvAeWLAr+4ojhOMK3LqUN0wCMAR+PlbAbyyYXGr291yBMdxo7ABzbis1hlxsPqM aaGCNXuMHh1a6eyGwJWs7xFEez7NApoNcviUL1Wtn3XLkjZ7yFtE9jIrDhno47vd52d66S lCY+S9JcWwEWHxjYGxuQGSSuUXUh79Iw7QBF6keTTnnm8nIng5AYEoZHFKxc8Q== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 4/4] firewall.menu: Drop entry for P2P-Block. Date: Mon, 14 Feb 2022 20:03:07 +0100 Message-Id: <20220214190307.4086-4-stefan.schantl@ipfire.org> In-Reply-To: <20220214190307.4086-1-stefan.schantl@ipfire.org> References: <20220214190307.4086-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl Reviewed-by: Peter Müller Acked-by: Michael Tremer --- config/menu/50-firewall.menu | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index 6ae9687dc..aa67d9007 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -21,12 +21,6 @@ 'title' => "$Lang::tr{'intrusion detection system'}", 'enabled' => 1, }; - $subfirewall->{'50.p2p'} = { - 'caption' => $Lang::tr{'p2p block'}, - 'uri' => '/cgi-bin/p2p-block.cgi', - 'title' => "P2P-Block", - 'enabled' => 1, - }; $subfirewall->{'60.locationblock'} = { 'caption' => $Lang::tr{'locationblock'}, 'uri' => '/cgi-bin/location-block.cgi',