From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 26 Sep 2022 09:15:55 +0000 (+0200)
Subject: luci-base: sys.uc: fix parsing conntrack list
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=791a71d225bf8c65ca4f126f19c44f3d4f93d408;p=project%2Fluci.git

luci-base: sys.uc: fix parsing conntrack list

Ensure that the extracted tuple string starts with a space to fully match
all contained key-value pairs.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/ucode/sys.uc b/modules/luci-base/ucode/sys.uc
index 5bbaa8b19d..33a7ac7d76 100644
--- a/modules/luci-base/ucode/sys.uc
+++ b/modules/luci-base/ucode/sys.uc
@@ -49,7 +49,7 @@ export function conntrack_list(callback) {
 
 	if (nfct) {
 		for (let line = nfct.read('line'); length(line); line = nfct.read('line')) {
-			let m = match(line, /^(ipv[46]) +([0-9]+) +\S+ +([0-9]+) +(.+)\n$/);
+			let m = match(line, /^(ipv[46]) +([0-9]+) +\S+ +([0-9]+)( +.+)\n$/);
 
 			if (!m)
 				continue;
@@ -60,7 +60,7 @@ export function conntrack_list(callback) {
 			let tuples = m[4];
 			let timeout = null;
 
-			m = match(tuples, /^([0-9]+) (.+)$/);
+			m = match(tuples, /^ +([0-9]+)( .+)$/);
 
 			if (m) {
 				timeout = m[1];