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

PKI: EST passphrase fix and UI fixes

Browse Source
This commit is contained in:
Carlos Monastyrski
2025-10-20 13:37:02 -03:00
parent 2b169e9c95
commit fccc2ed881
17 changed files with 122 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/api/certificateProfiles/queries.tsx
+4
View File
@@ -22,6 +22,7 @@ export const certificateProfileKeys = {
search?: string;
includeMetrics?: boolean;
includeConfigs?: boolean;
enrollmentType?: string;
expiringDays?: number;
}) => ["certificate-profiles", "list", params],
getById: (profileId: string) => ["certificate-profiles", "get-by-id", profileId],
@@ -52,6 +53,7 @@ export const useListCertificateProfiles = ({
search,
includeMetrics = false,
includeConfigs = false,
enrollmentType,
expiringDays = 7
}: TListCertificateProfilesDTO) => {
return useQuery({
@@ -62,6 +64,7 @@ export const useListCertificateProfiles = ({
search,
includeMetrics,
includeConfigs,
enrollmentType,
expiringDays
}),
queryFn: async () => {
@@ -76,6 +79,7 @@ export const useListCertificateProfiles = ({
search,
includeMetrics,
includeConfigs,
enrollmentType,
expiringDays
}
});
frontend/src/hooks/api/certificateProfiles/types.ts
+1
View File
@@ -83,6 +83,7 @@ export type TListCertificateProfilesDTO = {
search?: string;
includeMetrics?: boolean;
includeConfigs?: boolean;
enrollmentType?: "api" | "est";
expiringDays?: number;
};
frontend/src/pages/cert-manager/CertificatesPage/components/AlgorithmSelectors.tsx
+7 -1
View File
@@ -33,6 +33,7 @@ export const AlgorithmSelectors = ({
label="Signature Algorithm"
errorText={signatureError}
isError={Boolean(signatureError)}
isRequired
>
<Select
defaultValue=""
@@ -62,7 +63,12 @@ export const AlgorithmSelectors = ({
control={control}
name="keyAlgorithm"
render={({ field: { onChange, ...field } }) => (
<FormControl label="Key Algorithm" errorText={keyError} isError={Boolean(keyError)}>
<FormControl
label="Key Algorithm"
errorText={keyError}
isError={Boolean(keyError)}
isRequired
>
<Select
defaultValue=""
{...field}
frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx
+11 -12
View File
@@ -25,15 +25,11 @@ import { useListCertificateProfiles } from "@app/hooks/api/certificateProfiles";
import { CertExtendedKeyUsage, CertKeyUsage } from "@app/hooks/api/certificates/enums";
import { useGetCertificateTemplateV2ById } from "@app/hooks/api/certificateTemplates/queries";
import { UsePopUpState } from "@app/hooks/usePopUp";
import { CertSubjectAlternativeNameType } from "@app/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants";
import { AlgorithmSelectors } from "./AlgorithmSelectors";
import { CertificateContent } from "./CertificateContent";
import {
filterUsages,
formatSubjectAltNames,
FrontendSanType,
getAttributeValue
} from "./certificateUtils";
import { filterUsages, formatSubjectAltNames, getAttributeValue } from "./certificateUtils";
import { KeyUsageSection } from "./KeyUsageSection";
import { SubjectAltNamesField } from "./SubjectAltNamesField";
import { useCertificateTemplate } from "./useCertificateTemplate";
@@ -61,7 +57,7 @@ const createSchema = (shouldShowSubjectSection: boolean) => {
subjectAltNames: z
.array(
z.object({
type: z.nativeEnum(FrontendSanType),
type: z.nativeEnum(CertSubjectAlternativeNameType),
value: z.string().min(1, "Value is required")
})
)
@@ -125,7 +121,8 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
const { data: profilesData } = useListCertificateProfiles({
projectId: currentProject?.id || "",
includeMetrics: false
includeMetrics: false,
enrollmentType: "api"
});
const { mutateAsync: createCertificate } = useCreateCertificateV3();
@@ -206,11 +203,13 @@ export const CertificateIssuanceModal = ({ popUp, handlePopUpToggle, profileId }
subjectAltNames: cert.subjectAltNames
? cert.subjectAltNames.split(",").map((name) => {
const trimmed = name.trim();
if (trimmed.includes("@")) return { type: FrontendSanType.EMAIL, value: trimmed };
if (trimmed.includes("@"))
return { type: CertSubjectAlternativeNameType.EMAIL, value: trimmed };
if (trimmed.match(/^\d+\.\d+\.\d+\.\d+$/))
return { type: FrontendSanType.IP, value: trimmed };
if (trimmed.startsWith("http")) return { type: FrontendSanType.URI, value: trimmed };
return { type: FrontendSanType.DNS, value: trimmed };
return { type: CertSubjectAlternativeNameType.IP_ADDRESS, value: trimmed };
if (trimmed.startsWith("http"))
return { type: CertSubjectAlternativeNameType.URI, value: trimmed };
return { type: CertSubjectAlternativeNameType.DNS_NAME, value: trimmed };
})
: [],
ttl: "",
frontend/src/pages/cert-manager/CertificatesPage/components/SubjectAltNamesField.tsx
+7 -9
View File
@@ -3,17 +3,13 @@ import { faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Button, FormControl, IconButton, Input, Select, SelectItem } from "@app/components/v2";
import { CertSubjectAlternativeNameType } from "@app/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants";
import {
FrontendSanType,
getSanPlaceholder,
getSanTypeLabels,
SubjectAltName
} from "./certificateUtils";
import { getSanPlaceholder, getSanTypeLabels, SubjectAltName } from "./certificateUtils";
type SubjectAltNamesFieldProps = {
control: Control<any>;
allowedSanTypes: FrontendSanType[];
allowedSanTypes: CertSubjectAlternativeNameType[];
error?: string;
};
@@ -44,7 +40,7 @@ export const SubjectAltNamesField = ({
const newValue = [...value];
newValue[index] = {
...san,
type: newType as FrontendSanType
type: newType as CertSubjectAlternativeNameType
};
onChange(newValue);
}}
@@ -86,7 +82,9 @@ export const SubjectAltNamesField = ({
leftIcon={<FontAwesomeIcon icon={faPlus} />}
onClick={() => {
const defaultType =
allowedSanTypes.length > 0 ? allowedSanTypes[0] : FrontendSanType.DNS;
allowedSanTypes.length > 0
? allowedSanTypes[0]
: CertSubjectAlternativeNameType.DNS_NAME;
onChange([...value, { type: defaultType, value: "" }]);
}}
className="w-full"
frontend/src/pages/cert-manager/CertificatesPage/components/certificateUtils.ts
+11 -48
View File
@@ -1,51 +1,14 @@
import { CertSubjectAlternativeNameType } from "@app/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants";
export enum FrontendSanType {
DNS = "dns",
IP = "ip",
EMAIL = "email",
URI = "uri"
}
export const mapBackendSanTypeToFrontend = (backendType: string): FrontendSanType => {
switch (backendType) {
case CertSubjectAlternativeNameType.DNS_NAME:
return FrontendSanType.DNS;
case CertSubjectAlternativeNameType.IP_ADDRESS:
return FrontendSanType.IP;
case CertSubjectAlternativeNameType.EMAIL:
return FrontendSanType.EMAIL;
case CertSubjectAlternativeNameType.URI:
return FrontendSanType.URI;
default:
return backendType as FrontendSanType;
}
};
export const mapFrontendSanTypeToBackend = (frontendType: FrontendSanType): string => {
switch (frontendType) {
case FrontendSanType.DNS:
return CertSubjectAlternativeNameType.DNS_NAME;
case FrontendSanType.IP:
return CertSubjectAlternativeNameType.IP_ADDRESS;
case FrontendSanType.EMAIL:
return CertSubjectAlternativeNameType.EMAIL;
case FrontendSanType.URI:
return CertSubjectAlternativeNameType.URI;
default:
return frontendType;
}
};
export const getSanPlaceholder = (sanType: FrontendSanType): string => {
export const getSanPlaceholder = (sanType: CertSubjectAlternativeNameType): string => {
switch (sanType) {
case FrontendSanType.DNS:
case CertSubjectAlternativeNameType.DNS_NAME:
return "example.com or *.example.com";
case FrontendSanType.IP:
case CertSubjectAlternativeNameType.IP_ADDRESS:
return "192.168.1.1";
case FrontendSanType.EMAIL:
case CertSubjectAlternativeNameType.EMAIL:
return "[email protected]";
case FrontendSanType.URI:
case CertSubjectAlternativeNameType.URI:
return "https://example.com";
default:
return "Enter value";
@@ -53,14 +16,14 @@ export const getSanPlaceholder = (sanType: FrontendSanType): string => {
};
export const getSanTypeLabels = () => ({
[FrontendSanType.DNS]: "DNS",
[FrontendSanType.IP]: "IP",
[FrontendSanType.EMAIL]: "Email",
[FrontendSanType.URI]: "URI"
[CertSubjectAlternativeNameType.DNS_NAME]: "DNS",
[CertSubjectAlternativeNameType.IP_ADDRESS]: "IP",
[CertSubjectAlternativeNameType.EMAIL]: "Email",
[CertSubjectAlternativeNameType.URI]: "URI"
});
export type SubjectAltName = {
type: FrontendSanType;
type: CertSubjectAlternativeNameType;
value: string;
};
@@ -68,7 +31,7 @@ export const formatSubjectAltNames = (subjectAltNames: SubjectAltName[]) => {
return subjectAltNames
.filter((san) => san.value.trim())
.map((san) => ({
type: mapFrontendSanTypeToBackend(san.type),
type: san.type,
value: san.value.trim()
}));
};
frontend/src/pages/cert-manager/CertificatesPage/components/useCertificateTemplate.ts
+13 -15
View File
@@ -6,12 +6,11 @@ import {
KEY_USAGES_OPTIONS
} from "@app/hooks/api/certificates/constants";
import {
CertSubjectAlternativeNameType,
mapTemplateKeyAlgorithmToApi,
mapTemplateSignatureAlgorithmToApi
} from "@app/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants";
import { FrontendSanType, mapBackendSanTypeToFrontend } from "./certificateUtils";
export type TemplateConstraints = {
allowedKeyUsages: string[];
allowedExtendedKeyUsages: string[];
@@ -19,7 +18,7 @@ export type TemplateConstraints = {
requiredExtendedKeyUsages: string[];
allowedSignatureAlgorithms: string[];
allowedKeyAlgorithms: string[];
allowedSanTypes: FrontendSanType[];
allowedSanTypes: CertSubjectAlternativeNameType[];
shouldShowSanSection: boolean;
shouldShowSubjectSection: boolean;
};
@@ -39,10 +38,10 @@ export const useCertificateTemplate = (
allowedSignatureAlgorithms: [],
allowedKeyAlgorithms: [],
allowedSanTypes: [
FrontendSanType.DNS,
FrontendSanType.IP,
FrontendSanType.EMAIL,
FrontendSanType.URI
CertSubjectAlternativeNameType.DNS_NAME,
CertSubjectAlternativeNameType.IP_ADDRESS,
CertSubjectAlternativeNameType.EMAIL,
CertSubjectAlternativeNameType.URI
],
shouldShowSanSection: true,
shouldShowSubjectSection: true
@@ -87,10 +86,10 @@ export const useCertificateTemplate = (
allowedSignatureAlgorithms: [],
allowedKeyAlgorithms: [],
allowedSanTypes: [
FrontendSanType.DNS,
FrontendSanType.IP,
FrontendSanType.EMAIL,
FrontendSanType.URI
CertSubjectAlternativeNameType.DNS_NAME,
CertSubjectAlternativeNameType.IP_ADDRESS,
CertSubjectAlternativeNameType.EMAIL,
CertSubjectAlternativeNameType.URI
],
shouldShowSanSection: true,
shouldShowSubjectSection: true
@@ -124,11 +123,10 @@ export const useCertificateTemplate = (
// Handle SAN types
if (templateData.sans && templateData.sans.length > 0) {
const sanTypes: FrontendSanType[] = [];
const sanTypes: CertSubjectAlternativeNameType[] = [];
templateData.sans.forEach((sanPolicy: any) => {
const frontendType = mapBackendSanTypeToFrontend(sanPolicy.type);
if (!sanTypes.includes(frontendType)) {
sanTypes.push(frontendType);
if (!sanTypes.includes(sanPolicy.type)) {
sanTypes.push(sanPolicy.type);
}
});
newConstraints.allowedSanTypes = sanTypes;
frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/CreateTemplateModal.tsx
+16 -16
View File
@@ -62,9 +62,7 @@ interface Props {
}
const ATTRIBUTE_TYPE_LABELS: Record<(typeof SUBJECT_ATTRIBUTE_TYPE_OPTIONS)[number], string> = {
common_name: "Common Name (CN)",
organization: "Organization (O)",
country: "Country (C)"
common_name: "Common Name (CN)"
};
const SAN_TYPE_LABELS: Record<(typeof SAN_TYPE_OPTIONS)[number], string> = {
@@ -532,7 +530,7 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
}
>
<form onSubmit={handleSubmit(onFormSubmit)} className="space-y-6">
<Accordion type="multiple" defaultValue={["basic"]} className="w-full">
<Accordion type="multiple" defaultValue={["basic", "algorithms"]} className="w-full">
<div className="space-y-4">
<Controller
control={control}
@@ -774,18 +772,6 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
</AccordionContent>
</AccordionItem>
<AccordionItem value="usages" className="mt-4">
<AccordionTrigger>Key Usages</AccordionTrigger>
<AccordionContent>
<KeyUsagesSection
watchedKeyUsages={watchedKeyUsages}
watchedExtendedKeyUsages={watchedExtendedKeyUsages}
onKeyUsagesChange={handleKeyUsagesChange}
onExtendedKeyUsagesChange={handleExtendedKeyUsagesChange}
/>
</AccordionContent>
</AccordionItem>
<AccordionItem value="algorithms" className="mt-4">
<AccordionTrigger>Algorithms</AccordionTrigger>
<AccordionContent>
@@ -793,6 +779,7 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
<div>
<h4 className="mb-3 text-sm font-medium text-mineshaft-200">
Allowed Signature Algorithms
<span className="ml-1 text-red-500">*</span>
</h4>
<Controller
control={control}
@@ -838,6 +825,7 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
<div>
<h4 className="mb-3 text-sm font-medium text-mineshaft-200">
Allowed Key Algorithms
<span className="ml-1 text-red-500">*</span>
</h4>
<Controller
control={control}
@@ -883,6 +871,18 @@ export const CreateTemplateModal = ({ isOpen, onClose, template, mode = "create"
</AccordionContent>
</AccordionItem>
<AccordionItem value="usages" className="mt-4">
<AccordionTrigger>Key Usages</AccordionTrigger>
<AccordionContent>
<KeyUsagesSection
watchedKeyUsages={watchedKeyUsages}
watchedExtendedKeyUsages={watchedExtendedKeyUsages}
onKeyUsagesChange={handleKeyUsagesChange}
onExtendedKeyUsagesChange={handleExtendedKeyUsagesChange}
/>
</AccordionContent>
</AccordionItem>
<AccordionItem value="validity" className="mt-4">
<AccordionTrigger>Certificate Validity</AccordionTrigger>
<AccordionContent>
frontend/src/pages/cert-manager/PoliciesPage/components/CertificateTemplatesV2Tab/shared/certificate-constants.ts
+1 -7
View File
@@ -45,9 +45,7 @@ export enum CertDurationUnit {
}
export enum CertSubjectAttributeType {
COMMON_NAME = "common_name",
ORGANIZATION = "organization",
COUNTRY = "country"
COMMON_NAME = "common_name"
}
export const formatSANType = (type: CertSubjectAlternativeNameType): string => {
@@ -113,10 +111,6 @@ export const formatSubjectAttributeType = (type: CertSubjectAttributeType): stri
switch (type) {
case CertSubjectAttributeType.COMMON_NAME:
return "Common Name (CN)";
case CertSubjectAttributeType.ORGANIZATION:
return "Organization";
case CertSubjectAttributeType.COUNTRY:
return "Country";
default:
return type;
}