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:14:37 -07:00
parent 223835d141
commit 6064b39c05
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/ee/routes/v1/pki-acme-router.ts
View File

@@ -1,6 +1,7 @@
/* eslint-disable @typescript-eslint/no-floating-promises */
import { z } from "zod";
import { AcmeBadPublicKeyError } from "@app/ee/services/pki-acme/pki-acme-errors";
import {
CreateAcmeAccountBodySchema,
CreateAcmeAccountResponseSchema,
@@ -24,15 +25,11 @@ import {
RespondToAcmeChallengeResponseSchema,
RespondToAcmeChallengeSchema
} from "@app/ee/services/pki-acme/pki-acme-schemas";
import { TCreateAcmeAccountPayload, TRawJwsPayload } from "@app/ee/services/pki-acme/pki-acme-types";
import { TRawJwsPayload } from "@app/ee/services/pki-acme/pki-acme-types";
import { ApiDocsTags } from "@app/lib/api-docs";
import { getConfig } from "@app/lib/config/env";
import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
import { AcmeBadPublicKeyError } from "@app/ee/services/pki-acme/pki-acme-errors";
export const registerPkiAcmeRouter = async (server: FastifyZodProvider) => {
const appCfg = getConfig();
server.addContentTypeParser("application/jose+json", { parseAs: "string" }, (_, body, done) => {
try {
const strBody = body instanceof Buffer ? body.toString() : body;

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

@@ -33,7 +33,6 @@ import {
TGetAcmeDirectoryResponse,
TGetAcmeOrderResponse,
TJwsPayload,
TJwsPayloadWithJwk,
TListAcmeOrdersResponse,
TPkiAcmeServiceFactory,
TRawJwsPayload,
@@ -74,15 +73,13 @@ export const pkiAcmeServiceFactory = ({
rawJwsPayload: TRawJwsPayload,
getJWK: (protectedHeader: JWSHeaderParameters) => Promise<JsonWebKey>,
schema: z.ZodSchema<T>
): Promise<TJwsPayload> => {
): Promise<TJwsPayload<T>> => {
let result: FlattenedVerifyResult;
try {
result = await flattenedVerify(rawJwsPayload, async (protectedHeader: JWSHeaderParameters | undefined) => {
if (protectedHeader === undefined) {
throw new AcmeMalformedError({ detail: "Protected header is required" });
}
const parsedHeader = ProtectedHeaderSchema.parse(protectedHeader);
// TODO: consume the nonce here
const jwk = await getJWK(protectedHeader);
return await importJWK(jwk, protectedHeader.alg);
});
@@ -96,15 +93,12 @@ export const pkiAcmeServiceFactory = ({
logger.error(error, "Unexpected error while verifying JWS payload");
throw new AcmeServerInternalError({ detail: "Failed to verify JWS payload" });
}
const { payload: rawPayload, protectedHeader: rawProtectedHeader } = result!;
const { success, data: protectedHeader } = ProtectedHeaderSchema.safeParse(rawProtectedHeader);
if (!success) {
throw new AcmeMalformedError({ detail: "Invalid protected header" });
}
const decoder = new TextDecoder();
const jsonPayload = JSON.parse(decoder.decode(rawPayload));
const { protectedHeader: rawProtectedHeader, payload: rawPayload } = result;
try {
const protectedHeader = ProtectedHeaderSchema.parse(rawProtectedHeader);
// TODO: consume the nonce here
const decoder = new TextDecoder();
const jsonPayload = JSON.parse(decoder.decode(rawPayload));
const payload = schema.parse(jsonPayload);
return {
protectedHeader,
@@ -297,7 +291,7 @@ export const pkiAcmeServiceFactory = ({
};
return {
validateCreateAcmeAccountJwsPayload,
validateJwsPayload,
getAcmeDirectory,
getAcmeNewNonce,
createAcmeAccount,