Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
block "cancel" if saving and fix read of scans in transaction
Matheus Nogueira0091dd9ea433
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.tsindex 2c3c255a7e..bac4c51e66 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts@@ -193,7 +193,7 @@ export const secretScanningV2QueueServiceFactory = ({// under its current name and a deleted one is skipped.const rawResources = await factory.listRawResources(dataSource);- await secretScanningV2DAL.resources.transaction(async (tx) => {+ const scans = await secretScanningV2DAL.resources.transaction(async (tx) => {// Read on the primary, since a resource added just before this call may not have reached the replica, and// locked, so two requests can't both see no in-flight scan and queue the same resource twice.const existingResources = await secretScanningV2DAL.resources.findByDataSourceIdForUpdate(dataSource.id, tx);@@ -247,9 +247,9 @@ export const secretScanningV2QueueServiceFactory = ({const scannedResourceIds = new Set(inFlightScans.map((scan) => scan.resourceId));const resourcesToScan = resources.filter((resource) => !scannedResourceIds.has(resource.id));- if (!resourcesToScan.length) return;+ if (!resourcesToScan.length) return [];- const scans = await secretScanningV2DAL.scans.insertMany(+ return secretScanningV2DAL.scans.insertMany(resourcesToScan.map((resource) => ({resourceId: resource.id,type: SecretScanningScanType.Historical,@@ -257,26 +257,28 @@ export const secretScanningV2QueueServiceFactory = ({})),tx);-- for (const scan of scans) {- // eslint-disable-next-line no-await-in-loop- await queueService.queue(- QueueName.SecretScanningV2FullScan,- QueueJobs.SecretScanningV2FullScan,- {- scanId: scan.id,- resourceId: scan.resourceId,- dataSourceId: dataSource.id- },- {- jobId: scan.id,- removeOnFail: true,- attempts: FULL_SCAN_ATTEMPTS,- backoff: { type: "fixed", delay: FULL_SCAN_RETRY_DELAY }- }- );- }});++ // Queued after commit: a worker that picks the job up first would not find the scan, and would abort it as+ // deleted, leaving it queued forever.+ for (const scan of scans) {+ // eslint-disable-next-line no-await-in-loop+ await queueService.queue(+ QueueName.SecretScanningV2FullScan,+ QueueJobs.SecretScanningV2FullScan,+ {+ scanId: scan.id,+ resourceId: scan.resourceId,+ dataSourceId: dataSource.id+ },+ {+ jobId: scan.id,+ removeOnFail: true,+ attempts: FULL_SCAN_ATTEMPTS,+ backoff: { type: "fixed", delay: FULL_SCAN_RETRY_DELAY }+ }+ );+ }} catch (error) {logger.error(error, `Failed to queue full-scan for data source with ID "${dataSource.id}"`);diff --git a/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceSheet.tsx b/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceSheet.tsxindex 9c9d3da419..004ba73600 100644--- a/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceSheet.tsx+++ b/frontend/src/components/secret-scanning/CreateSecretScanningDataSourceSheet.tsx@@ -20,6 +20,7 @@ export const CreateSecretScanningDataSourceSheet = ({ isOpen, onOpenChange }: Prconst popupRegistry = useSecretScanningDataSourcePopupRegistry();const [initialFormData, setInitialFormData] = useState<Partial<TSecretScanningDataSourceForm>>();const [isDirty, setIsDirty] = useState(false);+ const [isSubmitting, setIsSubmitting] = useState(false);const {location: {@@ -79,7 +80,11 @@ export const CreateSecretScanningDataSourceSheet = ({ isOpen, onOpenChange }: PrrequestDiscard();}}>- <SheetContent size="wide" onEscapeKeyDown={popupRegistry.onEscapeKeyDown}>+ <SheetContent+ size="wide"+ isPending={isSubmitting}+ onEscapeKeyDown={popupRegistry.onEscapeKeyDown}+ ><SecretScanningDataSourcePopupContext.Provider value={popupRegistry.onPopupOpenChange}><SecretScanningDataSourceForminitialType={initialFormData?.type}@@ -87,6 +92,7 @@ export const CreateSecretScanningDataSourceSheet = ({ isOpen, onOpenChange }: PronComplete={closeSheet}onCancel={requestDiscard}onDirtyChange={setIsDirty}+ onSubmittingChange={setIsSubmitting}/></SecretScanningDataSourcePopupContext.Provider></SheetContent>diff --git a/frontend/src/components/secret-scanning/EditSecretScanningDataSourceSheet.tsx b/frontend/src/components/secret-scanning/EditSecretScanningDataSourceSheet.tsxindex caa6b63c49..81b9f14823 100644--- a/frontend/src/components/secret-scanning/EditSecretScanningDataSourceSheet.tsx+++ b/frontend/src/components/secret-scanning/EditSecretScanningDataSourceSheet.tsx@@ -19,6 +19,7 @@ type Props = {export const EditSecretScanningDataSourceSheet = ({ isOpen, onOpenChange, dataSource }: Props) => {const popupRegistry = useSecretScanningDataSourcePopupRegistry();const [isDirty, setIsDirty] = useState(false);+ const [isSubmitting, setIsSubmitting] = useState(false);const closeSheet = useCallback(() => {setIsDirty(false);@@ -40,7 +41,11 @@ export const EditSecretScanningDataSourceSheet = ({ isOpen, onOpenChange, dataSorequestDiscard();}}>- <SheetContent size="wide" onEscapeKeyDown={popupRegistry.onEscapeKeyDown}>+ <SheetContent+ size="wide"+ isPending={isSubmitting}+ onEscapeKeyDown={popupRegistry.onEscapeKeyDown}+ >{dataSource && (<SecretScanningDataSourcePopupContext.Provider value={popupRegistry.onPopupOpenChange}><SecretScanningDataSourceForm@@ -49,6 +54,7 @@ export const EditSecretScanningDataSourceSheet = ({ isOpen, onOpenChange, dataSoonComplete={closeSheet}onCancel={requestDiscard}onDirtyChange={setIsDirty}+ onSubmittingChange={setIsSubmitting}/></SecretScanningDataSourcePopupContext.Provider>)}diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsxindex 875350ffa0..acb92db041 100644--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx@@ -100,7 +100,6 @@ export const SecretScanningDataSourceConnectionField = ({onValueChange={(newValue) => {if (newValue.id === "_create") {handlePopUpOpen("addConnection");- onChange(null);// store for oauth callback connectionslocalStorage.setItem("secretScanningDataSourceFormData",@@ -176,7 +175,7 @@ export const SecretScanningDataSourceConnectionField = ({app={app}onComplete={(connection) => {if (connection) {- setValue("connection", connection);+ setValue("connection", connection, { shouldDirty: true, shouldValidate: true });}}}/>diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsxindex 512ed7bf9b..fd31ca61a9 100644--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx@@ -206,6 +206,7 @@ type Props = {onComplete: (dataSource: TSecretScanningDataSource) => void;onCancel: () => void;onDirtyChange: (isDirty: boolean) => void;+ onSubmittingChange?: (isSubmitting: boolean) => void;};export const SecretScanningDataSourceForm = ({@@ -214,7 +215,8 @@ export const SecretScanningDataSourceForm = ({initialFormData,onComplete,onCancel,- onDirtyChange+ onDirtyChange,+ onSubmittingChange}: Props) => {const { currentProject } = useProject();const createDataSource = useCreateSecretScanningDataSource();@@ -253,6 +255,11 @@ export const SecretScanningDataSourceForm = ({return () => onDirtyChange(false);}, [hasUnsavedChanges, onDirtyChange]);+ useEffect(() => {+ onSubmittingChange?.(isSubmitting);+ return () => onSubmittingChange?.(false);+ }, [isSubmitting, onSubmittingChange]);+const steps = getSteps(type, isEdit);const firstStep = isEdit ? FormStep.Connection : FormStep.Provider;const currentStep = steps[step];diff --git a/frontend/src/components/secret-scanning/forms/schemas/base-secret-scanning-data-source-schema.ts b/frontend/src/components/secret-scanning/forms/schemas/base-secret-scanning-data-source-schema.tsindex 083584f805..05d8b1ba09 100644--- a/frontend/src/components/secret-scanning/forms/schemas/base-secret-scanning-data-source-schema.ts+++ b/frontend/src/components/secret-scanning/forms/schemas/base-secret-scanning-data-source-schema.ts@@ -11,7 +11,13 @@ export const BaseSecretScanningDataSourceSchema = ({ isConnectionRequired }: Schname: slugSchema({ field: "Name" }),description: z.string().trim().max(256, "Cannot exceed 256 characters").nullish(),connection: isConnectionRequired- ? z.object({ name: z.string(), id: z.string().uuid() })+ ? z.object(+ { name: z.string(), id: z.string().uuid() },+ {+ required_error: "Select an App Connection",+ invalid_type_error: "Select an App Connection"+ }+ ): z.null().or(z.undefined()),isHistoricalScanEnabled: z.boolean(),isScanNewCommitsEnabled: z.boolean(),diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/EditDataSourceDetailsDialog.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/EditDataSourceDetailsDialog.tsxindex cdb08d167f..f660f77816 100644--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/EditDataSourceDetailsDialog.tsx+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/EditDataSourceDetailsDialog.tsx@@ -85,7 +85,7 @@ export const EditDataSourceDetailsDialog = ({ dataSource, isOpen, onOpenChange }requestDiscard();}}>- <DialogContent className="max-w-lg">+ <DialogContent className="max-w-lg" isPending={isSubmitting}><DialogHeader><DialogTitle>Edit Details</DialogTitle><DialogDescription>@@ -136,7 +136,12 @@ export const EditDataSourceDetailsDialog = ({ dataSource, isOpen, onOpenChange }/></FieldGroup><DialogFooter>- <Button type="button" variant="ghost" onClick={requestDiscard}>+ <Button+ type="button"+ variant="ghost"+ onClick={requestDiscard}+ isDisabled={isSubmitting}+ >Cancel</Button><Button