From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH v3 4/5] services.cgi: add restart action and restrict action usage
Date: Wed, 26 Oct 2022 15:37:39 +0100
Message-ID: <90BBB07F-0A62-4F00-8FD0-7B9F2098B1DC@ipfire.org>
In-Reply-To: <20221011220157.17385-5-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2764771500954860267=="
List-Id: <development.lists.ipfire.org>

--===============2764771500954860267==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 11 Oct 2022, at 23:01, Robin Roevens <robin.roevens(a)disroot.org> wrote:
>=20
> * Add restart action to services.
> * Only display available actions for a service:
>  Start when service is stopped or Stop and Restart when a service
>  is running.
>=20
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
> html/cgi-bin/services.cgi | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>=20
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index e35b04cae..4b379251e 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -143,7 +143,7 @@ END
> 	my @param=3Dsplit(/!/, $paramstr);
> 	# Make sure action parameter is actually one of the allowed service actions
> 	given ($param[1]) {
> -		when ( ['start', 'stop', 'enable', 'disable'] ) {
> +		when ( ['start', 'stop', 'restart', 'enable', 'disable'] ) {
> 			# Make sure pak-name and service name don't contain any illegal character
> 			if ( $param[0] !~ /[^a-zA-Z_0-9\-]/ &&
> 			     $param[2] !~ /[^a-zA-Z_0-9\-]/ ) {
> @@ -196,8 +196,6 @@ END
>=20
> 				my $status =3D isautorun($pak,$service,$col);
> 				print "$status ";
> -				print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?=
$pak!start!$service'><img alt=3D'$Lang::tr{'start'}' title=3D'$Lang::tr{'star=
t'}' src=3D'/images/go-up.png' border=3D'0' /></a></td>";
> -				print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?=
$pak!stop!$service'><img alt=3D'$Lang::tr{'stop'}' title=3D'$Lang::tr{'stop'}=
' src=3D'/images/go-down.png' border=3D'0' /></a></td> ";
> 				my $status =3D isrunningaddon($pak,$service,$col);
> 				$status =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
>=20
> @@ -307,7 +305,9 @@ sub isrunningaddon (@) {
> 	my $testcmd =3D @testcmd[0];
>=20
> 	if ( $testcmd =3D~ /is\ running/ && $testcmd !~ /is\ not\ running/){
> -		$status =3D "<td align=3D'center' bgcolor=3D'${Header::colourgreen}'><fo=
nt color=3D'white'><b>$Lang::tr{'running'}</b></font></td>";
> +		$status =3D "<td align=3D'center' $col width=3D'8%'><a href=3D'services.=
cgi?$pak!stop!$service'><img alt=3D'$Lang::tr{'stop'}' title=3D'$Lang::tr{'st=
op'}' src=3D'/images/go-down.png' border=3D'0' /></a></td> ";
> +		$status .=3D "<td align=3D'center' $col width=3D'8%'><a href=3D'services=
.cgi?$pak!restart!$service'><img alt=3D'$Lang::tr{'restart'}' title=3D'$Lang:=
:tr{'restart'}' src=3D'/images/reload.gif' border=3D'0' /></a></td> ";
> +		$status .=3D "<td align=3D'center' bgcolor=3D'${Header::colourgreen}'><f=
ont color=3D'white'><b>$Lang::tr{'running'}</b></font></td>";
> 		$testcmd =3D~ s/.* //gi;
> 		$testcmd =3D~ s/[a-z_]//gi;
> 		$testcmd =3D~ s/\[[0-1]\;[0-9]+//gi;
> @@ -330,7 +330,8 @@ sub isrunningaddon (@) {
> 		}
> 		$status .=3D"<td align=3D'center' $col>$memory KB</td>";
> 	}else{
> -		$status =3D "<td align=3D'center' bgcolor=3D'${Header::colourred}'><font=
 color=3D'white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan=3D'2' $co=
l></td>";
> +		$status =3D "<td align=3D'center' $col width=3D'16%' colspan=3D2><a href=
=3D'services.cgi?$pak!start!$service'><img alt=3D'$Lang::tr{'start'}' title=
=3D'$Lang::tr{'start'}' src=3D'/images/go-up.png' border=3D'0' /></a></td>";
> +		$status .=3D "<td align=3D'center' bgcolor=3D'${Header::colourred}'><fon=
t color=3D'white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan=3D'2' $c=
ol></td>";
> 	}
> 	return $status;
> }
> --=20
> 2.37.3
>=20
>=20
> --=20
> Dit bericht is gescanned op virussen en andere gevaarlijke
> inhoud door MailScanner en lijkt schoon te zijn.
>=20


--===============2764771500954860267==--