mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-15 17:12:59 -04:00
lockdown audit done
This commit is contained in:
@@ -6,6 +6,8 @@ const io = require('../../globals/io');
|
||||
const logger = require('../../globals/logger').child('liftService');
|
||||
const { loadConfig } = require('../../helpers/configLoader');
|
||||
const { isVerified } = require('../verificationService');
|
||||
const { getMode, MODES } = require('../modeManager');
|
||||
const { isLockdownAdmin } = require('../roleService');
|
||||
const {
|
||||
homeAssistantEvents,
|
||||
getRawEntitySnapshot,
|
||||
@@ -178,6 +180,9 @@ homeAssistantEvents.on('status', emitUpdate);
|
||||
io.on('connection', (socket) => {
|
||||
socket.on('lift:up', async (_, cb = () => {}) => {
|
||||
try {
|
||||
if (getMode() === MODES.LOCKDOWN && !isLockdownAdmin(socket)) {
|
||||
throw new Error('Server in lockdown');
|
||||
}
|
||||
if (!isVerified(socket)) throw new Error('VIP verification required');
|
||||
const resp = await moveUp(socket.id || 'socket');
|
||||
cb({ success: true, ...resp });
|
||||
@@ -188,6 +193,9 @@ io.on('connection', (socket) => {
|
||||
|
||||
socket.on('lift:down', async (_, cb = () => {}) => {
|
||||
try {
|
||||
if (getMode() === MODES.LOCKDOWN && !isLockdownAdmin(socket)) {
|
||||
throw new Error('Server in lockdown');
|
||||
}
|
||||
if (!isVerified(socket)) throw new Error('VIP verification required');
|
||||
const resp = await moveDown(socket.id || 'socket');
|
||||
cb({ success: true, ...resp });
|
||||
|
||||
@@ -7,6 +7,7 @@ const io = require('../../globals/io');
|
||||
const logger = require('../../globals/logger').child('llmCommentary');
|
||||
const { loadConfig } = require('../../helpers/configLoader');
|
||||
const { getRole, roleEvents } = require('../roleService');
|
||||
const { getMode, MODES, modeEvents } = require('../modeManager');
|
||||
const roverManager = require('../roverManager');
|
||||
const { getActiveDrivers } = require('../turnService');
|
||||
const { getNickname } = require('../nicknameService');
|
||||
@@ -258,7 +259,9 @@ const runner = createRunner({
|
||||
updateStatus,
|
||||
});
|
||||
|
||||
if (enabled && model && ollamaUrl) {
|
||||
const canRunFromConfig = enabled && model && ollamaUrl;
|
||||
|
||||
if (canRunFromConfig) {
|
||||
registerHooks({
|
||||
io,
|
||||
roleEvents,
|
||||
@@ -272,7 +275,22 @@ if (enabled && model && ollamaUrl) {
|
||||
onRoverRemoved: snapshotEngine.removeRover,
|
||||
});
|
||||
|
||||
runner.start();
|
||||
const mode = getMode();
|
||||
if (mode === MODES.LOCKDOWN) {
|
||||
runner.stop('paused during lockdown');
|
||||
logger.info('LLM commentary paused due to lockdown mode');
|
||||
} else {
|
||||
runner.start();
|
||||
}
|
||||
|
||||
modeEvents.on('change', (nextMode) => {
|
||||
if (nextMode === MODES.LOCKDOWN) {
|
||||
runner.stop('paused during lockdown');
|
||||
logger.info('LLM commentary paused due to lockdown mode');
|
||||
return;
|
||||
}
|
||||
runner.start();
|
||||
});
|
||||
} else {
|
||||
const disabledReason = !enabled
|
||||
? 'llmCommentary.enabled is false'
|
||||
|
||||
@@ -47,6 +47,21 @@ function createRunner(deps) {
|
||||
scheduleNextTick(runTick, 0);
|
||||
}
|
||||
|
||||
function stop(reason = 'stopped') {
|
||||
if (runtime.timer) {
|
||||
clearTimeout(runtime.timer);
|
||||
runtime.timer = null;
|
||||
}
|
||||
updatePhase('paused', {
|
||||
running: false,
|
||||
inFlight: false,
|
||||
currentRunId: null,
|
||||
nextRunAt: null,
|
||||
lastOutcome: 'paused',
|
||||
lastReason: reason,
|
||||
});
|
||||
}
|
||||
|
||||
function clearRuntimeHistory() {
|
||||
runtime.contextResetAt = Date.now();
|
||||
runtime.clearCount += 1;
|
||||
@@ -331,6 +346,7 @@ function createRunner(deps) {
|
||||
|
||||
return {
|
||||
start,
|
||||
stop,
|
||||
runTick,
|
||||
clearRuntimeHistory,
|
||||
wakeForDriverActivity: () => wakeForDriverActivity(runTick),
|
||||
|
||||
@@ -6,6 +6,8 @@ const io = require('../../globals/io');
|
||||
const logger = require('../../globals/logger').child('neatoService');
|
||||
const { loadConfig } = require('../../helpers/configLoader');
|
||||
const { isVerified } = require('../verificationService');
|
||||
const { getMode, MODES } = require('../modeManager');
|
||||
const { isLockdownAdmin } = require('../roleService');
|
||||
const { createLidarRuntime } = require('./lidarRuntime');
|
||||
const {
|
||||
homeAssistantEvents,
|
||||
@@ -315,8 +317,15 @@ if (lidarRuntime) {
|
||||
}
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
function assertLockdownAccess() {
|
||||
if (getMode() === MODES.LOCKDOWN && !isLockdownAdmin(socket)) {
|
||||
throw new Error('Server in lockdown');
|
||||
}
|
||||
}
|
||||
|
||||
socket.on('neato:start', async (_, cb = () => {}) => {
|
||||
try {
|
||||
assertLockdownAccess();
|
||||
if (!isVerified(socket)) {
|
||||
throw new Error('VIP verification required');
|
||||
}
|
||||
@@ -329,6 +338,7 @@ io.on('connection', (socket) => {
|
||||
|
||||
socket.on('neato:sendHome', async (_, cb = () => {}) => {
|
||||
try {
|
||||
assertLockdownAccess();
|
||||
if (!isVerified(socket)) {
|
||||
throw new Error('VIP verification required');
|
||||
}
|
||||
@@ -341,6 +351,7 @@ io.on('connection', (socket) => {
|
||||
|
||||
socket.on('neato:locate', async (_, cb = () => {}) => {
|
||||
try {
|
||||
assertLockdownAccess();
|
||||
if (!isVerified(socket)) {
|
||||
throw new Error('VIP verification required');
|
||||
}
|
||||
@@ -353,6 +364,7 @@ io.on('connection', (socket) => {
|
||||
|
||||
socket.on('neato:clearErrors', async (_, cb = () => {}) => {
|
||||
try {
|
||||
assertLockdownAccess();
|
||||
if (!isVerified(socket)) {
|
||||
throw new Error('VIP verification required');
|
||||
}
|
||||
@@ -365,6 +377,7 @@ io.on('connection', (socket) => {
|
||||
|
||||
socket.on('neato:powerCycle', async (_, cb = () => {}) => {
|
||||
try {
|
||||
assertLockdownAccess();
|
||||
if (!isVerified(socket)) {
|
||||
throw new Error('VIP verification required');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user