awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-12 05:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: review comments

Browse Source
This commit is contained in:
Piyush Gupta
2025-10-15 21:27:44 +05:30
parent 4d19b9faab
commit ad6b4c716c
7 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret-sync/laravel-forge/laravel-forge-sync-fns.ts
+64 -16
View File
@@ -29,27 +29,65 @@ const parseEnv = (str: string) => {
const lines = str.split("\n");
const parsed: { key: string; value: string }[] = [];
lines.forEach((line) => {
const trimmed = line.trim();
let i = 0;
while (i < lines.length) {
const trimmed = lines[i].trim();
const isInvalidLine = trimmed === "" || trimmed.startsWith("#");
// Skip empty lines and comments
if (trimmed === "" || trimmed.startsWith("#")) {
i += 1;
// eslint-disable-next-line no-continue
continue;
}
if (!isInvalidLine && trimmed.includes("=")) {
if (trimmed.includes("=")) {
const equalIndex = trimmed.indexOf("=");
const key = trimmed.substring(0, equalIndex).trim();
const valueRaw = trimmed.substring(equalIndex + 1).trim();
let value = valueRaw;
if ((value.startsWith(`"`) && value.endsWith(`"`)) || (value.startsWith(`'`) && value.endsWith(`'`))) {
value = value.slice(1, -1);
// Check if value starts with a quote
const startsWithDoubleQuote = valueRaw.startsWith('"');
const startsWithSingleQuote = valueRaw.startsWith("'");
if (startsWithDoubleQuote || startsWithSingleQuote) {
const quoteChar = startsWithDoubleQuote ? '"' : "'";
const closingQuoteIndex = valueRaw.indexOf(quoteChar, 1);
if (closingQuoteIndex !== -1) {
// Single-line quoted value
const value = valueRaw.slice(1, closingQuoteIndex);
parsed.push({ key, value });
i += 1;
} else {
// Multiline quoted value - collect lines until closing quote
let value = valueRaw.slice(1);
i += 1;
while (i < lines.length) {
const nextLine = lines[i];
const closingIndex = nextLine.indexOf(quoteChar);
if (closingIndex !== -1) {
value += `\n${nextLine.substring(0, closingIndex)}`;
parsed.push({ key, value });
i += 1;
break;
} else {
value += `\n${nextLine}`;
i += 1;
}
}
}
} else {
// Unquoted value
parsed.push({ key, value: valueRaw });
i += 1;
}
parsed.push({
key,
value
});
} else {
i += 1;
}
});
}
return parsed;
};
@@ -70,12 +108,22 @@ const getLaravelForgeSecrets = async (secretSync: TLaravelForgeSyncWithCredentia
};
const buildEnvString = (secrets: LaravelForgeSecret[]) => {
if (secrets.length === 0) {
return "# .env";
}
return secrets
.map((secret) => {
if (secret.value.includes(" ")) {
return `${secret.key}="${secret.value}"`;
const { value } = secret;
if (value.includes(`"`)) {
return `${secret.key}='${value}'`;
}
return `${secret.key}=${secret.value}`;
if (value.includes(" ") || value.includes("\n") || value.includes(`'`)) {
return `${secret.key}="${value}"`;
}
return `${secret.key}=${value}`;
})
.join("\n");
};
backend/src/services/secret-sync/laravel-forge/laravel-forge-sync-schemas.ts
+3 -6
View File
@@ -12,14 +12,11 @@ import { TSyncOptionsConfig } from "@app/services/secret-sync/secret-sync-types"
const LaravelForgeSyncDestinationConfigSchema = z.object({
orgSlug: z.string().min(1, "Org Slug is required").describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.orgSlug),
orgName: z.string().min(1, "Org Name is required").describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.orgName),
orgName: z.string().optional().describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.orgName),
serverId: z.string().min(1, "Server ID is required").describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.serverId),
serverName: z
.string()
.min(1, "Server Name is required")
.describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.serverName),
serverName: z.string().optional().describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.serverName),
siteId: z.string().min(1, "Site ID is required").describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.siteId),
siteName: z.string().min(1, "Site Name is required").describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.siteName)
siteName: z.string().optional().describe(SecretSyncs.DESTINATION_CONFIG.LARAVEL_FORGE.siteName)
});
const LaravelForgeSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: true };