From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 5 May 2025 09:38:59 +0000 (+0200)
Subject: unetmsg: fix issuing requests without previously subscribing
X-Git-Tag: v25.12.0-rc1~2880
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fcaf3d589f9cd5c9e5cdf89cc0e651a97175174;p=thirdparty%2Fopenwrt.git

unetmsg: fix issuing requests without previously subscribing

Perform ACL check if not subscribed. Helps with one-shot requests.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd-client.uc b/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd-client.uc
index cc971b562b9..8b428821520 100644
--- a/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd-client.uc
+++ b/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd-client.uc
@@ -72,8 +72,11 @@ function client_request(cl, req)
 		return core.handle_message(handle, data, true);
 	case "request":
 		handle = cl.subscribe[name];
-	    if (!handle)
-			return libubus.STATUS_INVALID_ARGUMENT;
+		if (!handle &&
+		    !core.acl_check("subscribe", cl.acl, [ name ]))
+			return libubus.STATUS_PERMISSION_DENIED;
+
+		handle ??= { client: cl.id };
 		return core.handle_request(handle, req, data, true);
 	}
 }
diff --git a/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd.uc b/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd.uc
index 68b0600fe9f..393a6ea47ad 100644
--- a/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd.uc
+++ b/package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd.uc
@@ -111,6 +111,7 @@ function handle_request(handle, req, data, remote)
 
 	for (let cur in handles) {
 		if (!cur || !cur.get_channel) {
+			cb();
 			continue;
 		}
 		let chan = cur.get_channel();