From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] ovpnmain.cgi: Join certificate output before
 &Header::cleanhtml();
Date: Tue, 13 Jul 2021 15:30:51 +0000
Message-ID: <20210713153053.11281-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3793197969879645259=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 7a2833ce6..3cd2f9381 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1532,8 +1532,8 @@ END
 	&Header::openbigbox('100%', 'LEFT', '', $errormessage);
 	&Header::openbox('100%', 'LEFT', "$Lang::tr{'ca certificate'}:");
 	my @output =3D &General::system_output("/usr/bin/openssl", "x509", "-text",=
 "-in", "${General::swroot}/ovpn/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem");
-	@output =3D &Header::cleanhtml(@output,"y");
-	print "<pre>@output</pre>\n";
+	my $output =3D &Header::cleanhtml(join("", @output),"y");
+	print "<pre>$output</pre>\n";
 	&Header::closebox();
 	print "<div align=3D'center'><a href=3D'/cgi-bin/ovpnmain.cgi'>$Lang::tr{'b=
ack'}</a></div>";
 	&Header::closebigbox();
@@ -1652,8 +1652,8 @@ END
 	&Header::openbox('100%', 'LEFT', "$Lang::tr{'host certificate'}:");
 	@output =3D &General::system_output("/usr/bin/openssl", "x509", "-text", "-=
in", "${General::swroot}/ovpn/certs/servercert.pem");
     }
-    @output =3D &Header::cleanhtml(@output,"y");
-    print "<pre>@output</pre>\n";
+    my $output =3D &Header::cleanhtml(join("", @output), "y");
+    print "<pre>$output</pre>\n";
     &Header::closebox();
     print "<div align=3D'center'><a href=3D'/cgi-bin/ovpnmain.cgi'>$Lang::tr=
{'back'}</a></div>";
     &Header::closebigbox();
@@ -2616,8 +2616,8 @@ else
 	&Header::openbigbox('100%', 'LEFT', '', '');
 	&Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate'}:");
 	my @output =3D &General::system_output("/usr/bin/openssl", "x509", "-text",=
 "-in", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.=
pem");
-	@output =3D &Header::cleanhtml(@output,"y");
-	print "<pre>@output</pre>\n";
+	my $output =3D &Header::cleanhtml(join("", @output), "y");
+	print "<pre>$output</pre>\n";
 	&Header::closebox();
 	print "<div align=3D'center'><a href=3D'/cgi-bin/ovpnmain.cgi'>$Lang::tr{'b=
ack'}</a></div>";
 	&Header::closebigbox();
@@ -2638,8 +2638,8 @@ else
 		&Header::openbigbox('100%', 'LEFT', '', '');
 		&Header::openbox('100%', 'LEFT', "$Lang::tr{'dh'}:");
 		my @output =3D &General::system_output("/usr/bin/openssl", "dhparam", "-te=
xt", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
-		@output =3D &Header::cleanhtml(@output,"y");
-		print "<pre>@output</pre>\n";
+		my $output =3D &Header::cleanhtml(join("", @output) ,"y");
+		print "<pre>$output</pre>\n";
 		&Header::closebox();
 		print "<div align=3D'center'><a href=3D'/cgi-bin/ovpnmain.cgi'>$Lang::tr{'=
back'}</a></div>";
 		&Header::closebigbox();
@@ -2664,8 +2664,8 @@ else
 		my @output =3D <FILE>;
 		close(FILE);
=20
-		@output =3D &Header::cleanhtml(@output,"y");
-		print "<pre>@output</pre>\n";
+		my $output =3D &Header::cleanhtml(join("", @output),"y");
+		print "<pre>$output</pre>\n";
 		&Header::closebox();
 		print "<div align=3D'center'><a href=3D'/cgi-bin/ovpnmain.cgi'>$Lang::tr{'=
back'}</a></div>";
 		&Header::closebigbox();
@@ -2687,8 +2687,8 @@ else
 	&Header::openbigbox('100%', 'LEFT', '', '');
 	&Header::openbox('100%', 'LEFT', "$Lang::tr{'crl'}:");
 	my @output =3D &General::system_output("/usr/bin/openssl", "crl", "-text", =
"-noout", "-in", "${General::swroot}/ovpn/crls/cacrl.pem");
-	@output =3D &Header::cleanhtml(@output,"y");
-	print "<pre>@output</pre>\n";
+	my $output =3D &Header::cleanhtml(join("", @output), "y");
+	print "<pre>$output</pre>\n";
 	&Header::closebox();
 	print "<div align=3D'center'><a href=3D'/cgi-bin/ovpnmain.cgi'>$Lang::tr{'b=
ack'}</a></div>";
 	&Header::closebigbox();
--=20
2.31.0


--===============3793197969879645259==--