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

Merge pull request #3680 from Infisical/misc/pki-improvements

Browse Source 
misc: general improvements
This commit is contained in:
Sheen
2025-05-30 01:48:36 +08:00
committed by GitHub
parent 26375715e4 5c435f7645
commit 98e79207cc
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/services/certificate-authority/certificate-authority-service.ts
View File

@@ -311,7 +311,6 @@ export const certificateAuthorityServiceFactory = ({
}
const updatedCa = await internalCertificateAuthorityService.updateCaById({
...configuration,
isInternal: true,
enableDirectIssuance,
caId: certificateAuthority.id,

6
backend/src/services/certificate-authority/internal/internal-certificate-authority-schemas.ts
View File

@@ -55,8 +55,4 @@ export const CreateInternalCertificateAuthoritySchema = GenericCreateCertificate
configuration: InternalCertificateAuthorityConfigurationSchema
});
export const UpdateInternalCertificateAuthoritySchema = GenericUpdateCertificateAuthorityFieldsSchema(
CaType.INTERNAL
).extend({
configuration: InternalCertificateAuthorityConfigurationSchema.optional()
});
export const UpdateInternalCertificateAuthoritySchema = GenericUpdateCertificateAuthorityFieldsSchema(CaType.INTERNAL);

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

@@ -137,6 +137,15 @@ export const pkiSubscriberServiceFactory = ({
}
}
const ca = await certificateAuthorityDAL.findById(caId);
if (!ca) {
throw new NotFoundError({ message: `CA with ID '${caId}' not found` });
}
if (ca.projectId !== projectId) {
throw new BadRequestError({ message: "CA does not belong to the project" });
}
const newSubscriber = await pkiSubscriberDAL.create({
caId,
projectId,
@@ -245,6 +254,17 @@ export const pkiSubscriberServiceFactory = ({
}
}
if (caId) {
const ca = await certificateAuthorityDAL.findById(caId);
if (!ca) {
throw new NotFoundError({ message: `CA with ID '${caId}' not found` });
}
if (ca.projectId !== projectId) {
throw new BadRequestError({ message: "CA does not belong to the project" });
}
}
const updatedSubscriber = await pkiSubscriberDAL.updateById(subscriber.id, {
caId,
name,