From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 3/4] p2p-block.cgi: Drop CGI. Date: Tue, 15 Feb 2022 12:33:06 +0000 Message-ID: In-Reply-To: <20220214190307.4086-3-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6707556300807479122==" List-Id: --===============6707556300807479122== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Acked-by: Michael Tremer > On 14 Feb 2022, at 19:03, Stefan Schantl wrot= e: >=20 > The support for creating P2P based rules has been removed from the > firewall. So this CGI file is not longer needed. >=20 > Signed-off-by: Stefan Schantl > --- > 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 >=20 > 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(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 =3D ''; > -my $notice; > -my $p2pfile =3D "${General::swroot}/firewall/p2protocols"; > - > -my @p2ps =3D (); > -my %fwdfwsettings =3D (); > -my %color =3D (); > -my %mainsettings =3D (); > - > -&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 =3D ; > - close FILE; > - open( FILE, ">$p2pfile") or die "Unable to write $p2pfile"; > - foreach my $p2pentry (sort @p2ps) { > - my @p2pline =3D split( /\;/, $p2pentry); > - if ($p2pline[1] eq $fwdfwsettings{'P2PROT'}) { > - if ($p2pline[2] eq 'on') { > - $p2pline[2] =3D 'off'; > - } else { > - $p2pline[2] =3D 'on'; > - } > - } > - print FILE "$p2pline[0];$p2pline[1];$p2pline[2];\n"; > - } > - close FILE; > - > - &General::firewall_config_changed(); > - > - $notice =3D $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"; > -(a)p2ps =3D ; > -close FILE; > - > -&Header::openbox('100%', 'center',); > -print < - > - > - > - > - > -END > -my $lines=3D0; > -my $col=3D""; > -foreach my $p2pentry (sort @p2ps) { > - my @p2pline =3D split( /\;/, $p2pentry); > - if ($p2pline[2] eq 'on') { > - $gif =3D "/images/on.gif" > - } else { > - $gif =3D "/images/off.gif" > - } > - if ($lines % 2) { > - print ""; > - $col=3D"bgcolor=3D'$color{'color20'}'"; } > - else { > - print ""; > - $col=3D"bgcolor=3D'$color{'color22'}'"; } > - print < - > - > - > -END > -$lines++; > -} > - > -print < -
> - $Lang::tr{'protocol'} > - > - $Lang::tr{'status'} > -
> - $p2pline[0]: > - > -
> - > - > - > -
> -
> - > - > - > - > - > - > - > - > -
> - > - > - $Lang::tr{'outgoing firewall p2p allow'} > -
> - > - > - $Lang::tr{'outgoing firewall p2p deny'} > -
> -END > - > -&Header::closebox(); > - > -&Header::closebigbox(); > -&Header::closepage(); > --=20 > 2.30.2 >=20 --===============6707556300807479122==--