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

DRY

Browse Source
This commit is contained in:
Fang-Pen Lin
2025-11-07 09:19:07 -08:00
parent 7b15dee2e6
commit 9ad75c2a2d
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/pki-acme/pki-acme-service.ts
+23 -25
View File
@@ -82,18 +82,18 @@ export const pkiAcmeServiceFactory = ({
return profile; return profile;
}; };
const buildUrl = (path: string): string => { const buildUrl = (profileId: string, path: string): string => {
const appCfg = getConfig(); const appCfg = getConfig();
const baseUrl = appCfg.SITE_URL ?? ""; const baseUrl = appCfg.SITE_URL ?? "";
return `${baseUrl}${path}`; return `${baseUrl}/api/v1/pki/acme/profiles/${profileId}${path}`;
}; };
const extractAccountIdFromKid = (kid: string, profileId: string): string => { const extractAccountIdFromKid = (kid: string, profileId: string): string => {
const kidPrefix = buildUrl(`/api/v1/pki/acme/profiles/${profileId}/accounts/`); const kidPrefix = buildUrl(profileId, "/accounts/");
if (!kid.startsWith(kidPrefix)) { if (!kid.startsWith(kidPrefix)) {
throw new AcmeMalformedError({ detail: "KID must start with the profile account URL" }); throw new AcmeMalformedError({ detail: "KID must start with the profile account URL" });
} }
return kid.slice(kidPrefix.length); return z.string().uuid().parse(kid.slice(kidPrefix.length));
}; };
const validateJwsPayload = async < const validateJwsPayload = async <
@@ -248,18 +248,18 @@ export const pkiAcmeServiceFactory = ({
value: auth.identifierValue value: auth.identifierValue
})), })),
authorizations: order.authorizations.map((auth: TPkiAcmeAuths) => authorizations: order.authorizations.map((auth: TPkiAcmeAuths) =>
buildUrl(`/api/v1/pki/acme/profiles/${profileId}/authorizations/${auth.id}`) buildUrl(profileId, `/authorizations/${auth.id}`)
), ),
finalize: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/orders/${order.id}/finalize`) finalize: buildUrl(profileId, `/orders/${order.id}/finalize`)
}; };
}; };
const getAcmeDirectory = async (profileId: string): Promise<TGetAcmeDirectoryResponse> => { const getAcmeDirectory = async (profileId: string): Promise<TGetAcmeDirectoryResponse> => {
const profile = await validateAcmeProfile(profileId); const profile = await validateAcmeProfile(profileId);
return { return {
newNonce: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/new-nonce`), newNonce: buildUrl(profile.id, "/new-nonce"),
newAccount: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/new-account`), newAccount: buildUrl(profile.id, "/new-account"),
newOrder: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/new-order`) newOrder: buildUrl(profile.id, "/new-order")
}; };
}; };
@@ -297,10 +297,10 @@ export const pkiAcmeServiceFactory = ({
body: { body: {
status: "valid", status: "valid",
contact: existingAccount.emails, contact: existingAccount.emails,
orders: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/accounts/${existingAccount.id}/orders`) orders: buildUrl(profile.id, `/accounts/${existingAccount.id}/orders`)
}, },
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/accounts/${existingAccount.id}`) Location: buildUrl(profile.id, `/accounts/${existingAccount.id}`)
} }
}; };
} }
@@ -318,10 +318,10 @@ export const pkiAcmeServiceFactory = ({
body: { body: {
status: "valid", status: "valid",
contact: newAccount.emails, contact: newAccount.emails,
orders: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/accounts/${newAccount.id}/orders`) orders: buildUrl(profile.id, `/accounts/${newAccount.id}/orders`)
}, },
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profile.id}/accounts/${newAccount.id}`) Location: buildUrl(profile.id, `/accounts/${newAccount.id}`)
} }
}; };
}; };
@@ -343,7 +343,7 @@ export const pkiAcmeServiceFactory = ({
status: "deactivated" status: "deactivated"
}, },
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/accounts/${accountId}`) Location: buildUrl(profileId, `/accounts/${accountId}`)
} }
}; };
}; };
@@ -428,7 +428,7 @@ export const pkiAcmeServiceFactory = ({
order order
}), }),
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${order.account.profileId}/orders/${order.id}`) Location: buildUrl(profileId, `/orders/${order.id}`)
} }
}; };
}; };
@@ -449,7 +449,7 @@ export const pkiAcmeServiceFactory = ({
return { return {
status: 200, status: 200,
body: buildAcmeOrderResource({ profileId, order }), body: buildAcmeOrderResource({ profileId, order }),
headers: { Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/orders/${orderId}`) } headers: { Location: buildUrl(profileId, `/orders/${orderId}`) }
}; };
}; };
@@ -474,7 +474,7 @@ export const pkiAcmeServiceFactory = ({
status: 200, status: 200,
body: buildAcmeOrderResource({ profileId, order }), body: buildAcmeOrderResource({ profileId, order }),
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/orders/${orderId}`) Location: buildUrl(profileId, `/orders/${orderId}`)
} }
}; };
}; };
@@ -498,7 +498,7 @@ export const pkiAcmeServiceFactory = ({
status: 200, status: 200,
body: "FIXME-certificate-pem", body: "FIXME-certificate-pem",
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/orders/${orderId}/certificate`) Location: buildUrl(profileId, `/orders/${orderId}/certificate`)
} }
}; };
}; };
@@ -518,7 +518,7 @@ export const pkiAcmeServiceFactory = ({
orders: [] orders: []
}, },
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/accounts/${accountId}/orders`) Location: buildUrl(profileId, `/accounts/${accountId}/orders`)
} }
}; };
}; };
@@ -551,16 +551,14 @@ export const pkiAcmeServiceFactory = ({
challenges: auth.challenges.map((challenge: TPkiAcmeChallenges) => { challenges: auth.challenges.map((challenge: TPkiAcmeChallenges) => {
return { return {
type: challenge.type, type: challenge.type,
url: buildUrl( url: buildUrl(profileId, `/authorizations/${authzId}/challenges/${challenge.id}`),
`/api/v1/pki/acme/profiles/${profileId}/authorizations/${authzId}/challenges/${challenge.id}`
),
status: challenge.status, status: challenge.status,
token: auth.token token: auth.token
}; };
}) })
}, },
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/authorizations/${authzId}`) Location: buildUrl(profileId, `/authorizations/${authzId}`)
} }
}; };
}; };
@@ -579,12 +577,12 @@ export const pkiAcmeServiceFactory = ({
status: 200, status: 200,
body: { body: {
type: "http-01", type: "http-01",
url: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/authorizations/${authzId}/challenges/http-01`), url: buildUrl(profileId, `/authorizations/${authzId}/challenges/http-01`),
status: "pending", status: "pending",
token: "FIXME-challenge-token" token: "FIXME-challenge-token"
}, },
headers: { headers: {
Location: buildUrl(`/api/v1/pki/acme/profiles/${profileId}/authorizations/${authzId}/challenges/http-01`) Location: buildUrl(profileId, `/authorizations/${authzId}/challenges/http-01`)
} }
}; };
}; };