From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/4] p2p-block.cgi: Drop CGI.
Date: Mon, 14 Feb 2022 20:03:06 +0100 [thread overview]
Message-ID: <20220214190307.4086-3-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <20220214190307.4086-1-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 6371 bytes --]
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 <stefan.schantl(a)ipfire.org>
---
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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-# Author: Alexander Marx (Amarx(a)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 = <FILE>;
- 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 "<font class='base'>$notice</font>";
- &Header::closebox();
-}
-
-my $gif;
-
-open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
-(a)p2ps = <FILE>;
-close FILE;
-
-&Header::openbox('100%', 'center',);
-print <<END;
- <table width='35%' class='tbl'>
- <tr>
- <th align='center' colspan='2' bgcolor='$color{'color22'}' >
- <b>$Lang::tr{'protocol'}</b>
- </th>
- <th align='center' bgcolor='$color{'color22'}' >
- <b>$Lang::tr{'status'}</b>
- </th>
- </tr>
-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 "<tr>";
- $col="bgcolor='$color{'color20'}'"; }
- else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'"; }
- print <<END;
- <td align='center' colspan='2' $col>
- $p2pline[0]:
- </td>
- <td align='center' $col>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='P2PROT' value='$p2pline[1]'>
- <input type='image' img src='$gif' alt='$Lang::tr{'click to disable'}' title='$Lang::tr{'fwdfw toggle'}' style='padding-top: 0px; padding-left: 0px; padding-bottom: 0px ;padding-right: 0px ;display: block;'>
- <input type='hidden' name='ACTION' value='togglep2p'>
- </form>
- </td>
- </tr>
-END
-$lines++;
-}
-
-print <<END;
-</table><table>
- <tr>
- <td>
- <img src='/images/on.gif'>
- </td>
- <td>
- $Lang::tr{'outgoing firewall p2p allow'}
- </td>
- </tr>
- <tr>
- <td>
- <img src='/images/off.gif'>
- </td>
- <td>
- $Lang::tr{'outgoing firewall p2p deny'}
- </td>
- </tr>
- </table>
-END
-
-&Header::closebox();
-
-&Header::closebigbox();
-&Header::closepage();
--
2.30.2
next prev parent reply other threads:[~2022-02-14 19:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 19:03 [PATCH 1/4] firewall: Drop support for blocking P2P protocols Stefan Schantl
2022-02-14 19:03 ` [PATCH 2/4] configroot: Drop config file for p2protocols Stefan Schantl
2022-02-14 21:11 ` Peter Müller
2022-02-15 12:33 ` Michael Tremer
2022-02-14 19:03 ` Stefan Schantl [this message]
2022-02-14 21:12 ` [PATCH 3/4] p2p-block.cgi: Drop CGI Peter Müller
2022-02-15 12:33 ` Michael Tremer
2022-02-14 19:03 ` [PATCH 4/4] firewall.menu: Drop entry for P2P-Block Stefan Schantl
2022-02-14 21:12 ` Peter Müller
2022-02-15 12:32 ` Michael Tremer
2022-02-14 21:11 ` [PATCH 1/4] firewall: Drop support for blocking P2P protocols Peter Müller
2022-02-15 12:33 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220214190307.4086-3-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox