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();