Skip to content

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

Fixes

Carlos Monastyrski6901e1896fdb
diff --git a/backend/src/ee/services/pki-discovery/pki-discovery-host-scan-fns.ts b/backend/src/ee/services/pki-discovery/pki-discovery-host-scan-fns.ts
index 6755d67656..de92071e00 100644
--- a/backend/src/ee/services/pki-discovery/pki-discovery-host-scan-fns.ts
+++ b/backend/src/ee/services/pki-discovery/pki-discovery-host-scan-fns.ts
@@ -252,10 +252,22 @@ const runCertificateScan = async (
throw new NotFoundError({ message: getMissingGatewayMessage(host.gatewayId) });
}
- const response = await withGatewayV2Proxy(
- (proxyPort) => callCertificateScan({ port: proxyPort, credentials: host.credentials, request }),
- { protocol: GatewayProxyProtocol.Discovery, longLived: true, ...connectionDetails }
- );
+ let response: Awaited<ReturnType<typeof callCertificateScan>>;
+ try {
+ response = await withGatewayV2Proxy(
+ (proxyPort) => callCertificateScan({ port: proxyPort, credentials: host.credentials, request }),
+ { protocol: GatewayProxyProtocol.Discovery, longLived: true, ...connectionDetails }
+ );
+ } catch (error) {
+ if (error instanceof GatewayTransportError) throw error;
+ logger.warn(
+ `Certificate scan transport failed [connectionId=${host.connectionId}] [gatewayId=${host.gatewayId}] [error=${error instanceof Error ? error.message : String(error)}]`
+ );
+ throw new BadRequestError({
+ message:
+ "The connection to the gateway dropped during the scan. Check that the gateway and its relay are running, then try again."
+ });
+ }
if (!response.ok) {
logger.warn(
@@ -388,13 +400,17 @@ const upsertInstallationWithLinks = async (
let installation = await findTargetInstallation(ctx, fingerprint, deps, tx);
if (!installation && refreshOnly) return undefined;
const previousMetadata = (installation?.metadata as TPkiInstallationMetadata | null) ?? {};
- const metadata: TPkiInstallationMetadata = {
- ...previousMetadata,
- ...(keystoreStatus && { keystoreStatus }),
- ...(keystoreStatus === PkiKeystoreStatus.Readable && { lastReadAt: ctx.scanTime.toISOString() }),
- lastCheckedAt: new Date().toISOString(),
- lastError: undefined
- };
+ const previousReadAt = previousMetadata.lastReadAt ? new Date(previousMetadata.lastReadAt) : null;
+ const supersededByNewerRead = previousReadAt !== null && previousReadAt > ctx.scanTime;
+ const metadata: TPkiInstallationMetadata = supersededByNewerRead
+ ? { ...previousMetadata, lastCheckedAt: new Date().toISOString() }
+ : {
+ ...previousMetadata,
+ ...(keystoreStatus && { keystoreStatus }),
+ ...(keystoreStatus === PkiKeystoreStatus.Readable && { lastReadAt: ctx.scanTime.toISOString() }),
+ lastCheckedAt: new Date().toISOString(),
+ lastError: undefined
+ };
if (!installation) {
try {
diff --git a/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobForm.tsx b/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobForm.tsx
index f2c7446a03..d1afb4c6e1 100644
--- a/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobForm.tsx
+++ b/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobForm.tsx
@@ -37,6 +37,7 @@ type Props = {
onComplete: () => void;
onCancel: () => void;
onDirtyChange: (isDirty: boolean) => void;
+ onPendingChange: (isPending: boolean) => void;
};
enum DiscoveryJobStep {
@@ -139,7 +140,8 @@ export const DiscoveryJobForm = ({
discovery,
onComplete,
onCancel,
- onDirtyChange
+ onDirtyChange,
+ onPendingChange
}: Props) => {
const isEditing = Boolean(discovery);
const createDiscovery = useCreatePkiDiscovery();
@@ -170,6 +172,10 @@ export const DiscoveryJobForm = ({
onDirtyChange(formState.isDirty);
}, [formState.isDirty]);
+ useEffect(() => {
+ onPendingChange(isPending);
+ }, [isPending]);
+
const onSubmit = async (form: TDiscoveryJobForm) => {
const isNetwork = form.discoveryType === PkiDiscoveryType.Network;
const gatewayPoolId = isNetwork ? form.gatewayPoolId || null : null;
@@ -236,7 +242,7 @@ export const DiscoveryJobForm = ({
>
<FormProvider {...formMethods}>
<div className="flex min-h-0 flex-1 overflow-hidden">
- <aside className="flex w-60 shrink-0 flex-col border-r border-border px-5 py-6">
+ <aside className="hidden w-60 shrink-0 flex-col border-r border-border px-5 py-6 sm:flex">
<p className="mb-5 text-[11px] font-medium tracking-wider text-muted uppercase">
{isEditing ? "Sections" : "Setup steps"}
</p>
@@ -297,7 +303,7 @@ export const DiscoveryJobForm = ({
<span className="text-xs text-muted">{footerStatus}</span>
{isEditing ? (
<div className="flex items-center gap-3">
- <Button type="button" variant="outline" onClick={onCancel}>
+ <Button type="button" variant="outline" onClick={onCancel} isDisabled={isPending}>
Cancel
</Button>
<Button
@@ -312,7 +318,7 @@ export const DiscoveryJobForm = ({
</div>
) : (
<div className="flex items-center gap-3">
- <Button type="button" variant="outline" onClick={handleBack}>
+ <Button type="button" variant="outline" onClick={handleBack} isDisabled={isPending}>
{stepIndex === 0 ? "Cancel" : "Back"}
</Button>
<Button
diff --git a/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobSheet.tsx b/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobSheet.tsx
index ff989fbd6e..20c95197d7 100644
--- a/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobSheet.tsx
+++ b/frontend/src/pages/cert-manager/DiscoveryPage/components/DiscoveryJobSheet/DiscoveryJobSheet.tsx
@@ -30,11 +30,13 @@ export const DiscoveryJobSheet = ({ isOpen, onClose, projectId, discovery }: Pro
discovery?.discoveryType ?? null
);
const [isDirty, setIsDirty] = useState(false);
+ const [isSaving, setIsSaving] = useState(false);
useEffect(() => {
if (!isOpen) return;
setSelectedType(discovery?.discoveryType ?? null);
setIsDirty(false);
+ setIsSaving(false);
}, [isOpen, discovery]);
const closeSheet = () => {
@@ -57,7 +59,7 @@ export const DiscoveryJobSheet = ({ isOpen, onClose, projectId, discovery }: Pro
};
const handleOpenChange = (nextOpen: boolean) => {
- if (!nextOpen) requestDiscardAction(closeSheet);
+ if (!nextOpen && !isSaving) requestDiscardAction(closeSheet);
};
const showBack = !discovery && Boolean(selectedType);
@@ -73,6 +75,7 @@ export const DiscoveryJobSheet = ({ isOpen, onClose, projectId, discovery }: Pro
onComplete={closeSheet}
onCancel={() => requestDiscardAction(discovery ? closeSheet : returnToTypeSelect)}
onDirtyChange={setIsDirty}
+ onPendingChange={setIsSaving}
/>
);
}
@@ -95,6 +98,7 @@ export const DiscoveryJobSheet = ({ isOpen, onClose, projectId, discovery }: Pro
variant="link"
size="xs"
className="mb-1 w-fit px-0"
+ isDisabled={isSaving}
onClick={() => requestDiscardAction(returnToTypeSelect)}
>
<ArrowLeftIcon />