mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-09 20:34:31 +00:00
fix(auth): distinguish revoked API keys from transient auth errors (#25754)
Merged via /review-pr -> /prepare-pr -> /merge-pr.
Prepared head SHA: 8f9c07a200
Co-authored-by: rrenamed <87486610+rrenamed@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
This commit is contained in:
committed by
GitHub
parent
f312222159
commit
c0026274d9
22
src/commands/models/list.probe.test.ts
Normal file
22
src/commands/models/list.probe.test.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { mapFailoverReasonToProbeStatus } from "./list.probe.js";
|
||||
|
||||
describe("mapFailoverReasonToProbeStatus", () => {
|
||||
it("maps auth_permanent to auth", () => {
|
||||
expect(mapFailoverReasonToProbeStatus("auth_permanent")).toBe("auth");
|
||||
});
|
||||
|
||||
it("keeps existing failover reason mappings", () => {
|
||||
expect(mapFailoverReasonToProbeStatus("auth")).toBe("auth");
|
||||
expect(mapFailoverReasonToProbeStatus("rate_limit")).toBe("rate_limit");
|
||||
expect(mapFailoverReasonToProbeStatus("billing")).toBe("billing");
|
||||
expect(mapFailoverReasonToProbeStatus("timeout")).toBe("timeout");
|
||||
expect(mapFailoverReasonToProbeStatus("format")).toBe("format");
|
||||
});
|
||||
|
||||
it("falls back to unknown for unrecognized values", () => {
|
||||
expect(mapFailoverReasonToProbeStatus(undefined)).toBe("unknown");
|
||||
expect(mapFailoverReasonToProbeStatus(null)).toBe("unknown");
|
||||
expect(mapFailoverReasonToProbeStatus("model_not_found")).toBe("unknown");
|
||||
});
|
||||
});
|
||||
@@ -82,11 +82,13 @@ export type AuthProbeOptions = {
|
||||
maxTokens: number;
|
||||
};
|
||||
|
||||
const toStatus = (reason?: string | null): AuthProbeStatus => {
|
||||
export function mapFailoverReasonToProbeStatus(reason?: string | null): AuthProbeStatus {
|
||||
if (!reason) {
|
||||
return "unknown";
|
||||
}
|
||||
if (reason === "auth") {
|
||||
if (reason === "auth" || reason === "auth_permanent") {
|
||||
// Keep probe output backward-compatible: permanent auth failures still
|
||||
// surface in the auth bucket instead of showing as unknown.
|
||||
return "auth";
|
||||
}
|
||||
if (reason === "rate_limit") {
|
||||
@@ -102,7 +104,7 @@ const toStatus = (reason?: string | null): AuthProbeStatus => {
|
||||
return "format";
|
||||
}
|
||||
return "unknown";
|
||||
};
|
||||
}
|
||||
|
||||
function buildCandidateMap(modelCandidates: string[]): Map<string, string[]> {
|
||||
const map = new Map<string, string[]>();
|
||||
@@ -346,7 +348,7 @@ async function probeTarget(params: {
|
||||
label: target.label,
|
||||
source: target.source,
|
||||
mode: target.mode,
|
||||
status: toStatus(described.reason),
|
||||
status: mapFailoverReasonToProbeStatus(described.reason),
|
||||
error: redactSecrets(described.message),
|
||||
latencyMs: Date.now() - start,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user