mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-14 21:43:22 +08:00
Users were asked to sign in again every ~30 minutes, even while active. Session lifetime - Browser: UDS_SESSION kept its login-time Max-Age and was never re-issued, so the cookie vanished 30 min after login. Re-issue it on use (throttled by slidingInterval). - Desktop: remote.mux WS traffic never passed the HTTP auth middleware, so the idle TTL never slid. assertPrincipalLive now reports activity and slides the session and the account's bridges (throttled). - New setting sessionIdleTimeoutHours (Settings page + config). Default 0 = no automatic sign-out; only a manual sign-out ends a session, so conversations and night-time cron are never cut off. 0.5-168 enables an idle timeout with the 7-day cap. The TTL is read live. - Stores support long TTLs: the absolute cap follows the TTL, older 7-day sessions are lifted on activity, and expiry timers re-arm instead of overflowing setTimeout (~24.8 days). UAC token check - Every 2 hours (and 1 min after start) each QR session's token is checked against icenterapi. A rejected token is only flagged, never a sign-out. Network errors, 5xx and bad JSON keep the previous verdict (the old 6h check revoked all of an account's sessions on any failure, including outages). - GET /uds-auth/session-status (non-sliding) returns alive + tokenValid. The client probes it every minute and on focus: a gone session signs the UI out with a notice; a rejected token opens a refresh QR once. - Scanning in refresh mode writes the new token into every live session of the account and the skill credential cache in place: no new session, no reload. Other accounts are rejected (token_refresh_emp_mismatch). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
239 lines
7.4 KiB
JavaScript
239 lines
7.4 KiB
JavaScript
import { createHash, randomBytes } from 'node:crypto'
|
|
import { SessionStore, absoluteCapSeconds } from './store.js'
|
|
|
|
function hashBearer(bearer) {
|
|
return createHash('sha256').update(String(bearer)).digest('hex')
|
|
}
|
|
|
|
/**
|
|
* Redis-backed auth session store.
|
|
* Keys: uds-sess:{sessionId}, uds-bearer:{hash} → sessionId, uds-emp:{empNo} set
|
|
*/
|
|
export class RedisStore extends SessionStore {
|
|
constructor(redisClient) {
|
|
super()
|
|
if (!redisClient) throw new Error('Redis client is required')
|
|
this._client = redisClient
|
|
this._lastMint = null
|
|
}
|
|
|
|
_sessKey(id) { return `uds-sess:${id}` }
|
|
_bearerKey(hash) { return `uds-bearer:${hash}` }
|
|
_empKey(empNo) { return `uds-emp:${empNo}` }
|
|
_profileKey(empNo) { return `uds-profile:${empNo}` }
|
|
|
|
async create(userData, ttlSeconds = 1800) {
|
|
const empNo = String(userData?.empNo || '').trim()
|
|
if (!empNo) throw new Error('session_empNo_required')
|
|
const sessionId = randomBytes(16).toString('hex')
|
|
const bearer = randomBytes(32).toString('hex')
|
|
const bearerHash = hashBearer(bearer)
|
|
const now = Date.now()
|
|
const ttl = Math.max(60, Number(ttlSeconds) || 1800)
|
|
const record = {
|
|
sessionId,
|
|
bearerHash,
|
|
empNo,
|
|
kind: (() => {
|
|
const mode = String(userData?.authMode || '')
|
|
if (mode.includes('local-admin') || mode === 'sealed_box' || mode === 'local_admin') {
|
|
return 'sealed_box'
|
|
}
|
|
if (mode.includes('fallback') || mode === 'fallback-password' || mode === 'fallback-login') {
|
|
return 'fallback'
|
|
}
|
|
if (empNo === 'administrator') return 'fallback'
|
|
return 'uds'
|
|
})(),
|
|
userData: { ...userData },
|
|
createdAt: now,
|
|
expiresAt: now + ttl * 1000,
|
|
absoluteExpiresAt: now + absoluteCapSeconds(ttl) * 1000,
|
|
}
|
|
const payload = JSON.stringify(record)
|
|
await this._client.setEx(this._sessKey(sessionId), ttl, payload)
|
|
await this._client.setEx(this._bearerKey(bearerHash), ttl, sessionId)
|
|
await this._client.sAdd(this._empKey(empNo), sessionId)
|
|
await this._client.expire(this._empKey(empNo), ttl)
|
|
this._lastMint = { empNo, bearer, sessionId }
|
|
return {
|
|
sessionId,
|
|
bearer,
|
|
record: {
|
|
sessionId,
|
|
empNo,
|
|
kind: record.kind,
|
|
userData: { ...userData },
|
|
createdAt: record.createdAt,
|
|
expiresAt: record.expiresAt,
|
|
absoluteExpiresAt: record.absoluteExpiresAt,
|
|
},
|
|
}
|
|
}
|
|
|
|
async _load(sessionId) {
|
|
if (!sessionId) return null
|
|
const raw = await this._client.get(this._sessKey(sessionId))
|
|
if (!raw) return null
|
|
try {
|
|
const row = JSON.parse(raw)
|
|
if (row.absoluteExpiresAt && Date.now() > row.absoluteExpiresAt) {
|
|
await this.revokeSession(sessionId)
|
|
return null
|
|
}
|
|
return row
|
|
} catch {
|
|
return null
|
|
}
|
|
}
|
|
|
|
_public(row) {
|
|
if (!row) return null
|
|
return {
|
|
sessionId: row.sessionId,
|
|
empNo: row.empNo,
|
|
kind: row.kind,
|
|
userData: { ...row.userData },
|
|
createdAt: row.createdAt,
|
|
expiresAt: row.expiresAt,
|
|
absoluteExpiresAt: row.absoluteExpiresAt,
|
|
}
|
|
}
|
|
|
|
async getByBearer(bearer) {
|
|
const t = String(bearer || '').trim()
|
|
if (!t || t.length < 16) return null
|
|
const sessionId = await this._client.get(this._bearerKey(hashBearer(t)))
|
|
return this._public(await this._load(sessionId))
|
|
}
|
|
|
|
getByBearerSync() {
|
|
// Redis cannot sync-read; callers must use async path or MemoryStore.
|
|
return null
|
|
}
|
|
|
|
async getBySessionId(sessionId) {
|
|
return this._public(await this._load(String(sessionId || '').trim()))
|
|
}
|
|
|
|
async touch(sessionId, ttlSeconds) {
|
|
const row = await this._load(sessionId)
|
|
if (!row) return null
|
|
const ttl = Math.max(60, Number(ttlSeconds) || 1800)
|
|
if (absoluteCapSeconds(ttl) > absoluteCapSeconds(0)) {
|
|
row.absoluteExpiresAt = Math.max(row.absoluteExpiresAt || 0, Date.now() + ttl * 1000)
|
|
}
|
|
const absLeft = row.absoluteExpiresAt
|
|
? Math.max(0, Math.floor((row.absoluteExpiresAt - Date.now()) / 1000))
|
|
: ttl
|
|
const nextTtl = Math.min(ttl, absLeft || ttl)
|
|
if (nextTtl <= 0) {
|
|
await this.revokeSession(sessionId)
|
|
return null
|
|
}
|
|
row.expiresAt = Date.now() + nextTtl * 1000
|
|
row.userData = { ...row.userData, lastActiveAt: new Date().toISOString() }
|
|
await this._client.setEx(this._sessKey(sessionId), nextTtl, JSON.stringify(row))
|
|
await this._client.setEx(this._bearerKey(row.bearerHash), nextTtl, sessionId)
|
|
return this._public(row)
|
|
}
|
|
|
|
async updateUserData(sessionId, patch) {
|
|
const row = await this._load(sessionId)
|
|
if (!row) return null
|
|
const left = Math.floor((Number(row.expiresAt) - Date.now()) / 1000)
|
|
if (left <= 0) return null
|
|
row.userData = { ...row.userData, ...patch }
|
|
await this._client.setEx(this._sessKey(sessionId), left, JSON.stringify(row))
|
|
return this._public(row)
|
|
}
|
|
|
|
async revokeSession(sessionId) {
|
|
const row = await this._load(sessionId)
|
|
if (!row) {
|
|
await this._client.del(this._sessKey(sessionId))
|
|
return false
|
|
}
|
|
await this._client.del(this._sessKey(sessionId))
|
|
await this._client.del(this._bearerKey(row.bearerHash))
|
|
await this._client.sRem(this._empKey(row.empNo), sessionId)
|
|
return true
|
|
}
|
|
|
|
async revokeBearer(bearer) {
|
|
const t = String(bearer || '').trim()
|
|
if (!t) return false
|
|
const sessionId = await this._client.get(this._bearerKey(hashBearer(t)))
|
|
if (!sessionId) return false
|
|
return this.revokeSession(sessionId)
|
|
}
|
|
|
|
async revokeEmpNo(empNo) {
|
|
const e = String(empNo || '').trim()
|
|
const members = await this._client.sMembers(this._empKey(e))
|
|
let n = 0
|
|
for (const sid of members || []) {
|
|
if (await this.revokeSession(sid)) n++
|
|
}
|
|
await this._client.del(this._empKey(e))
|
|
return n
|
|
}
|
|
|
|
async setProfile(empNo, profile) {
|
|
const e = String(empNo || '').trim()
|
|
if (!e || !profile) return
|
|
await this._client.set(this._profileKey(e), JSON.stringify({ ...profile, empNo: e }))
|
|
}
|
|
|
|
async getProfile(empNo) {
|
|
const raw = await this._client.get(this._profileKey(String(empNo || '').trim()))
|
|
if (!raw) return null
|
|
try { return JSON.parse(raw) } catch { return null }
|
|
}
|
|
|
|
async clear() {
|
|
const keys = await this._client.keys('uds-sess:*')
|
|
const bkeys = await this._client.keys('uds-bearer:*')
|
|
const ekeys = await this._client.keys('uds-emp:*')
|
|
const pkeys = await this._client.keys('uds-profile:*')
|
|
const all = [...keys, ...bkeys, ...ekeys, ...pkeys]
|
|
if (all.length) await this._client.del(all)
|
|
}
|
|
|
|
async get(empNo) {
|
|
const members = await this._client.sMembers(this._empKey(String(empNo || '').trim()))
|
|
for (const sid of members || []) {
|
|
const row = await this._load(sid)
|
|
if (row) return { ...row.userData, _sessionId: row.sessionId }
|
|
}
|
|
return null
|
|
}
|
|
|
|
async setex(empNo, seconds, userData) {
|
|
const { bearer, sessionId, record } = await this.create(
|
|
{ ...userData, empNo: String(empNo) },
|
|
seconds,
|
|
)
|
|
this._lastMint = { empNo: String(empNo), bearer, sessionId }
|
|
return record.userData
|
|
}
|
|
|
|
takeLastMint() {
|
|
const m = this._lastMint
|
|
this._lastMint = null
|
|
return m
|
|
}
|
|
|
|
async delete(empNo) {
|
|
await this.revokeEmpNo(empNo)
|
|
}
|
|
|
|
async has(empNo) {
|
|
return !!(await this.get(empNo))
|
|
}
|
|
|
|
async keys() {
|
|
const ekeys = await this._client.keys('uds-emp:*')
|
|
return ekeys.map((k) => k.replace(/^uds-emp:/, ''))
|
|
}
|
|
}
|