gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(portal): Add helper script for reliable service enumeration

Browse Source 
- Create /usr/bin/secubox-services-status helper script
- Update portal scanInitServices to use helper script
- Fallback to inline script if helper not available
- Fixes 0/0 services display caused by fs.exec output buffering

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-02-01 06:11:10 +01:00
parent 369ef86487
commit 20cbf0adf3
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package/secubox/luci-app-secubox-portal/htdocs/luci-static/resources/view/secubox-portal/index.js
View File

@ -84,18 +84,9 @@ return view.extend({
}, },
scanInitServices: function() { scanInitServices: function() {
// Scan /etc/init.d for service status using a temp file approach // Use helper script for reliable output capture
// which is more reliable with LuCI's fs.exec // Falls back to inline script if helper not available
var script = return fs.exec('/usr/bin/secubox-services-status', []).then(function(res) {
'for s in /etc/init.d/*; do ' +
'[ -x "$s" ] || continue; ' +
'n=$(basename "$s"); ' +
'r=stopped; ' +
'pgrep "$n" >/dev/null 2>&1 && r=running; ' +
'printf "%s:%s\\n" "$n" "$r"; ' +
'done';
return fs.exec('/bin/sh', ['-c', script]).then(function(res) {
var services = {}; var services = {};
if (res && res.stdout) { if (res && res.stdout) {
res.stdout.trim().split('\n').forEach(function(line) { res.stdout.trim().split('\n').forEach(function(line) {
@ -106,9 +97,25 @@ return view.extend({
}); });
} }
return services; return services;
}).catch(function(err) { }).catch(function() {
console.error('scanInitServices failed:', err); // Fallback: use inline script
return {}; return fs.exec('/bin/sh', ['-c',
'for s in /etc/init.d/*; do [ -x "$s" ] || continue; ' +
'n=$(basename "$s"); r=stopped; ' +
'pgrep -f "$n" >/dev/null 2>&1 && r=running; ' +
'printf "%s:%s\\n" "$n" "$r"; done'
]).then(function(res) {
var services = {};
if (res && res.stdout) {
res.stdout.trim().split('\n').forEach(function(line) {
var parts = line.split(':');
if (parts.length === 2 && parts[0] && parts[1]) {
services[parts[0]] = parts[1];
}
});
}
return services;
}).catch(function() { return {}; });
}); });
}, },

3
package/secubox/secubox-core/Makefile
View File

@ -87,6 +87,9 @@ define Package/secubox-core/install
$(INSTALL_BIN) ./root/usr/sbin/secubox-feedback $(1)/usr/sbin/ $(INSTALL_BIN) ./root/usr/sbin/secubox-feedback $(1)/usr/sbin/
$(INSTALL_BIN) ./root/usr/sbin/secubox-tftp-recovery $(1)/usr/sbin/ $(INSTALL_BIN) ./root/usr/sbin/secubox-tftp-recovery $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) ./root/usr/bin/secubox-services-status $(1)/usr/bin/
# TFTP Recovery init script # TFTP Recovery init script
$(INSTALL_BIN) ./root/etc/init.d/secubox-tftp-recovery $(1)/etc/init.d/ $(INSTALL_BIN) ./root/etc/init.d/secubox-tftp-recovery $(1)/etc/init.d/

11
package/secubox/secubox-core/root/usr/bin/secubox-services-status Executable file
View File

@ -0,0 +1,11 @@
#!/bin/sh
# SecuBox Services Status - List init.d services with running status
# Used by LuCI portal for reliable service enumeration
for s in /etc/init.d/*; do
[ -x "$s" ] || continue
n=$(basename "$s")
r=stopped
pgrep -f "$n" >/dev/null 2>&1 && r=running
printf "%s:%s\n" "$n" "$r"
done