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 v2 2/2] dns.cgi: Fixes bug#12395 - German umlauts not
 correctly displayed in remarks
Date: Tue, 12 Mar 2024 10:02:14 +0000
Message-ID: <EDF2038E-FD27-4033-B13E-D176DA598090@ipfire.org>
In-Reply-To: <20240311121909.5445-2-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2333188508643088481=="
List-Id: <development.lists.ipfire.org>

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

Thank you.

I merged this for now so that we can fix this problem quickly.

However I was wondering whether we should consider making the decode statemen=
t a part of the =E2=80=9Ccleanhtml=E2=80=9D function.

I am still unsure why this is happening in the first place. We should be rece=
iving UTF-8 from the browser, and I believe that perl doesn=E2=80=99t nativel=
y store things in UTF-8. That is however not a problem, because it should rea=
d files the same way it wrote them and so there should not be any difference =
when we re-read the configuration files. Unless some parts of the code specif=
y any kind of encoding.

-Michael

> On 11 Mar 2024, at 12:19, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - If Freifunk M=C3=BCnchen e.V. is entered as a remark it gets converted to
>   Freifunk M=C3=83=C2=BCnchen e.V.
> - This is because cleanhtml is used on the UTF-8 remark text before saving =
it to the file
>   and the HTML::Entities::encode_entities command that is run on that remar=
k text does
>   not work with UTF-8 text.
> - If the UTF-8 text in the remark is decoded before running through the cle=
anhtml command
>   then the characters with diacritical marks are correctly shown.
> - Have tested out the fix on a remark with a range of different characters =
with
>   diacritical marks and all of the ones tested were displayed correctly wit=
h the fix while
>   in the original form they were mangled.
>=20
> Fixes: Bug#12395
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> html/cgi-bin/dns.cgi | 7 +++++++
> 1 file changed, 7 insertions(+)
>=20
> diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
> index 0a34d3fd6..eb6f908d5 100644
> --- a/html/cgi-bin/dns.cgi
> +++ b/html/cgi-bin/dns.cgi
> @@ -142,6 +142,13 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($=
cgiparams{'SERVERS'} eq $L
> # Go further if there was no error.
> if ( ! $errormessage) {
> # Check if a remark has been entered.
> +
> + # decode the UTF-8 text so that characters with diacritical marks such as
> + # umlauts are treated correctly by the following cleanhtml command
> + $cgiparams{'REMARK'} =3D decode("UTF-8", $cgiparams{'REMARK'});
> +
> + # run the REMARK text through cleanhtml to ensure all unsafe html charact=
ers
> + # are correctly encoded to their html entities
> $cgiparams{'REMARK'} =3D &Header::cleanhtml($cgiparams{'REMARK'});
>=20
> my %dns_servers =3D ();
> --=20
> 2.44.0
>=20


--===============2333188508643088481==--