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 18/21] initscripts fkt: readhash should only parse lines with a =
Date: Sun, 02 Jun 2024 20:09:51 +0200
Message-ID: <c0695e79519c4c582e4acaf731804693fdcd01b0.camel@ipfire.org>
In-Reply-To: <9D30D788-812C-4393-A46C-25AE799556FE@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0172441891360313179=="
List-Id: <development.lists.ipfire.org>

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

Hi,


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=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=A0=C2=A0=C2=A0=C2=A0 | 6
> > ++++++
> > tests/src/initscripts/system/functions/data/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 | 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.

Hi,

Unfortunately not. A line like

Line_without_a_equal_sign_is_also_invalid


result in an entry like this:

Key =3D Line_without_a_equal_sign_is_also_invalid
Value =3D Line_without_a_equal_sign_is_also_invalid

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

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=C2=A0=20
> > =C2=A0=C2=A0=C2=A0 # 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


--===============0172441891360313179==--