Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Keep unchanged security refreshes within the active token lifetime

pulse-triage[bot]a1e368a1ca40
diff --git a/docs/release-control/v6/internal/subsystems/api-contracts.md b/docs/release-control/v6/internal/subsystems/api-contracts.md
index 3e64a5049e..5dfed8840a 100644
--- a/docs/release-control/v6/internal/subsystems/api-contracts.md
+++ b/docs/release-control/v6/internal/subsystems/api-contracts.md
@@ -13503,3 +13503,9 @@ accounts retain explicit inventory recovery. These guarantees are exercised by
`security.transport.test.ts`, `security.test.ts`, `APITokenLifetimes.test.tsx`
and the registered API token panel tests; browser proof covers the actual API
Access consumer with synthetic responses, not installed administrator recovery.
+
+Authority and authenticated-user watchers compare their effective primitive
+values, not the containing security-status object's identity. An ordinary status
+refresh or primary-token hint change with the same user/permission must not
+withdraw a confirmed token or start another inventory read. The registered
+unchanged-principal status-refresh test pins this boundary.
diff --git a/docs/release-control/v6/internal/subsystems/security-privacy.md b/docs/release-control/v6/internal/subsystems/security-privacy.md
index 03ed392724..5c13684460 100644
--- a/docs/release-control/v6/internal/subsystems/security-privacy.md
+++ b/docs/release-control/v6/internal/subsystems/security-privacy.md
@@ -4010,3 +4010,9 @@ scope/organisation containment remain unchanged. Registered
cycles, single writes, obsolete rows and reveal ownership; native browser proof
uses synthetic credentials and responses. No release or installed recovery is
implied by source/component/browser proof.
+
+Authority and authenticated-user watchers compare their effective primitive
+values, not the containing security-status object's identity. An ordinary status
+refresh or primary-token hint change with the same user/permission must not
+withdraw a confirmed token or start another inventory read. The registered
+unchanged-principal status-refresh test pins this boundary.
diff --git a/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx b/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx
index a2be9628de..6de14e0bed 100644
--- a/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/APITokenLifetimes.test.tsx
@@ -253,6 +253,34 @@ describe('API token request lifetimes', () => {
expect(changed).toHaveBeenCalledTimes(1);
});
+ it('keeps a confirmed credential through an unchanged-principal status refresh', async () => {
+ const [status, setStatus] = createSignal({ user: 'admin', allowed: true, hint: 'primary-one' });
+ const Panel = () => {
+ state = useAPITokenManagerState({
+ get currentUser() {
+ return status().user;
+ },
+ get canManage() {
+ return status().allowed;
+ },
+ get currentTokenHint() {
+ return status().hint;
+ },
+ });
+ return null;
+ };
+ render(() => <Panel />);
+ await waitFor(() => expect(state.tokensLoaded()).toBe(true));
+ state.applyScopePreset(['monitoring:read']);
+ await state.handleGenerate();
+ const acceptedReveal = reveal();
+ setStatus({ user: 'admin', allowed: true, hint: 'primary-two' });
+ expect(reveal()).toBe(acceptedReveal);
+ expect(state.newTokenValue()).toBe(created.token);
+ expect(SecurityAPI.listTokens).toHaveBeenCalledTimes(1);
+ expect(SecurityAPI.createToken).toHaveBeenCalledTimes(1);
+ });
+
it('clears only its owned reveal and local credential when its authority is withdrawn', async () => {
await ready();
await state.handleGenerate();
diff --git a/frontend-modern/src/components/Settings/useAPITokenManagerState.ts b/frontend-modern/src/components/Settings/useAPITokenManagerState.ts
index b970225d5f..457844510e 100644
--- a/frontend-modern/src/components/Settings/useAPITokenManagerState.ts
+++ b/frontend-modern/src/components/Settings/useAPITokenManagerState.ts
@@ -89,9 +89,11 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
const [selectedScopes, setSelectedScopes] = createSignal<string[]>([]);
const [agentCapabilitiesManifest] = createResource(fetchAgentCapabilitiesManifest);
const tokenRevealState = useTokenRevealState();
+ const managementAllowed = createMemo(() => props.canManage !== false);
+ const authenticatedUser = createMemo(() => props.currentUser);
const currentOrg = () => getOrgID() || 'default';
const [selectedOrg, setSelectedOrg] = createSignal(currentOrg());
- const [selectedUser, setSelectedUser] = createSignal(props.currentUser);
+ const [selectedUser, setSelectedUser] = createSignal(authenticatedUser());
const [contextVersion, setContextVersion] = createSignal(0);
const [isMutating, setIsMutating] = createSignal(false);
let disposed = false;
@@ -99,8 +101,8 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
let mutationController: AbortController | undefined;
let ownedReveal: ReturnType<typeof tokenRevealState> = null;
const contextIsCurrent = () =>
- !disposed && selectedOrg() === currentOrg() && selectedUser() === props.currentUser;
- const canManage = () => contextIsCurrent() && props.canManage !== false;
+ !disposed && selectedOrg() === currentOrg() && selectedUser() === authenticatedUser();
+ const canManage = () => contextIsCurrent() && managementAllowed();
const isCurrentRecord = (record: APITokenRecord) =>
tokensLoaded() && tokens().includes(unwrap(record));
@@ -267,11 +269,11 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
const resetContext = () => {
if (disposed) return;
- const selectionChanged = selectedOrg() !== currentOrg() || selectedUser() !== props.currentUser;
+ const selectionChanged = selectedOrg() !== currentOrg() || selectedUser() !== authenticatedUser();
invalidateRequests();
batch(() => {
setSelectedOrg(currentOrg());
- setSelectedUser(props.currentUser);
+ setSelectedUser(authenticatedUser());
setTokens([]);
setTokensLoaded(false);
setLoadError(null);
@@ -284,7 +286,9 @@ export const useAPITokenManagerState = (props: APITokenManagerProps) => {
void loadTokens();
};
- createEffect(on(() => [props.canManage, props.currentUser], resetContext, { defer: true }));
+ // Settings refreshes replace the status object. Equal authority/principal
+ // values are not withdrawal: memo equality keeps a newly revealed token usable.
+ createEffect(on([managementAllowed, authenticatedUser], resetContext, { defer: true }));
const unsubscribeOrg = eventBus.on('org_switched', resetContext);
onCleanup(() => {
disposed = true;