From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 17/21] initscripts fkt: ignore invalid keys in readhash
Date: Mon, 20 May 2024 11:06:07 +0200
Message-ID: <20240520090611.10406-18-jonatan.schlag@ipfire.org>
In-Reply-To: <20240520090611.10406-1-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8266780534191867405=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/initscripts/system/functions              |  6 ++++++
 tests/src/initscripts/system/functions/data/2 | 20 +++++++++++++++++++
 .../system/functions/data/2_output_stderr     |  4 ++++
 .../system/functions/data/2_output_stdout     |  0
 .../src/initscripts/system/functions/test.sh  | 11 ++++++++++
 5 files changed, 41 insertions(+)
 create mode 100644 tests/src/initscripts/system/functions/data/2
 create mode 100644 tests/src/initscripts/system/functions/data/2_output_stde=
rr
 create mode 100644 tests/src/initscripts/system/functions/data/2_output_stdo=
ut

diff --git a/src/initscripts/system/functions b/src/initscripts/system/functi=
ons
index 6107463fc..bbcfab95d 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -914,6 +914,12 @@ readhash() {
 		local key=3D"${line%=3D*}"
 		local val=3D"${line#*=3D}"
=20
+		# Skip lines with an invalid key
+		if ! [[ ${key} =3D~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
+			echo "Invalid key '${key}'" >&2
+			continue
+		fi
+
 		printf -v "${array}[${key}]" "%s" "${val}"
 	done < "${file}"
 }
diff --git a/tests/src/initscripts/system/functions/data/2 b/tests/src/initsc=
ripts/system/functions/data/2
new file mode 100644
index 000000000..3e1a7028b
--- /dev/null
+++ b/tests/src/initscripts/system/functions/data/2
@@ -0,0 +1,20 @@
+CONFIG_TYPE=3D3
+GREEN_DEV=3Dgreen0
+GREEN_MACADDR=3D00:c0:08:8a:a0:47
+GREEN_DRIVER=3Dr8175
+-RED_DEV=3Dred0
+RE??D_MACADDR=3D00:c0:08:8a:a0:56
+RED&&_DRIVER=3Dr8283
+# Another Comment
+0BLUE_DEV=3D'blue0 net0'
+BLUE_MACADDR=3Dbc:30:7d:58:6b:e3
+BLUE_DRIVER=3Drt2800
+RED_DHCP_HOSTNAME=3Dipfire
+RED_DHCP_FORCE_MTU=3D
+RED_ADDRESS=3D0.0.0.0
+RED_NETMASK=3D0.0.0.0
+RED_TYPE=3DPPPOE
+RED_NETADDRESS=3D0.0.0.0
+
+# Comment for testing =20
+    # Comment for testing Comments with spaces before
diff --git a/tests/src/initscripts/system/functions/data/2_output_stderr b/te=
sts/src/initscripts/system/functions/data/2_output_stderr
new file mode 100644
index 000000000..dfcf2154b
--- /dev/null
+++ b/tests/src/initscripts/system/functions/data/2_output_stderr
@@ -0,0 +1,4 @@
+Invalid key '-RED_DEV'
+Invalid key 'RE??D_MACADDR'
+Invalid key 'RED&&_DRIVER'
+Invalid key '0BLUE_DEV'
diff --git a/tests/src/initscripts/system/functions/data/2_output_stdout b/te=
sts/src/initscripts/system/functions/data/2_output_stdout
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/src/initscripts/system/functions/test.sh b/tests/src/inits=
cripts/system/functions/test.sh
index f1348a9e8..9981cc732 100755
--- a/tests/src/initscripts/system/functions/test.sh
+++ b/tests/src/initscripts/system/functions/test.sh
@@ -23,3 +23,14 @@ test_that_array_doesnt_have_key "CONFIG" "# Comment for te=
sting Comments with sp
=20
 test_that_output_is "${SCRIPT_PATH}/data/1_output_stdout" "1" readhash "CONF=
IG" "${SCRIPT_PATH}/data/1"
 test_that_output_is "${SCRIPT_PATH}/data/1_output_stderr" "2" readhash "CONF=
IG" "${SCRIPT_PATH}/data/1"
+
+# Check with invalid Lines (values and keys)
+
+readhash "CONFIG2" "${SCRIPT_PATH}/data/2" &> /dev/null
+
+# test if we read the correct data
+test_that_key_in_arry_has_value "CONFIG2" "RED_DHCP_HOSTNAME" "ipfire"
+test_that_key_in_arry_has_value "CONFIG2" "BLUE_MACADDR" "bc:30:7d:58:6b:e3"
+
+test_that_output_is "${SCRIPT_PATH}/data/2_output_stdout" "1" readhash "CONF=
IG2" "${SCRIPT_PATH}/data/2"
+test_that_output_is "${SCRIPT_PATH}/data/2_output_stderr" "2" readhash "CONF=
IG2" "${SCRIPT_PATH}/data/2"
--=20
2.39.2


--===============8266780534191867405==--