* Re: [PATCH 18/21] initscripts fkt: readhash should only parse lines with a =
[not found] <9D30D788-812C-4393-A46C-25AE799556FE@ipfire.org>
@ 2024-06-02 18:09 ` Jonatan Schlag
2024-06-03 9:25 ` Michael Tremer
0 siblings, 1 reply; 3+ messages in thread
From: Jonatan Schlag @ 2024-06-02 18:09 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2679 bytes --]
Hi,
Am Freitag, dem 31.05.2024 um 10:56 +0100 schrieb Michael Tremer:
>
>
> > On 20 May 2024, at 10:06, Jonatan Schlag
> > <jonatan.schlag(a)ipfire.org> wrote:
> >
> > A line without a = is clearly invalid.
> >
> > 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(+)
> >
> > 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
> >
> > + # Skip lines without a =
> > + if ! [[ ${line} =~ [^=]*=[^=]*$ ]]; then
> > + echo "Invalid line '${line}'" >&2
> > + continue
> > + fi
> > +
> > local key="${line%=*}"
> > local val="${line#*=}"
>
> 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 = Line_without_a_equal_sign_is_also_invalid
Value = 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
>
> >
> > 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=0.0.0.0
> > RED_NETMASK=0.0.0.0
> > RED_TYPE=PPPOE
> > RED_NETADDRESS=0.0.0.0
> > +Line_without_a_equal_sign_is_also_invalid
> >
> > # Comment for testing
> > # 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'
> > --
> > 2.39.2
> >
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 18/21] initscripts fkt: readhash should only parse lines with a =
2024-06-02 18:09 ` [PATCH 18/21] initscripts fkt: readhash should only parse lines with a = Jonatan Schlag
@ 2024-06-03 9:25 ` Michael Tremer
0 siblings, 0 replies; 3+ messages in thread
From: Michael Tremer @ 2024-06-03 9:25 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3144 bytes --]
Hello,
> On 2 Jun 2024, at 19:09, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrote:
>
> Hi,
>
>
> Am Freitag, dem 31.05.2024 um 10:56 +0100 schrieb Michael Tremer:
>>
>>
>>> On 20 May 2024, at 10:06, Jonatan Schlag
>>> <jonatan.schlag(a)ipfire.org> wrote:
>>>
>>> A line without a = is clearly invalid.
>>>
>>> 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(+)
>>>
>>> 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
>>>
>>> + # Skip lines without a =
>>> + if ! [[ ${line} =~ [^=]*=[^=]*$ ]]; then
>>> + echo "Invalid line '${line}'" >&2
>>> + continue
>>> + fi
>>> +
>>> local key="${line%=*}"
>>> local val="${line#*=}"
>>
>> 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
Okay, let’s say this is indeed an empty line (and not just a key without a value).
> result in an entry like this:
>
> Key = Line_without_a_equal_sign_is_also_invalid
> Value = Line_without_a_equal_sign_is_also_invalid
Yes, you can’t use the parameter expansions then and need to check first if you have an = character at all (you can simply do that with a case statement 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’t a very good check. It could theoretically happen.
-Michael
>
> Jonatan
>>
>>>
>>> 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=0.0.0.0
>>> RED_NETMASK=0.0.0.0
>>> RED_TYPE=PPPOE
>>> RED_NETADDRESS=0.0.0.0
>>> +Line_without_a_equal_sign_is_also_invalid
>>>
>>> # Comment for testing
>>> # 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'
>>> --
>>> 2.39.2
>>>
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* First patch series for the roadmap item "Get rid of CONFIG_TYPE in the network config"
@ 2024-05-20 9:05 Jonatan Schlag
2024-05-20 9:06 ` [PATCH 18/21] initscripts fkt: readhash should only parse lines with a = Jonatan Schlag
0 siblings, 1 reply; 3+ messages in thread
From: Jonatan Schlag @ 2024-05-20 9:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1953 bytes --]
Hi list,
This is the first patch series for the roadmap item: https://www.ipfire.org/docs/roadmap/get-rid-of-configtype-in-network-config . This patch series introduces a bash testing library and a function readhash, which we will use in every bash script which needs to read our config files. As this patch set is already massive, I thought it might be better to discuss the function first before I introduce it in every script. Otherwise, we would talk about 50 patches and not 21. This amount would be somehow not reviewable. If this patch series get merged, fine. If you want to wait for all the patches also fine, but as told, this will get a huge patch set.
Patches in this series are:
[PATCH 01/21] test: Add bash lib for colors
[PATCH 02/21] tests: Add bash lib
[PATCH 03/21] tests/lib.sh: Add function
[PATCH 04/21] tests/lib.sh: Add check if variable exists to
[PATCH 05/21] tests/lib.sh: Add logging functions
[PATCH 06/21] tests/lib.sh: adjust to pytest logging style
[PATCH 07/21] tests/lib.sh: Fix check if array is defined
[PATCH 08/21] test_that_key_in_arry_has_value: Check if the key is
[PATCH 09/21] tests/lib.sh: Use namref to access an array
[PATCH 10/21] test_that_key_in_arry_has_value: Check if a key in an
[PATCH 11/21] tests: Add function to test the ouput of a bash
[PATCH 12/21] initscript functions: add readhash
[PATCH 13/21] initscript fkt: ignore blank lines in readhash
[PATCH 14/21] test: Add functions test_that_array_is_defined
[PATCH 15/21] tests: Add functions test_that_array_doesnt_have_key
[PATCH 16/21] initscripts fkt: Ignore comments in readhash
[PATCH 17/21] initscripts fkt: ignore invalid keys in readhash
[PATCH 18/21] initscripts fkt: readhash should only parse lines with
[PATCH 19/21] initscripts fkt: Check for invalid values in readhash
[PATCH 20/21] initscripts fkt: keep readhash compatible with older
[PATCH 21/21] initscripts fkt: Fix shebang
Greetings Jonatan
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 18/21] initscripts fkt: readhash should only parse lines with a =
2024-05-20 9:05 First patch series for the roadmap item "Get rid of CONFIG_TYPE in the network config" Jonatan Schlag
@ 2024-05-20 9:06 ` Jonatan Schlag
0 siblings, 0 replies; 3+ messages in thread
From: Jonatan Schlag @ 2024-05-20 9:06 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1789 bytes --]
A line without a = is clearly invalid.
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(+)
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
+ # Skip lines without a =
+ if ! [[ ${line} =~ [^=]*=[^=]*$ ]]; then
+ echo "Invalid line '${line}'" >&2
+ continue
+ fi
+
local key="${line%=*}"
local val="${line#*=}"
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=0.0.0.0
RED_NETMASK=0.0.0.0
RED_TYPE=PPPOE
RED_NETADDRESS=0.0.0.0
+Line_without_a_equal_sign_is_also_invalid
# Comment for testing
# 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'
--
2.39.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-03 9:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <9D30D788-812C-4393-A46C-25AE799556FE@ipfire.org>
2024-06-02 18:09 ` [PATCH 18/21] initscripts fkt: readhash should only parse lines with a = Jonatan Schlag
2024-06-03 9:25 ` Michael Tremer
2024-05-20 9:05 First patch series for the roadmap item "Get rid of CONFIG_TYPE in the network config" Jonatan Schlag
2024-05-20 9:06 ` [PATCH 18/21] initscripts fkt: readhash should only parse lines with a = Jonatan Schlag
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox