Skip to content

[refactor] fixes issue #948 nit fix /api/health_lockdown redundant ternary #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
accius merged 2 commits into from
May 6, 2026
+8 −15
Merged

[refactor] fixes issue #948 nit fix /api/health_lockdown redundant ternary #953

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2799f4a
remove redundant ternary isAuthed ? {...} : {...} inside outer condit…
MichaelWheeley May 4, 2026
433754c
minor, blank line
MichaelWheeley May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions server/routes/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,22 +783,16 @@ module.exports = function (app, ctx) {
uptimeFormatted: `${Math.floor(process.uptime() / 86400)}d ${Math.floor((process.uptime() % 86400) / 3600)}h ${Math.floor((process.uptime() % 3600) / 60)}m`,
timestamp: new Date().toISOString(),

// SECURITY: Only expose file paths and detailed internals to authenticated requests
// everything after this point is not output unless (isAuthed === true)
...(isAuthed
? {
// SECURITY: Only expose file paths and detailed internals to authenticated requests
persistence: isAuthed
? {
enabled: !!STATS_FILE,
file: STATS_FILE || null,
lastSaved: visitorStats.lastSaved,
}
: { enabled: !!STATS_FILE },
// SECURITY: Session details include partially anonymized IPs — only expose to authenticated requests.
// Unauthenticated requests get aggregate counts only.
sessions: isAuthed
? sessionTracker.getStats()
: { concurrent: sessionTracker.activeSessions.size, peakConcurrent: sessionTracker.peakConcurrent },
persistence: {
enabled: !!STATS_FILE,
file: STATS_FILE || null,
lastSaved: visitorStats.lastSaved,
},
sessions: sessionTracker.getStats(),
visitors: {
today: {
date: visitorStats.today,
Expand Down Expand Up @@ -846,8 +840,7 @@ module.exports = function (app, ctx) {
totalInFlight: upstream.inFlight.size,
pskMqttProxy: {
connected: pskMqtt.connected,
// SECURITY: Only expose active callsigns to authenticated requests
activeCallsigns: isAuthed ? [...pskMqtt.subscribedCalls] : pskMqtt.subscribedCalls.size,
activeCallsigns: [...pskMqtt.subscribedCalls],
sseClients: [...pskMqtt.subscribers.values()].reduce((n, s) => n + s.size, 0),
spotsReceived: pskMqtt.stats.spotsReceived,
spotsRelayed: pskMqtt.stats.spotsRelayed,
Expand Down
Loading