Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

final normalization

adilsond008ee535202
diff --git a/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.test.ts b/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.test.ts
index acb2bff26a..e992fd09b3 100644
--- a/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.test.ts
+++ b/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.test.ts
@@ -70,6 +70,20 @@ describe("Azure Key Vault secret names", () => {
expect(importKey.slice(0, -"_prod".length)).toBe("user-password");
});
+ test("matches the key schema regardless of the vault name's case", () => {
+ const schema = "TESTE_ADILSON_{{secretKey}}";
+
+ expect(infisicalImportKeyFromAzureKeyVaultName("teste-adilson-my-secret", "dev", schema)).toBe(
+ "TESTE_ADILSON_my-secret"
+ );
+ expect(infisicalImportKeyFromAzureKeyVaultName("Teste-Adilson-My-Secret", "dev", schema)).toBe(
+ "TESTE_ADILSON_My-Secret"
+ );
+ expect(infisicalImportKeyFromAzureKeyVaultName("my-secret-PROD", "prod", "{{secretKey}}_{{environment}}")).toBe(
+ "my-secret_prod"
+ );
+ });
+
test("leaves a vault name unchanged when it does not match the key schema", () => {
expect(infisicalImportKeyFromAzureKeyVaultName("user-password", "dev", "{{environment}}_{{secretKey}}")).toBe(
"user-password"
diff --git a/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.ts b/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.ts
index e9ccce748d..9d0b51bffc 100644
--- a/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.ts
+++ b/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-secret-name.ts
@@ -2,13 +2,6 @@ import handlebars from "handlebars";
import { SecretSyncError } from "../secret-sync-errors";
-// Azure Key Vault secret names allow hyphens and reject underscores. Infisical names may use
-// either character, so an imported vault name is stored unchanged. Sync still rewrites each
-// underscore to a hyphen on the way out, because that is the only form Key Vault accepts.
-// Two Infisical names that differ only by that substitution refer to the same vault secret,
-// which keeps older underscored imports matched. Key Vault names are also case-insensitive, so
-// `API_KEY` and `api-key` are one vault secret as well.
-
export const toAzureKeyVaultSecretName = (infisicalKey: string) => infisicalKey.replaceAll("_", "-");
export const normalizeAzureKeyVaultSecretName = (name: string) => toAzureKeyVaultSecretName(name).toLowerCase();
@@ -24,12 +17,13 @@ export const infisicalImportKeyFromAzureKeyVaultName = (azureKey: string, enviro
const infisicalPrefix = infisicalParts[0];
const infisicalSuffix = infisicalParts[infisicalParts.length - 1];
- const azureSchema = toAzureKeyVaultSecretName(compiledSchema);
- const azureParts = azureSchema.split("{{secretKey}}");
+ const azureSchema = normalizeAzureKeyVaultSecretName(compiledSchema);
+ const azureParts = azureSchema.split("{{secretkey}}");
const azurePrefix = azureParts[0];
const azureSuffix = azureParts[azureParts.length - 1];
+ const normalizedAzureKey = azureKey.toLowerCase();
- if (!azureKey.startsWith(azurePrefix) || !azureKey.endsWith(azureSuffix)) return azureKey;
+ if (!normalizedAzureKey.startsWith(azurePrefix) || !normalizedAzureKey.endsWith(azureSuffix)) return azureKey;
if (azureKey.length < azurePrefix.length + azureSuffix.length) return azureKey;
const secretPortion = azureKey.slice(