Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/domain/expressions/model_resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,8 @@ export class ModelResolver {
const escapedValue = secretValue
.replace(/\\/g, "\\\\")
.replace(/"/g, '\\"')
.replace(/'/g, "\\'")
.replace(/`/g, "\\`")
.replace(/\n/g, "\\n")
.replace(/\r/g, "\\r")
.replace(/\t/g, "\\t");
Expand Down
26 changes: 23 additions & 3 deletions src/domain/vaults/vault_expression_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,26 @@ Deno.test("ModelResolver.resolveVaultExpressions", async (t) => {
assertEquals(result, '"col1\\tcol2\\tcol3"');
});

await t.step("should escape single quotes in secret values", async () => {
const resolver = createResolverWithMockVault({
"quote-secret": "p@ss'w0rd",
});
const result = await resolver.resolveVaultExpressions(
"vault.get(test-vault, quote-secret)",
);
assertEquals(result, '"p@ss\\\'w0rd"');
});

await t.step("should escape backticks in secret values", async () => {
const resolver = createResolverWithMockVault({
"backtick-secret": "value`with`backticks",
});
const result = await resolver.resolveVaultExpressions(
"vault.get(test-vault, backtick-secret)",
);
assertEquals(result, '"value\\`with\\`backticks"');
});

await t.step(
"should handle complex secret with multiple special characters",
async () => {
Expand Down Expand Up @@ -256,7 +276,7 @@ Deno.test("ModelResolver.resolveVaultExpressions", async (t) => {
const result = await resolver.resolveVaultExpressions(
"vault.get(test-vault, dollar-backtick)",
);
assertEquals(result, '"prefix$`suffix"');
assertEquals(result, '"prefix$\\`suffix"');
},
);

Expand All @@ -269,7 +289,7 @@ Deno.test("ModelResolver.resolveVaultExpressions", async (t) => {
const result = await resolver.resolveVaultExpressions(
"vault.get(test-vault, dollar-quote)",
);
assertEquals(result, '"prefix$\'suffix"');
assertEquals(result, '"prefix$\\\'suffix"');
},
);

Expand Down Expand Up @@ -308,7 +328,7 @@ Deno.test("ModelResolver.resolveVaultExpressions", async (t) => {
const result = await resolver.resolveVaultExpressions(
"vault.get(test-vault, multi-dollar)",
);
assertEquals(result, '"a]$&b$`c$\'d$$e$1f"');
assertEquals(result, '"a]$&b$\\`c$\\\'d$$e$1f"');
},
);

Expand Down