From 6fcaf3d589f9cd5c9e5cdf89cc0e651a97175174 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 5 May 2025 11:38:59 +0200 Subject: [PATCH] unetmsg: fix issuing requests without previously subscribing Perform ACL check if not subscribed. Helps with one-shot requests. Signed-off-by: Felix Fietkau --- .../files/usr/share/ucode/unetmsg/unetmsgd-client.uc | 7 +++++-- .../unetmsg/files/usr/share/ucode/unetmsg/unetmsgd.uc | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) 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(); -- 2.47.2