mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-04 08:26:10 +00:00
More ACME db stuff
# Conflicts: # backend/src/services/certificate-profile/certificate-profile-types.ts
This commit is contained in:
@@ -17,6 +17,7 @@ export const PkiCertificateProfilesSchema = z.object({
|
|||||||
enrollmentType: z.string(),
|
enrollmentType: z.string(),
|
||||||
estConfigId: z.string().uuid().nullable().optional(),
|
estConfigId: z.string().uuid().nullable().optional(),
|
||||||
apiConfigId: z.string().uuid().nullable().optional(),
|
apiConfigId: z.string().uuid().nullable().optional(),
|
||||||
|
acmeConfigId: z.string().uuid().nullable().optional(),
|
||||||
createdAt: z.date(),
|
createdAt: z.date(),
|
||||||
updatedAt: z.date()
|
updatedAt: z.date()
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -185,6 +185,7 @@ import { cmekServiceFactory } from "@app/services/cmek/cmek-service";
|
|||||||
import { convertorServiceFactory } from "@app/services/convertor/convertor-service";
|
import { convertorServiceFactory } from "@app/services/convertor/convertor-service";
|
||||||
import { apiEnrollmentConfigDALFactory } from "@app/services/enrollment-config/api-enrollment-config-dal";
|
import { apiEnrollmentConfigDALFactory } from "@app/services/enrollment-config/api-enrollment-config-dal";
|
||||||
import { estEnrollmentConfigDALFactory } from "@app/services/enrollment-config/est-enrollment-config-dal";
|
import { estEnrollmentConfigDALFactory } from "@app/services/enrollment-config/est-enrollment-config-dal";
|
||||||
|
import { acmeEnrollmentConfigDALFactory } from "@app/services/enrollment-config/acme-enrollment-config-dal";
|
||||||
import { externalGroupOrgRoleMappingDALFactory } from "@app/services/external-group-org-role-mapping/external-group-org-role-mapping-dal";
|
import { externalGroupOrgRoleMappingDALFactory } from "@app/services/external-group-org-role-mapping/external-group-org-role-mapping-dal";
|
||||||
import { externalGroupOrgRoleMappingServiceFactory } from "@app/services/external-group-org-role-mapping/external-group-org-role-mapping-service";
|
import { externalGroupOrgRoleMappingServiceFactory } from "@app/services/external-group-org-role-mapping/external-group-org-role-mapping-service";
|
||||||
import { externalMigrationQueueFactory } from "@app/services/external-migration/external-migration-queue";
|
import { externalMigrationQueueFactory } from "@app/services/external-migration/external-migration-queue";
|
||||||
@@ -1062,6 +1063,7 @@ export const registerRoutes = async (
|
|||||||
const certificateProfileDAL = certificateProfileDALFactory(db);
|
const certificateProfileDAL = certificateProfileDALFactory(db);
|
||||||
const apiEnrollmentConfigDAL = apiEnrollmentConfigDALFactory(db);
|
const apiEnrollmentConfigDAL = apiEnrollmentConfigDALFactory(db);
|
||||||
const estEnrollmentConfigDAL = estEnrollmentConfigDALFactory(db);
|
const estEnrollmentConfigDAL = estEnrollmentConfigDALFactory(db);
|
||||||
|
const acmeEnrollmentConfigDAL = acmeEnrollmentConfigDALFactory(db);
|
||||||
|
|
||||||
const certificateDAL = certificateDALFactory(db);
|
const certificateDAL = certificateDALFactory(db);
|
||||||
const certificateBodyDAL = certificateBodyDALFactory(db);
|
const certificateBodyDAL = certificateBodyDALFactory(db);
|
||||||
|
|||||||
@@ -88,6 +88,11 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
|
|||||||
`${TableName.PkiCertificateProfile}.apiConfigId`,
|
`${TableName.PkiCertificateProfile}.apiConfigId`,
|
||||||
`${TableName.PkiApiEnrollmentConfig}.id`
|
`${TableName.PkiApiEnrollmentConfig}.id`
|
||||||
)
|
)
|
||||||
|
.leftJoin(
|
||||||
|
TableName.PkiAcmeEnrollmentConfig,
|
||||||
|
`${TableName.PkiCertificateProfile}.acmeConfigId`,
|
||||||
|
`${TableName.PkiAcmeEnrollmentConfig}.id`
|
||||||
|
)
|
||||||
.select(selectAllTableCols(TableName.PkiCertificateProfile))
|
.select(selectAllTableCols(TableName.PkiCertificateProfile))
|
||||||
.select(
|
.select(
|
||||||
db.ref("id").withSchema(TableName.CertificateAuthority).as("caId"),
|
db.ref("id").withSchema(TableName.CertificateAuthority).as("caId"),
|
||||||
@@ -107,7 +112,8 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
|
|||||||
db.ref("encryptedCaChain").withSchema(TableName.PkiEstEnrollmentConfig).as("estConfigEncryptedCaChain"),
|
db.ref("encryptedCaChain").withSchema(TableName.PkiEstEnrollmentConfig).as("estConfigEncryptedCaChain"),
|
||||||
db.ref("id").withSchema(TableName.PkiApiEnrollmentConfig).as("apiConfigId"),
|
db.ref("id").withSchema(TableName.PkiApiEnrollmentConfig).as("apiConfigId"),
|
||||||
db.ref("autoRenew").withSchema(TableName.PkiApiEnrollmentConfig).as("apiConfigAutoRenew"),
|
db.ref("autoRenew").withSchema(TableName.PkiApiEnrollmentConfig).as("apiConfigAutoRenew"),
|
||||||
db.ref("renewBeforeDays").withSchema(TableName.PkiApiEnrollmentConfig).as("apiConfigRenewBeforeDays")
|
db.ref("renewBeforeDays").withSchema(TableName.PkiApiEnrollmentConfig).as("apiConfigRenewBeforeDays"),
|
||||||
|
db.ref("id").withSchema(TableName.PkiAcmeEnrollmentConfig).as("acmeConfigId")
|
||||||
)
|
)
|
||||||
.where(`${TableName.PkiCertificateProfile}.id`, id)
|
.where(`${TableName.PkiCertificateProfile}.id`, id)
|
||||||
.first();
|
.first();
|
||||||
@@ -134,6 +140,10 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
|
|||||||
} as TCertificateProfileWithConfigs["apiConfig"])
|
} as TCertificateProfileWithConfigs["apiConfig"])
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
|
const acmeConfig = result.acmeConfigId
|
||||||
|
? ({ id: result.acmeConfigId } as TCertificateProfileWithConfigs["acmeConfig"])
|
||||||
|
: undefined;
|
||||||
|
|
||||||
const certificateAuthority =
|
const certificateAuthority =
|
||||||
result.caId && result.caProjectId && result.caStatus && result.caName
|
result.caId && result.caProjectId && result.caStatus && result.caName
|
||||||
? ({
|
? ({
|
||||||
@@ -164,10 +174,12 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
|
|||||||
enrollmentType: result.enrollmentType as EnrollmentType,
|
enrollmentType: result.enrollmentType as EnrollmentType,
|
||||||
estConfigId: result.estConfigId,
|
estConfigId: result.estConfigId,
|
||||||
apiConfigId: result.apiConfigId,
|
apiConfigId: result.apiConfigId,
|
||||||
|
acmeConfigId: result.acmeConfigId,
|
||||||
createdAt: result.createdAt,
|
createdAt: result.createdAt,
|
||||||
updatedAt: result.updatedAt,
|
updatedAt: result.updatedAt,
|
||||||
estConfig,
|
estConfig,
|
||||||
apiConfig,
|
apiConfig,
|
||||||
|
acmeConfig,
|
||||||
certificateAuthority,
|
certificateAuthority,
|
||||||
certificateTemplate
|
certificateTemplate
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import {
|
|||||||
|
|
||||||
export enum EnrollmentType {
|
export enum EnrollmentType {
|
||||||
API = "api",
|
API = "api",
|
||||||
EST = "est"
|
EST = "est",
|
||||||
|
ACME = "acme"
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TCertificateProfile = Omit<TPkiCertificateProfiles, "enrollmentType"> & {
|
export type TCertificateProfile = Omit<TPkiCertificateProfiles, "enrollmentType"> & {
|
||||||
@@ -28,6 +29,7 @@ export type TCertificateProfileUpdate = Omit<TPkiCertificateProfilesUpdate, "enr
|
|||||||
autoRenew?: boolean;
|
autoRenew?: boolean;
|
||||||
renewBeforeDays?: number;
|
renewBeforeDays?: number;
|
||||||
};
|
};
|
||||||
|
acmeConfig?: {};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type TCertificateProfileWithConfigs = TCertificateProfile & {
|
export type TCertificateProfileWithConfigs = TCertificateProfile & {
|
||||||
@@ -54,6 +56,10 @@ export type TCertificateProfileWithConfigs = TCertificateProfile & {
|
|||||||
autoRenew: boolean;
|
autoRenew: boolean;
|
||||||
renewBeforeDays?: number;
|
renewBeforeDays?: number;
|
||||||
};
|
};
|
||||||
|
acmeConfig?: {
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
metrics?: TCertificateProfileMetrics;
|
||||||
};
|
};
|
||||||
|
|
||||||
export interface TCertificateProfileCertificate {
|
export interface TCertificateProfileCertificate {
|
||||||
|
|||||||
Reference in New Issue
Block a user