awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Fang-Pen Lin
2025-10-28 19:48:27 -07:00
parent 9c748bf0ee
commit ac82e8071d
2 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
backend/src/ee/services/pki-acme/pki-acme-service.ts
View File

@@ -16,11 +16,11 @@ import {
EnrollmentType,
TCertificateProfileWithConfigs
} from "@app/services/certificate-profile/certificate-profile-types";
import { errors, flattenedVerify, FlattenedVerifyResult, importJWK, JWK, JWSHeaderParameters } from "jose";
import { errors, flattenedVerify, FlattenedVerifyResult, importJWK, JWSHeaderParameters } from "jose";
import { z, ZodError } from "zod";
import { TPkiAcmeAccountDALFactory } from "./pki-acme-account-dal";
import { TPkiAcmeOrderDALFactory } from "./pki-acme-order-dal";
import { ProtectedHeaderSchema } from "./pki-acme-schemas";
import { CreateAcmeAccountBodySchema, ProtectedHeaderSchema } from "./pki-acme-schemas";
import {
TAcmeResponse,
TCreateAcmeAccountPayload,
@@ -49,7 +49,8 @@ type TPkiAcmeServiceFactoryDep = {
export const pkiAcmeServiceFactory = ({
certificateProfileDAL,
acmeAccountDAL
acmeAccountDAL,
acmeOrderDAL
}: TPkiAcmeServiceFactoryDep): TPkiAcmeServiceFactory => {
const validateAcmeProfile = async (profileId: string): Promise<TCertificateProfileWithConfigs> => {
const profile = await certificateProfileDAL.findById(profileId);
@@ -112,6 +113,21 @@ export const pkiAcmeServiceFactory = ({
}
};
const validateNewAccountJwsPayload = async (
rawJwsPayload: TRawJwsPayload
): Promise<TJwsPayload<TCreateAcmeAccountPayload>> => {
return await validateJwsPayload(
rawJwsPayload,
async (protectedHeader) => {
if (!protectedHeader.jwk) {
throw new AcmeBadPublicKeyError({ detail: "JWK is required in the protected header" });
}
return protectedHeader.jwk as unknown as JsonWebKey;
},
CreateAcmeAccountBodySchema
);
};
const getAcmeDirectory = async (profileId: string): Promise<TGetAcmeDirectoryResponse> => {
await validateAcmeProfile(profileId);
return {
@@ -128,12 +144,17 @@ export const pkiAcmeServiceFactory = ({
return "FIXME-generate-nonce";
};
const createAcmeAccount = async (
profileId: string,
alg: string,
jwk: JWK,
{ onlyReturnExisting, contact }: TCreateAcmeAccountPayload
): Promise<TAcmeResponse<TCreateAcmeAccountResponse>> => {
const createAcmeAccount = async ({
profileId,
alg,
jwk,
payload: { onlyReturnExisting, contact }
}: {
profileId: string;
alg: string;
jwk: JsonWebKey;
payload: TCreateAcmeAccountPayload;
}): Promise<TAcmeResponse<TCreateAcmeAccountResponse>> => {
const profile = await validateAcmeProfile(profileId);
const existingAccount: TPkiAcmeAccounts | null = await acmeAccountDAL.findByPublicKey(profileId, alg, jwk);
if (onlyReturnExisting && !existingAccount) {
@@ -176,6 +197,7 @@ export const pkiAcmeServiceFactory = ({
const createAcmeOrder = async (
profileId: string,
account: TPkiAcmeAccounts,
payload: TCreateAcmeOrderPayload
): Promise<TAcmeResponse<TCreateAcmeOrderResponse>> => {
const profile = await validateAcmeProfile(profileId);
@@ -292,6 +314,7 @@ export const pkiAcmeServiceFactory = ({
return {
validateJwsPayload,
validateNewAccountJwsPayload,
getAcmeDirectory,
getAcmeNewNonce,
createAcmeAccount,

18
backend/src/ee/services/pki-acme/pki-acme-types.ts
View File

@@ -54,14 +54,20 @@ export type TPkiAcmeServiceFactory = {
getJWK: (protectedHeader: JWSHeaderParameters) => Promise<JsonWebKey>,
schema: z.ZodSchema<T>
) => Promise<TJwsPayload<T>>;
validateNewAccountJwsPayload: (rawJwsPayload: TRawJwsPayload) => Promise<TJwsPayload<TCreateAcmeAccountPayload>>;
getAcmeDirectory: (profileId: string) => Promise<TGetAcmeDirectoryResponse>;
getAcmeNewNonce: (profileId: string) => Promise<string>;
createAcmeAccount: (
profileId: string,
alg: string,
jwk: JsonWebKey,
body: TCreateAcmeAccountPayload
) => Promise<TAcmeResponse<TCreateAcmeAccountResponse>>;
createAcmeAccount: ({
profileId,
alg,
jwk,
payload
}: {
profileId: string;
alg: string;
jwk: JsonWebKey;
payload: TCreateAcmeAccountPayload;
}) => Promise<TAcmeResponse<TCreateAcmeAccountResponse>>;
createAcmeOrder: (
profileId: string,
body: TCreateAcmeOrderPayload