From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 3/3] initscripts: readhash: Fix handling = signs
Date: Thu, 19 Dec 2024 19:16:08 +0100
Message-ID: <161f9ac0f8e18d8d5b95bf2506c338510f12e902.camel@ipfire.org>
In-Reply-To: <20241206164217.3840140-3-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5288054889686835280=="
List-Id: <development.lists.ipfire.org>

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

Hi,

as this is already staged, I do not reply to all emails, but the last
one: This looks all good. I do not unterstand the purpose of the second
patch, but I guess there is a reason.

Jonatan

Am Freitag, dem 06.12.2024 um 16:42 +0000 schrieb Michael Tremer:
> The function expected that a line only contains exactly one equals
> sign
> (=3D) which is not fit for purpose. In the WireGuard code we hold key
> material that is encoded in base64 and therefore contains padding
> that
> uses =3D.
>=20
> This patch fixes that we expect exactly one equals sign immediately
> after the key and we will then accept more =3D in the value - which was
> already permitted.
>=20
> Furthermore, this patch fixes the splitting if the key and value at
> the
> first =3D.
>=20
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> =C2=A0src/initscripts/system/functions=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 | 12 +++-------
> --
> =C2=A0.../system/functions/data/2_output_stderr=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 8 ++++----
> =C2=A02 files changed, 7 insertions(+), 13 deletions(-)
>=20
> diff --git a/src/initscripts/system/functions
> b/src/initscripts/system/functions
> index 094e35495..e486cc085 100644
> --- a/src/initscripts/system/functions
> +++ b/src/initscripts/system/functions
> @@ -909,21 +909,15 @@ readhash() {
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0continue
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0fi
> =C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0# Skip lines without a =3D
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0if ! [[ ${line} =3D~ [^=3D]*=3D[^=3D]*$ ]]; then
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0# Check for a valid key followed by =3D
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0if ! [[ ${line} =3D~ ^[A-Za-z_][A-Za-z0-9_]*=3D ]]; then
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0echo "In=
valid line '${line}'" >&2
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0continue
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0fi
> =C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0local key=3D"${line%=3D*}"
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0local key=3D"${line%%=3D*}"
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0local val=3D"${line#*=3D}"
> =C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0# Skip lines with an invalid key
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0if ! [[ ${key} =3D~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0echo "Inval=
id key '${key}'" >&2
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0continue
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0fi
> -
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0# Skip lines with invalid values
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0if ! [[ ${val} =3D~ ^[\'][\ A-Za-z0-9=3D/,.:%_@#+-]*[\']$
> ]] && ! [[ ${val} =3D~ ^[A-Za-z0-9=3D/,.:%_@#+-]*$ ]]; then
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0echo "In=
valid value '${val}' for key
> '${key}'" >&2
> diff --git
> a/tests/src/initscripts/system/functions/data/2_output_stderr
> b/tests/src/initscripts/system/functions/data/2_output_stderr
> index 82f035e26..7f4c5a944 100644
> --- a/tests/src/initscripts/system/functions/data/2_output_stderr
> +++ b/tests/src/initscripts/system/functions/data/2_output_stderr
> @@ -2,8 +2,8 @@ Invalid value '?3' for key 'CONFIG_TYPE'
> =C2=A0Invalid value 'gree!n0' for key 'GREEN_DEV'
> =C2=A0Invalid value '00:c0:08:8a=C2=A0 :a0:47' for key 'GREEN_MACADDR'
> =C2=A0Invalid value '"r8175"' for key 'GREEN_DRIVER'
> -Invalid key '-RED_DEV'
> -Invalid key 'RE??D_MACADDR'
> -Invalid key 'RED&&_DRIVER'
> -Invalid key '0BLUE_DEV'
> +Invalid line '-RED_DEV=3Dred0'
> +Invalid line 'RE??D_MACADDR=3D00:c0:08:8a:a0:56'
> +Invalid line 'RED&&_DRIVER=3Dr8283'
> +Invalid line '0BLUE_DEV=3D'blue0 net0''
> =C2=A0Invalid line 'Line_without_a_equal_sign_is_also_invalid'


--===============5288054889686835280==--