awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-21 01:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: completed license server integration

Browse Source
This commit is contained in:
Akhil Mohan
2024-01-27 12:38:23 +05:30
parent fe416556f2
commit c7572a3374
47 changed files with 1818 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-pg/src/server/plugins/swagger.ts
+1 -2
View File
@@ -4,7 +4,6 @@ import fp from "fastify-plugin";
import { jsonSchemaTransform } from "./fastify-zod";
// TODO(akhilmhdh-pg): change the localhost port later
export const fastifySwagger = fp(async (fastify) => {
await fastify.register(swagger, {
transform: jsonSchemaTransform,
@@ -16,7 +15,7 @@ export const fastifySwagger = fp(async (fastify) => {
},
servers: [
{
url: "http://localhost:4000",
url: "http://localhost:8080",
description: "Local server"
},
{
backend-pg/src/server/routes/index.ts
+47 -10
View File
@@ -5,6 +5,8 @@ import { registerV1EERoutes } from "@app/ee/routes/v1";
import { auditLogDalFactory } from "@app/ee/services/audit-log/audit-log-dal";
import { auditLogQueueServiceFactory } from "@app/ee/services/audit-log/audit-log-queue";
import { auditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-service";
import { licenseDalFactory } from "@app/ee/services/license/license-dal";
import { licenseServiceFactory } from "@app/ee/services/license/license-service";
import { permissionDalFactory } from "@app/ee/services/permission/permission-dal";
import { permissionServiceFactory } from "@app/ee/services/permission/permission-service";
import { samlConfigDalFactory } from "@app/ee/services/saml-config/saml-config-dal";
@@ -28,6 +30,8 @@ import { secretSnapshotServiceFactory } from "@app/ee/services/secret-snapshot/s
import { snapshotDalFactory } from "@app/ee/services/secret-snapshot/snapshot-dal";
import { snapshotFolderDalFactory } from "@app/ee/services/secret-snapshot/snapshot-folder-dal";
import { snapshotSecretDalFactory } from "@app/ee/services/secret-snapshot/snapshot-secret-dal";
import { trustedIpDalFactory } from "@app/ee/services/trusted-ip/trusted-ip-dal";
import { trustedIpServiceFactory } from "@app/ee/services/trusted-ip/trusted-ip-service";
import { getConfig } from "@app/lib/config/env";
import { TQueueServiceFactory } from "@app/queue";
import { apiKeyDalFactory } from "@app/services/api-key/api-key-dal";
@@ -150,6 +154,7 @@ export const registerRoutes = async (
const identityUaClientSecretDal = identityUaClientSecretDalFactory(db);
const auditLogDal = auditLogDalFactory(db);
const trustedIpDal = trustedIpDalFactory(db);
// ee db layer ops
const permissionDal = permissionDalFactory(db);
@@ -168,6 +173,7 @@ export const registerRoutes = async (
const gitAppInstallSessionDal = gitAppInstallSessionDalFactory(db);
const gitAppOrgDal = gitAppDalFactory(db);
const secretScanningDal = secretScanningDalFactory(db);
const licenseDal = licenseDalFactory(db);
const permissionService = permissionServiceFactory({
permissionDal,
@@ -175,7 +181,19 @@ export const registerRoutes = async (
projectRoleDal,
serviceTokenDal
});
const auditLogQueue = auditLogQueueServiceFactory({ auditLogDal, queueService });
const licenseService = licenseServiceFactory({ permissionService, orgDal, licenseDal });
const trustedIpService = trustedIpServiceFactory({
licenseService,
projectDal,
trustedIpDal,
permissionService
});
const auditLogQueue = auditLogQueueServiceFactory({
auditLogDal,
queueService,
projectDal,
licenseService
});
const auditLogService = auditLogServiceFactory({ auditLogDal, permissionService, auditLogQueue });
const sapService = secretApprovalPolicyServiceFactory({
projectMembershipDal,
@@ -189,7 +207,8 @@ export const registerRoutes = async (
orgBotDal,
orgDal,
userDal,
samlConfigDal
samlConfigDal,
licenseService
});
const tokenService = tokenServiceFactory({ tokenDal: authTokenDal, userDal });
@@ -202,6 +221,8 @@ export const registerRoutes = async (
userDal
});
const orgService = orgServiceFactory({
licenseService,
samlConfigDal,
orgRoleDal,
permissionService,
orgDal,
@@ -217,7 +238,8 @@ export const registerRoutes = async (
authDal,
userDal,
orgDal,
orgService
orgService,
licenseService
});
const orgRoleService = orgRoleServiceFactory({ permissionService, orgRoleDal });
const superAdminService = superAdminServiceFactory({
@@ -247,7 +269,8 @@ export const registerRoutes = async (
secretBlindIndexDal,
projectEnvDal,
projectMembershipDal,
folderDal
folderDal,
licenseService
});
const projectMembershipService = projectMembershipServiceFactory({
projectMembershipDal,
@@ -257,9 +280,15 @@ export const registerRoutes = async (
userDal,
smtpService,
projectKeyDal,
projectRoleDal
projectRoleDal,
licenseService
});
const projectEnvService = projectEnvServiceFactory({
permissionService,
projectEnvDal,
licenseService,
projectDal
});
const projectEnvService = projectEnvServiceFactory({ permissionService, projectEnvDal });
const projectKeyService = projectKeyServiceFactory({
permissionService,
projectKeyDal,
@@ -275,7 +304,8 @@ export const registerRoutes = async (
snapshotSecretDal,
secretVersionDal,
folderVersionDal,
permissionService
permissionService,
licenseService
});
const webhookService = webhookServiceFactory({
permissionService,
@@ -350,7 +380,9 @@ export const registerRoutes = async (
permissionService,
projectEnvDal,
secretRotationDal,
secretRotationQueue
secretRotationQueue,
projectDal,
licenseService
});
const integrationService = integrationServiceFactory({
@@ -383,10 +415,13 @@ export const registerRoutes = async (
identityDal,
identityAccessTokenDal,
identityUaClientSecretDal,
identityUaDal
identityUaDal,
licenseService
});
await superAdminService.initServerCfg();
// setup the communication with license key server
await licenseService.init();
// inject all services
server.decorate<FastifyZodProvider["services"]>("services", {
login: loginService,
@@ -423,7 +458,9 @@ export const registerRoutes = async (
snapshot: snapshotService,
saml: samlService,
auditLog: auditLogService,
secretScanning: secretScanningService
secretScanning: secretScanningService,
license: licenseService,
trustedIp: trustedIpService
});
server.decorate<FastifyZodProvider["store"]>("store", {
backend-pg/src/server/routes/v1/identity-ua.ts
+5 -1
View File
@@ -39,7 +39,11 @@ export const registerIdentityUaRouter = async (server: FastifyZodProvider) => {
},
handler: async (req) => {
const { identityUa, accessToken, identityAccessToken, validClientSecretInfo } =
await server.services.identityUa.login(req.body.clientId, req.body.clientSecret);
await server.services.identityUa.login(
req.body.clientId,
req.body.clientSecret,
req.realIp
);
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
backend-pg/src/server/routes/v1/index.ts
+10 -10
View File
@@ -24,10 +24,10 @@ import { registerWebhookRouter } from "./webhook-router";
export const registerV1Routes = async (server: FastifyZodProvider) => {
await server.register(registerSsoRouter, { prefix: "/sso" });
await server.register(
async (authServer) => {
await authServer.register(registerAuthRoutes);
await authServer.register(registerIdentityUaRouter);
await authServer.register(registerIdentityAccessTokenRouter);
async (authRouter) => {
await authRouter.register(registerAuthRoutes);
await authRouter.register(registerIdentityUaRouter);
await authRouter.register(registerIdentityAccessTokenRouter);
},
{ prefix: "/auth" }
);
@@ -41,12 +41,12 @@ export const registerV1Routes = async (server: FastifyZodProvider) => {
await server.register(registerSecretFolderRouter, { prefix: "/folders" });
await server.register(
async (projectServer) => {
await projectServer.register(registerProjectRouter);
await projectServer.register(registerProjectEnvRouter);
await projectServer.register(registerProjectKeyRouter);
await projectServer.register(registerProjectMembershipRouter);
await projectServer.register(registerSecretTagRouter);
async (projectRouter) => {
await projectRouter.register(registerProjectRouter);
await projectRouter.register(registerProjectEnvRouter);
await projectRouter.register(registerProjectKeyRouter);
await projectRouter.register(registerProjectMembershipRouter);
await projectRouter.register(registerSecretTagRouter);
},
{ prefix: "/workspace" }
);
backend-pg/src/server/routes/v1/organization-router.ts
-3
View File
@@ -84,8 +84,6 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
}
});
// TODO(akhilmhdh-pg): missing my-workspace list
server.route({
method: "PATCH",
url: "/:organizationId/name",
@@ -161,7 +159,6 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
method: "DELETE",
url: "/:organizationId/incidentContactOrg/:incidentContactId",
schema: {
// TODO(akhilmhdh-pg): change accept id instead of email
params: z.object({ organizationId: z.string().trim(), incidentContactId: z.string().trim() }),
response: {
200: z.object({
backend-pg/src/server/routes/v2/organization-router.ts
+2 -1
View File
@@ -88,7 +88,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.IDENTITY_ACCESS_TOKEN]),
handler: async (req) => {
if (req.auth.actor !== ActorType.USER) return;
const membership = await server.services.org.deleteOrgMembership({
userId: req.permission.id,
orgId: req.params.organizationId,
@@ -117,6 +117,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
const organization = await server.services.org.createOrganization(
req.permission.id,
req.auth.user.email,
req.body.name
);
return { organization };