openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-04-15 10:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-base: fix feature detection patterns

Browse Source 
Upstream ucode commit 8a8b4d1 ("types: fix regexp `/.../s` flag inversion")
changed the semantics of /.../s regexp patterns to match the ECMAScript
behavior, meaning `/s` enables single line matching and omitting it
performs line-wise matching. Besides changing the behavior of `.` to match
newlines, the `/s` flag also changes `^` and `$` to only match the begin
and end of the entire string input, respectively instead of matching the
start and end of lines.

This broke feature pattern matching in the luci rpcd plugin, causing LuCI
to incorrectly disable certain features.

This commit changes the affected places to read the command outputs
linewise and to perform the feature flag matching against each read line
individually, including an explicit terminating newline to make the
pattern match forward- and backward compatible with fixed and unfixed
ucode versions.

Fixes: https://github.com/jow-/ucode/issues/389
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2026-03-24 20:50:05 +01:00
parent a4f0c52fbf
commit 0529dca7a2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/luci-base/root/usr/share/rpcd/ucode/luci
View File

@@ -277,7 +277,8 @@ const methods = {
let fd = popen('dnsmasq --version 2>/dev/null');
if (fd) {
const m = match(fd.read('all'), /^Compile time options: (.+)$/s);
for (let line = fd.read('line'); length(line); line = fd.read('line')) {
const m = match(line, /^Compile time options: (.+)\n$/);
for (let opt in split(m?.[1], ' ')) {
let f = replace(opt, 'no-', '', 1);
@@ -285,6 +286,7 @@ const methods = {
result.dnsmasq ??= {};
result.dnsmasq[lc(f)] = (f == opt);
}
}
fd.close();
}
@@ -293,11 +295,10 @@ const methods = {
fd = popen('odhcpd -h 2>/dev/null');
if (fd) {
const output = fd.read('all');
for (let line = fd.read('line'); length(line); line = fd.read('line')) {
result.odhcpd ??= {};
if (output) {
result.odhcpd = {};
const m = match(output, /^Features: (.+)$/s);
const m = match(line, /^Features: (.+)\n$/);
for (let opt in split(m?.[1], ' ')) {
let f = replace(opt, 'no-', '', 1);