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 18/21] initscripts fkt: readhash should only parse lines with a =
Date: Mon, 03 Jun 2024 10:25:49 +0100
Message-ID: <F8D06011-DA04-4030-8C72-DC595CE41966@ipfire.org>
In-Reply-To: <c0695e79519c4c582e4acaf731804693fdcd01b0.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4345006242694526586=="
List-Id: <development.lists.ipfire.org>

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

Hello,

> On 2 Jun 2024, at 19:09, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrote:
>=20
> Hi,
>=20
>=20
> Am Freitag, dem 31.05.2024 um 10:56 +0100 schrieb Michael Tremer:
>>=20
>>=20
>>> On 20 May 2024, at 10:06, Jonatan Schlag
>>> <jonatan.schlag(a)ipfire.org> wrote:
>>>=20
>>> A line without a =3D is clearly invalid.
>>>=20
>>> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
>>> ---
>>> src/initscripts/system/functions                            | 6
>>> ++++++
>>> tests/src/initscripts/system/functions/data/2               | 1 +
>>> tests/src/initscripts/system/functions/data/2_output_stderr | 1 +
>>> 3 files changed, 8 insertions(+)
>>>=20
>>> diff --git a/src/initscripts/system/functions
>>> b/src/initscripts/system/functions
>>> index bbcfab95d..38a1316a8 100644
>>> --- a/src/initscripts/system/functions
>>> +++ b/src/initscripts/system/functions
>>> @@ -911,6 +911,12 @@ readhash() {
>>> continue
>>> fi
>>>=20
>>> + # Skip lines without a =3D
>>> + if ! [[ ${line} =3D~ [^=3D]*=3D[^=3D]*$ ]]; then
>>> + echo "Invalid line '${line}'" >&2
>>> + continue
>>> + fi
>>> +
>>> local key=3D"${line%=3D*}"
>>> local val=3D"${line#*=3D}"
>>=20
>> You can simply check if key and value have content. That should be a
>> lot easier than whatever this is.
>=20
> Hi,
>=20
> Unfortunately not. A line like
>=20
> Line_without_a_equal_sign_is_also_invalid

Okay, let=E2=80=99s say this is indeed an empty line (and not just a key with=
out a value).

> result in an entry like this:
>=20
> Key =3D Line_without_a_equal_sign_is_also_invalid
> Value =3D Line_without_a_equal_sign_is_also_invalid

Yes, you can=E2=80=99t use the parameter expansions then and need to check fi=
rst if you have an =3D character at all (you can simply do that with a case s=
tatement instead of a complicated regular expression.

> We simply do not split without an equal sign, so key and value are
> equal. And maybe are also valid keys and values.

That isn=E2=80=99t a very good check. It could theoretically happen.

-Michael

>=20
> Jonatan
>>=20
>>>=20
>>> diff --git a/tests/src/initscripts/system/functions/data/2
>>> b/tests/src/initscripts/system/functions/data/2
>>> index 3e1a7028b..d1c4d327d 100644
>>> --- a/tests/src/initscripts/system/functions/data/2
>>> +++ b/tests/src/initscripts/system/functions/data/2
>>> @@ -15,6 +15,7 @@ RED_ADDRESS=3D0.0.0.0
>>> RED_NETMASK=3D0.0.0.0
>>> RED_TYPE=3DPPPOE
>>> RED_NETADDRESS=3D0.0.0.0
>>> +Line_without_a_equal_sign_is_also_invalid
>>>=20
>>> # Comment for testing =20
>>>     # Comment for testing Comments with spaces before
>>> diff --git
>>> a/tests/src/initscripts/system/functions/data/2_output_stderr
>>> b/tests/src/initscripts/system/functions/data/2_output_stderr
>>> index dfcf2154b..cccd19af6 100644
>>> --- a/tests/src/initscripts/system/functions/data/2_output_stderr
>>> +++ b/tests/src/initscripts/system/functions/data/2_output_stderr
>>> @@ -2,3 +2,4 @@ Invalid key '-RED_DEV'
>>> Invalid key 'RE??D_MACADDR'
>>> Invalid key 'RED&&_DRIVER'
>>> Invalid key '0BLUE_DEV'
>>> +Invalid line 'Line_without_a_equal_sign_is_also_invalid'
>>> --=20
>>> 2.39.2
>>>=20
>>=20
>=20


--===============4345006242694526586==--