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

Merge pull request #2963 from akhilmhdh/fix/broken-secret-creation

Browse Source 
feat: added validation for secret name to disallow spaces and overview page
This commit is contained in:
Maidul Islam
2025-01-09 15:38:25 -05:00
committed by GitHub
parent 01534c3525 8054d93851
commit 3ed3856c85
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/routes/v3/secret-router.ts
+16 -10
View File
@@ -36,6 +36,12 @@ const SecretReferenceNodeTree: z.ZodType<TSecretReferenceNode> = SecretReference
children: z.lazy(() => SecretReferenceNodeTree.array()) children: z.lazy(() => SecretReferenceNodeTree.array())
}); });
const SecretNameSchema = z
.string()
.trim()
.min(1)
.refine((el) => !el.includes(" "), "Secret name cannot contain spaces.");
export const registerSecretRouter = async (server: FastifyZodProvider) => { export const registerSecretRouter = async (server: FastifyZodProvider) => {
server.route({ server.route({
method: "POST", method: "POST",
@@ -51,7 +57,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
} }
], ],
params: z.object({ params: z.object({
secretName: z.string().trim().describe(SECRETS.ATTACH_TAGS.secretName) secretName: SecretNameSchema.describe(SECRETS.ATTACH_TAGS.secretName)
}), }),
body: z.object({ body: z.object({
projectSlug: z.string().trim().describe(SECRETS.ATTACH_TAGS.projectSlug), projectSlug: z.string().trim().describe(SECRETS.ATTACH_TAGS.projectSlug),
@@ -114,7 +120,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
} }
], ],
params: z.object({ params: z.object({
secretName: z.string().trim().describe(SECRETS.DETACH_TAGS.secretName) secretName: z.string().describe(SECRETS.DETACH_TAGS.secretName)
}), }),
body: z.object({ body: z.object({
projectSlug: z.string().trim().describe(SECRETS.DETACH_TAGS.projectSlug), projectSlug: z.string().trim().describe(SECRETS.DETACH_TAGS.projectSlug),
@@ -442,7 +448,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
} }
], ],
params: z.object({ params: z.object({
secretName: z.string().trim().describe(RAW_SECRETS.CREATE.secretName) secretName: SecretNameSchema.describe(RAW_SECRETS.CREATE.secretName)
}), }),
body: z.object({ body: z.object({
workspaceId: z.string().trim().describe(RAW_SECRETS.CREATE.workspaceId), workspaceId: z.string().trim().describe(RAW_SECRETS.CREATE.workspaceId),
@@ -549,7 +555,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
} }
], ],
params: z.object({ params: z.object({
secretName: z.string().trim().describe(RAW_SECRETS.UPDATE.secretName) secretName: SecretNameSchema.describe(RAW_SECRETS.UPDATE.secretName)
}), }),
body: z.object({ body: z.object({
workspaceId: z.string().trim().describe(RAW_SECRETS.UPDATE.workspaceId), workspaceId: z.string().trim().describe(RAW_SECRETS.UPDATE.workspaceId),
@@ -575,7 +581,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
.optional() .optional()
.nullable() .nullable()
.describe(RAW_SECRETS.UPDATE.secretReminderRepeatDays), .describe(RAW_SECRETS.UPDATE.secretReminderRepeatDays),
newSecretName: z.string().min(1).optional().describe(RAW_SECRETS.UPDATE.newSecretName), newSecretName: SecretNameSchema.optional().describe(RAW_SECRETS.UPDATE.newSecretName),
secretComment: z.string().optional().describe(RAW_SECRETS.UPDATE.secretComment) secretComment: z.string().optional().describe(RAW_SECRETS.UPDATE.secretComment)
}), }),
response: { response: {
@@ -660,7 +666,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
} }
], ],
params: z.object({ params: z.object({
secretName: z.string().trim().describe(RAW_SECRETS.DELETE.secretName) secretName: z.string().min(1).describe(RAW_SECRETS.DELETE.secretName)
}), }),
body: z.object({ body: z.object({
workspaceId: z.string().trim().describe(RAW_SECRETS.DELETE.workspaceId), workspaceId: z.string().trim().describe(RAW_SECRETS.DELETE.workspaceId),
@@ -1855,7 +1861,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
.describe(RAW_SECRETS.CREATE.secretPath), .describe(RAW_SECRETS.CREATE.secretPath),
secrets: z secrets: z
.object({ .object({
secretKey: z.string().trim().describe(RAW_SECRETS.CREATE.secretName), secretKey: SecretNameSchema.describe(RAW_SECRETS.CREATE.secretName),
secretValue: z secretValue: z
.string() .string()
.transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim())) .transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim()))
@@ -1956,14 +1962,14 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
.describe(RAW_SECRETS.UPDATE.secretPath), .describe(RAW_SECRETS.UPDATE.secretPath),
secrets: z secrets: z
.object({ .object({
secretKey: z.string().trim().describe(RAW_SECRETS.UPDATE.secretName), secretKey: SecretNameSchema.describe(RAW_SECRETS.UPDATE.secretName),
secretValue: z secretValue: z
.string() .string()
.transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim())) .transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim()))
.describe(RAW_SECRETS.UPDATE.secretValue), .describe(RAW_SECRETS.UPDATE.secretValue),
secretComment: z.string().trim().optional().describe(RAW_SECRETS.UPDATE.secretComment), secretComment: z.string().trim().optional().describe(RAW_SECRETS.UPDATE.secretComment),
skipMultilineEncoding: z.boolean().optional().describe(RAW_SECRETS.UPDATE.skipMultilineEncoding), skipMultilineEncoding: z.boolean().optional().describe(RAW_SECRETS.UPDATE.skipMultilineEncoding),
newSecretName: z.string().min(1).optional().describe(RAW_SECRETS.UPDATE.newSecretName), newSecretName: SecretNameSchema.optional().describe(RAW_SECRETS.UPDATE.newSecretName),
tagIds: z.string().array().optional().describe(RAW_SECRETS.UPDATE.tagIds), tagIds: z.string().array().optional().describe(RAW_SECRETS.UPDATE.tagIds),
secretReminderNote: z.string().optional().nullable().describe(RAW_SECRETS.UPDATE.secretReminderNote), secretReminderNote: z.string().optional().nullable().describe(RAW_SECRETS.UPDATE.secretReminderNote),
secretMetadata: ResourceMetadataSchema.optional(), secretMetadata: ResourceMetadataSchema.optional(),
@@ -2062,7 +2068,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
.describe(RAW_SECRETS.DELETE.secretPath), .describe(RAW_SECRETS.DELETE.secretPath),
secrets: z secrets: z
.object({ .object({
secretKey: z.string().trim().describe(RAW_SECRETS.DELETE.secretName), secretKey: z.string().describe(RAW_SECRETS.DELETE.secretName),
type: z.nativeEnum(SecretType).default(SecretType.Shared) type: z.nativeEnum(SecretType).default(SecretType.Shared)
}) })
.array() .array()
frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
+8 -1
View File
@@ -340,7 +340,14 @@ export const OverviewPage = () => {
const pathSegment = secretPath.split("/").filter(Boolean); const pathSegment = secretPath.split("/").filter(Boolean);
const parentPath = `/${pathSegment.slice(0, -1).join("/")}`; const parentPath = `/${pathSegment.slice(0, -1).join("/")}`;
const folderName = pathSegment.at(-1); const folderName = pathSegment.at(-1);
if (folderName && parentPath) { const canCreateFolder = permission.can(
ProjectPermissionActions.Create,
subject(ProjectPermissionSub.SecretFolders, {
environment: env,
secretPath: parentPath
})
);
if (folderName && parentPath && canCreateFolder) {
await createFolder({ await createFolder({
projectId: workspaceId, projectId: workspaceId,
path: parentPath, path: parentPath,