fix(models): avoid serializing plaintext keys from non-env SecretRefs

OpenClaw Bot · OpenClaw Bot · commit 4610b1752b16 · 2026-03-04T19:25:11.000+08:00
diff --git a/src/agents/models-config.providers.normalize-keys.test.ts b/src/agents/models-config.providers.normalize-keys.test.ts
@@ -73,4 +73,71 @@ describe("normalizeProviders", () => {
       await fs.rm(agentDir, { recursive: true, force: true });
     }
   });
+
+  it("does not copy plaintext api keys from non-env SecretRefs into providers", async () => {
+    const agentDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-agent-"));
+    try {
+      await fs.writeFile(
+        path.join(agentDir, "auth-profiles.json"),
+        JSON.stringify({
+          version: 1,
+          profiles: {
+            "openai:default": {
+              id: "openai:default",
+              provider: "openai",
+              type: "api_key",
+              key: "sk-live-from-exec",
+              keyRef: { source: "exec", provider: "default", id: "keychain:openai" },
+            },
+          },
+          providerOrder: { openai: ["openai:default"] },
+        }),
+      );
+      const providers: NonNullable<NonNullable<OpenClawConfig["models"]>["providers"]> = {
+        openai: {
+          baseUrl: "https://api.openai.com/v1",
+          api: "openai-completions",
+          models: [{ id: "gpt-4.1-mini", name: "GPT", input: ["text"], reasoning: false }],
+        },
+      };
+
+      const normalized = normalizeProviders({ providers, agentDir });
+      expect(normalized?.openai?.apiKey).toBeUndefined();
+    } finally {
+      await fs.rm(agentDir, { recursive: true, force: true });
+    }
+  });
+
+  it("uses env var name when auth profile uses env SecretRef", async () => {
+    const agentDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-agent-"));
+    try {
+      await fs.writeFile(
+        path.join(agentDir, "auth-profiles.json"),
+        JSON.stringify({
+          version: 1,
+          profiles: {
+            "openai:default": {
+              id: "openai:default",
+              provider: "openai",
+              type: "api_key",
+              keyRef: { source: "env", provider: "default", id: "OPENAI_API_KEY" },
+            },
+          },
+          providerOrder: { openai: ["openai:default"] },
+        }),
+      );
+      const providers: NonNullable<NonNullable<OpenClawConfig["models"]>["providers"]> = {
+        openai: {
+          baseUrl: "https://api.openai.com/v1",
+          api: "openai-completions",
+          models: [{ id: "gpt-4.1-mini", name: "GPT", input: ["text"], reasoning: false }],
+        },
+      };
+
+      const normalized = normalizeProviders({ providers, agentDir });
+      expect(normalized?.openai?.apiKey).toBe("OPENAI_API_KEY");
+    } finally {
+      await fs.rm(agentDir, { recursive: true, force: true });
+    }
+  });
 });
diff --git a/src/agents/models-config.providers.ts b/src/agents/models-config.providers.ts
@@ -414,23 +414,31 @@ function resolveApiKeyFromProfiles(params: {
       continue;
     }
     if (cred.type === "api_key") {
+      const keyRef = coerceSecretRef(cred.keyRef);
+      if (keyRef) {
+        if (keyRef.source === "env" && keyRef.id.trim()) {
+          return keyRef.id.trim();
+        }
+        // Non-env SecretRefs (exec/file) must not be serialized into models.json.
+        continue;
+      }
       if (cred.key?.trim()) {
         return cred.key;
       }
-      const keyRef = coerceSecretRef(cred.keyRef);
-      if (keyRef?.source === "env" && keyRef.id.trim()) {
-        return keyRef.id.trim();
-      }
       continue;
     }
     if (cred.type === "token") {
+      const tokenRef = coerceSecretRef(cred.tokenRef);
+      if (tokenRef) {
+        if (tokenRef.source === "env" && tokenRef.id.trim()) {
+          return tokenRef.id.trim();
+        }
+        // Non-env SecretRefs (exec/file) must not be serialized into models.json.
+        continue;
+      }
       if (cred.token?.trim()) {
         return cred.token;
       }
-      const tokenRef = coerceSecretRef(cred.tokenRef);
-      if (tokenRef?.source === "env" && tokenRef.id.trim()) {
-        return tokenRef.id.trim();
-      }
       continue;
     }
   }
