vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 08:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: changed explicit-path handling regression (#74672)

Browse Source 
* fix: changed explicit-path handling regression

* fix: preserve unicode adc fallback paths

---------

Co-authored-by: openclaw-clawsweeper[bot] <280122609+openclaw-clawsweeper[bot]@users.noreply.github.com>
Co-authored-by: Shakker <shakkerdroid@gmail.com>
This commit is contained in:
clawsweeper[bot]
2026-04-30 01:36:59 +01:00
committed by GitHub
parent 08c4af0ddf
commit e9fcbe1533
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/agents/model-auth-env.ts
View File

@@ -31,10 +31,18 @@ function expandAuthEvidencePath(rawPath: string, env: NodeJS.ProcessEnv): string
if (!trimmed) {
return undefined;
}
const homeDir = normalizeOptionalSecretInput(env.HOME) ?? os.homedir();
const homeDir = normalizeOptionalPathInput(env.HOME) ?? os.homedir();
return trimmed.replaceAll("${HOME}", homeDir);
}
function normalizeOptionalPathInput(value: unknown): string | undefined {
if (typeof value !== "string") {
return undefined;
}
const trimmed = value.trim();
return trimmed ? trimmed : undefined;
}
function hasRequiredAuthEvidenceEnv(
evidence: ProviderAuthEvidence,
env: NodeJS.ProcessEnv,
@@ -51,7 +59,7 @@ function hasRequiredAuthEvidenceEnv(
function hasLocalFileAuthEvidence(evidence: ProviderAuthEvidence, env: NodeJS.ProcessEnv): boolean {
if (evidence.fileEnvVar) {
const explicitPath = normalizeOptionalSecretInput(env[evidence.fileEnvVar]);
const explicitPath = normalizeOptionalPathInput(env[evidence.fileEnvVar]);
if (explicitPath) {
return fs.existsSync(explicitPath);
}

54
src/agents/model-auth.profiles.test.ts
View File

@@ -959,6 +959,60 @@ describe("getApiKeyForModel", () => {
});
});
it("resolveEnvApiKey('google-vertex') accepts Unicode explicit ADC credential paths", async () => {
const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-google-adc-unicode-"));
const explicitDir = path.join(homeDir, "認証情報");
const fallbackDir = path.join(homeDir, ".config", "gcloud");
const explicitCredentialsPath = path.join(explicitDir, "adc.json");
await fs.mkdir(explicitDir, { recursive: true });
await fs.mkdir(fallbackDir, { recursive: true });
await fs.writeFile(explicitCredentialsPath, "{}", "utf8");
await fs.writeFile(
path.join(fallbackDir, "application_default_credentials.json"),
"{}",
"utf8",
);
try {
const resolved = resolveEnvApiKey("google-vertex", {
GOOGLE_APPLICATION_CREDENTIALS: explicitCredentialsPath,
GOOGLE_CLOUD_LOCATION: "us-central1",
GOOGLE_CLOUD_PROJECT: "vertex-project",
HOME: homeDir,
} as NodeJS.ProcessEnv);
expect(resolved?.apiKey).toBe("gcp-vertex-credentials");
expect(resolved?.source).toBe("gcloud adc");
} finally {
await fs.rm(homeDir, { recursive: true, force: true });
}
});
it("resolveEnvApiKey('google-vertex') accepts Unicode ADC fallback home paths", async () => {
const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-google-adc-home-"));
const homeDir = path.join(tempDir, "認証情報-home");
const fallbackDir = path.join(homeDir, ".config", "gcloud");
await fs.mkdir(fallbackDir, { recursive: true });
await fs.writeFile(
path.join(fallbackDir, "application_default_credentials.json"),
"{}",
"utf8",
);
try {
const resolved = resolveEnvApiKey("google-vertex", {
GOOGLE_CLOUD_LOCATION: "us-central1",
GOOGLE_CLOUD_PROJECT: "vertex-project",
HOME: homeDir,
} as NodeJS.ProcessEnv);
expect(resolved?.apiKey).toBe("gcp-vertex-credentials");
expect(resolved?.source).toBe("gcloud adc");
} finally {
await fs.rm(tempDir, { recursive: true, force: true });
}
});
it("resolveEnvApiKey('google-vertex') keeps ADC fallback when manifest env candidates are empty", async () => {
const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-google-adc-candidates-"));
const credentialsPath = path.join(tempDir, "adc.json");