From 40de47357b1bb7eb7e8c7cc645eeb3d794256d05 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 2 Nov 2022 08:12:09 +0100 Subject: [PATCH] add developer=1 override option for locked units Signed-off-by: John Crispin --- command/cmd.uc | 10 ++++++++-- renderer/renderer.uc | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/command/cmd.uc b/command/cmd.uc index 50138a0..f71390f 100755 --- a/command/cmd.uc +++ b/command/cmd.uc @@ -4,8 +4,14 @@ let uci = require("uci"); let ubus = require("ubus"); let capabfile = fs.open("/etc/ucentral/capabilities.json", "r"); let capab = json(capabfile.read("all")); -let restrictfile = fs.open("/etc/ucentral/restrictions.json", "r"); -let restrict = restrictfile ? json(restrictfile.read("all")) : null; +let pipe = fs.popen('fw_printenv developer'); +let developer = replace(pipe.read("all"), '\n', ''); +pipe.close(); +let restrict = {}; +if (developer != 'developer=1') { + let restrictfile = fs.open("/etc/ucentral/restrictions.json", "r"); + restrict = restrictfile ? json(restrictfile.read("all")) : {}; +} let cmdfile = fs.open(ARGV[0], "r"); let cmd = json(cmdfile.read("all")); let id = ARGV[1]; diff --git a/renderer/renderer.uc b/renderer/renderer.uc index 3bc6fc5..3810572 100644 --- a/renderer/renderer.uc +++ b/renderer/renderer.uc @@ -12,8 +12,14 @@ let conn = ubus ? ubus.connect() : null; let capabfile = fs.open("/etc/ucentral/capabilities.json", "r"); let capab = capabfile ? json(capabfile.read("all")) : null; -let restrictfile = fs.open("/etc/ucentral/restrictions.json", "r"); -let restrict = restrictfile ? json(restrictfile.read("all")) : {}; +let pipe = fs.popen('fw_printenv developer'); +let developer = replace(pipe.read("all"), '\n', ''); +pipe.close(); +let restrict = {}; +if (developer != 'developer=1') { + let restrictfile = fs.open("/etc/ucentral/restrictions.json", "r"); + restrict = restrictfile ? json(restrictfile.read("all")) : {}; +} let serial = cursor.get("ucentral", "config", "serial");