fix account lookup invalid key fallback

zhangguiping-xydt · zhangguiping-xydt · commit 9448fae03776 · 2026-06-26T11:44:41.000+08:00
diff --git a/src/routing/account-lookup.test.ts b/src/routing/account-lookup.test.ts
@@ -94,6 +94,15 @@ describe("resolveNormalizedAccountEntry", () => {
         ),
       expected: undefined,
     },
+    {
+      name: "does not resolve invalid raw keys through the default account fallback",
+      accounts: {
+        "constructor ": { id: "blocked" },
+      } as Record<string, { id: string }>,
+      resolve: (accounts: Record<string, { id: string }>) =>
+        resolveNormalizedAccountEntry(accounts, "default", normalizeRoutingAccountId),
+      expected: undefined,
+    },
     {
       name: "ignores prototype-chain values",
       resolve: () => undefined,
diff --git a/src/routing/account-lookup.ts b/src/routing/account-lookup.ts
@@ -1,6 +1,7 @@
 // Account lookup helpers resolve route accounts from normalized account ids.
 import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";
 import { isBlockedObjectKey } from "../infra/prototype-keys.js";
+import { normalizeOptionalAccountId } from "./account-id.js";
 
 // Case-insensitive account lookup for config maps that may preserve user
 // casing. Exact keys win so callers can still distinguish intentional entries.
@@ -39,8 +40,12 @@ export function resolveNormalizedAccountEntry<T>(
     if (isBlockedObjectKey(key)) {
       return false;
     }
-    const normalizedKey = normalizeAccountId(key);
-    return !isBlockedObjectKey(normalizedKey) && normalizedKey === normalized;
+    const candidate = normalizeAccountId(key);
+    return (
+      Boolean(normalizeOptionalAccountId(key)) &&
+      !isBlockedObjectKey(candidate) &&
+      candidate === normalized
+    );
   });
   return matchKey ? accounts[matchKey] : undefined;
 }
