+ 
-
+
@@ -127,7 +127,7 @@ Whether it's big or small, we love contributions. Check out our guide to see how
Not sure where to get started? You can:
-- [Book a free, non-pressure pairing sessions with one of our teammates](mailto:tony@infisical.com?subject=Pairing%20session&body=I'd%20like%20to%20do%20a%20pairing%20session!)!
+- [Book a free, non-pressure pairing session / code walkthrough with one of our teammates](https://cal.com/tony-infisical/30-min-meeting-contributing)!
- Join our Slack, and ask us any questions there.
## Resources
diff --git a/backend/src/controllers/v1/integrationAuthController.ts b/backend/src/controllers/v1/integrationAuthController.ts
index fc79e22cf9..394c674464 100644
--- a/backend/src/controllers/v1/integrationAuthController.ts
+++ b/backend/src/controllers/v1/integrationAuthController.ts
@@ -151,6 +151,7 @@ export const getIntegrationAuthApps = async (req: Request, res: Response) => {
const apps = await getApps({
integrationAuth: req.integrationAuth,
accessToken: req.accessToken,
+ accessId: req.accessId,
...teamId && { teamId }
});
diff --git a/backend/src/controllers/v1/integrationController.ts b/backend/src/controllers/v1/integrationController.ts
index 5119761d0b..63828ef148 100644
--- a/backend/src/controllers/v1/integrationController.ts
+++ b/backend/src/controllers/v1/integrationController.ts
@@ -1,10 +1,11 @@
-import { Request, Response } from 'express';
-import { Types } from 'mongoose';
-import {
- Integration
-} from '../../models';
-import { EventService } from '../../services';
-import { eventPushSecrets } from '../../events';
+import { Request, Response } from "express";
+import { Types } from "mongoose";
+import { Integration } from "../../models";
+import { EventService } from "../../services";
+import { eventPushSecrets } from "../../events";
+import Folder from "../../models/folder";
+import { getFolderByPath } from "../../services/FolderService";
+import { BadRequestError } from "../../utils/errors";
/**
* Create/initialize an (empty) integration for integration authorization
@@ -25,9 +26,24 @@ export const createIntegration = async (req: Request, res: Response) => {
targetServiceId,
owner,
path,
- region
+ region,
+ secretPath,
} = req.body;
-
+
+ const folders = await Folder.findOne({
+ workspace: req.integrationAuth.workspace._id,
+ environment: sourceEnvironment,
+ });
+
+ if (folders) {
+ const folder = getFolderByPath(folders.nodes, secretPath);
+ if (!folder) {
+ throw BadRequestError({
+ message: "Path for service token does not exist",
+ });
+ }
+ }
+
// TODO: validate [sourceEnvironment] and [targetEnvironment]
// initialize new integration after saving integration access token
@@ -44,17 +60,18 @@ export const createIntegration = async (req: Request, res: Response) => {
owner,
path,
region,
+ secretPath,
integration: req.integrationAuth.integration,
- integrationAuth: new Types.ObjectId(integrationAuthId)
+ integrationAuth: new Types.ObjectId(integrationAuthId),
}).save();
-
+
if (integration) {
// trigger event - push secrets
EventService.handleEvent({
event: eventPushSecrets({
workspaceId: integration.workspace,
- environment: sourceEnvironment
- })
+ environment: sourceEnvironment,
+ }),
});
}
@@ -70,7 +87,6 @@ export const createIntegration = async (req: Request, res: Response) => {
* @returns
*/
export const updateIntegration = async (req: Request, res: Response) => {
-
// TODO: add integration-specific validation to ensure that each
// integration has the correct fields populated in [Integration]
@@ -81,8 +97,23 @@ export const updateIntegration = async (req: Request, res: Response) => {
appId,
targetEnvironment,
owner, // github-specific integration param
+ secretPath,
} = req.body;
+ const folders = await Folder.findOne({
+ workspace: req.integration.workspace,
+ environment,
+ });
+
+ if (folders) {
+ const folder = getFolderByPath(folders.nodes, secretPath);
+ if (!folder) {
+ throw BadRequestError({
+ message: "Path for service token does not exist",
+ });
+ }
+ }
+
const integration = await Integration.findOneAndUpdate(
{
_id: req.integration._id,
@@ -94,6 +125,7 @@ export const updateIntegration = async (req: Request, res: Response) => {
appId,
targetEnvironment,
owner,
+ secretPath,
},
{
new: true,
@@ -105,7 +137,7 @@ export const updateIntegration = async (req: Request, res: Response) => {
EventService.handleEvent({
event: eventPushSecrets({
workspaceId: integration.workspace,
- environment
+ environment,
}),
});
}
diff --git a/backend/src/controllers/v1/membershipOrgController.ts b/backend/src/controllers/v1/membershipOrgController.ts
index eafd7fae2a..0d4c1436d7 100644
--- a/backend/src/controllers/v1/membershipOrgController.ts
+++ b/backend/src/controllers/v1/membershipOrgController.ts
@@ -99,7 +99,7 @@ export const inviteUserToOrganization = async (req: Request, res: Response) => {
throw new Error('Failed to validate organization membership');
}
- const plan = await EELicenseService.getOrganizationPlan(organizationId);
+ const plan = await EELicenseService.getPlan(organizationId);
if (plan.memberLimit !== null) {
// case: limit imposed on number of members allowed
diff --git a/backend/src/controllers/v1/passwordController.ts b/backend/src/controllers/v1/passwordController.ts
index bdeae0fd46..da1903ebaa 100644
--- a/backend/src/controllers/v1/passwordController.ts
+++ b/backend/src/controllers/v1/passwordController.ts
@@ -36,8 +36,8 @@ export const emailPasswordReset = async (req: Request, res: Response) => {
if (!user || !user?.publicKey) {
// case: user has already completed account
- return res.status(403).send({
- message: "If an account exists with this email, a password reset link has been sent"
+ return res.status(200).send({
+ message:"If an account exists with this email, a password reset link has been sent"
});
}
diff --git a/backend/src/controllers/v1/secretsFolderController.ts b/backend/src/controllers/v1/secretsFolderController.ts
index 06d68a41df..c1ce7ffc44 100644
--- a/backend/src/controllers/v1/secretsFolderController.ts
+++ b/backend/src/controllers/v1/secretsFolderController.ts
@@ -11,6 +11,7 @@ import {
validateFolderName,
generateFolderId,
getParentFromFolderId,
+ getFolderByPath,
} from "../../services/FolderService";
import { ADMIN, MEMBER } from "../../variables";
import { validateMembership } from "../../helpers/membership";
@@ -177,11 +178,13 @@ export const deleteFolder = async (req: Request, res: Response) => {
// TODO: validate workspace
export const getFolders = async (req: Request, res: Response) => {
- const { workspaceId, environment, parentFolderId } = req.query as {
- workspaceId: string;
- environment: string;
- parentFolderId?: string;
- };
+ const { workspaceId, environment, parentFolderId, parentFolderPath } =
+ req.query as {
+ workspaceId: string;
+ environment: string;
+ parentFolderId?: string;
+ parentFolderPath?: string;
+ };
const folders = await Folder.findOne({ workspace: workspaceId, environment });
if (!folders) {
@@ -196,6 +199,20 @@ export const getFolders = async (req: Request, res: Response) => {
acceptedRoles: [ADMIN, MEMBER],
});
+ // if instead of parentFolderId given a path like /folder1/folder2
+ if (parentFolderPath) {
+ const folder = getFolderByPath(folders.nodes, parentFolderPath);
+ if (!folder) {
+ res.send({ folders: [], dir: [] });
+ return;
+ }
+ // dir is not needed at present as this is only used in overview section of secrets
+ res.send({
+ folders: folder.children.map(({ id, name }) => ({ id, name })),
+ dir: [{ name: folder.name, id: folder.id }],
+ });
+ }
+
if (!parentFolderId) {
const rootFolders = folders.nodes.children.map(({ id, name }) => ({
id,
diff --git a/backend/src/controllers/v1/workspaceController.ts b/backend/src/controllers/v1/workspaceController.ts
index 796a7bebce..2faac0d686 100644
--- a/backend/src/controllers/v1/workspaceController.ts
+++ b/backend/src/controllers/v1/workspaceController.ts
@@ -116,7 +116,7 @@ export const createWorkspace = async (req: Request, res: Response) => {
throw new Error("Failed to validate organization membership");
}
- const plan = await EELicenseService.getOrganizationPlan(organizationId);
+ const plan = await EELicenseService.getPlan(organizationId);
if (plan.workspaceLimit !== null) {
// case: limit imposed on number of workspaces allowed
diff --git a/backend/src/controllers/v2/environmentController.ts b/backend/src/controllers/v2/environmentController.ts
index d4f91bacec..bf6d7d3c59 100644
--- a/backend/src/controllers/v2/environmentController.ts
+++ b/backend/src/controllers/v2/environmentController.ts
@@ -8,7 +8,8 @@ import {
Membership,
} from '../../models';
import { SecretVersion } from '../../ee/models';
-import { BadRequestError } from '../../utils/errors';
+import { EELicenseService } from '../../ee/services';
+import { BadRequestError, WorkspaceNotFoundError } from '../../utils/errors';
import _ from 'lodash';
import { PERMISSION_READ_SECRETS, PERMISSION_WRITE_SECRETS } from '../../variables';
@@ -22,9 +23,26 @@ export const createWorkspaceEnvironment = async (
req: Request,
res: Response
) => {
+
const { workspaceId } = req.params;
const { environmentName, environmentSlug } = req.body;
const workspace = await Workspace.findById(workspaceId).exec();
+
+ if (!workspace) throw WorkspaceNotFoundError();
+
+ const plan = await EELicenseService.getPlan(workspace.organization.toString());
+
+ if (plan.environmentLimit !== null) {
+ // case: limit imposed on number of environments allowed
+ if (workspace.environments.length >= plan.environmentLimit) {
+ // case: number of environments used exceeds the number of environments allowed
+
+ return res.status(400).send({
+ message: 'Failed to create environment due to environment limit reached. Upgrade plan to create more environments.'
+ });
+ }
+ }
+
if (
!workspace ||
workspace?.environments.find(
@@ -40,6 +58,8 @@ export const createWorkspaceEnvironment = async (
});
await workspace.save();
+ await EELicenseService.refreshPlan(workspace.organization.toString(), workspaceId);
+
return res.status(200).send({
message: 'Successfully created new environment',
workspace: workspaceId,
@@ -186,7 +206,9 @@ export const deleteWorkspaceEnvironment = async (
await Membership.updateMany(
{ workspace: workspaceId },
{ $pull: { deniedPermissions: { environmentSlug: environmentSlug } } }
- )
+ );
+
+ await EELicenseService.refreshPlan(workspace.organization.toString(), workspaceId);
return res.status(200).send({
message: 'Successfully deleted environment',
diff --git a/backend/src/controllers/v2/secretsController.ts b/backend/src/controllers/v2/secretsController.ts
index ae1de8cfed..256ad248c2 100644
--- a/backend/src/controllers/v2/secretsController.ts
+++ b/backend/src/controllers/v2/secretsController.ts
@@ -700,11 +700,15 @@ export const getSecrets = async (req: Request, res: Response) => {
(!folders && folderId && folderId !== "root") ||
(!folders && secretPath)
) {
- throw BadRequestError({ message: "Folder not found" });
+ res.send({ secrets: [] });
+ return;
}
if (folders && folderId !== "root") {
const folder = searchByFolderId(folders.nodes, folderId as string);
- if (!folder) throw BadRequestError({ message: "Folder not found" });
+ if (!folder) {
+ res.send({ secrets: [] });
+ return;
+ }
}
if (req.authData.authPayload instanceof ServiceTokenData) {
@@ -720,10 +724,11 @@ export const getSecrets = async (req: Request, res: Response) => {
}
if (folders && secretPath) {
- if (!folders) throw BadRequestError({ message: "Folder not found" });
+ // avoid throwing error and send empty list
const folder = getFolderByPath(folders.nodes, secretPath as string);
if (!folder) {
- throw BadRequestError({ message: "Secret path not found" });
+ res.send({ secrets: [] });
+ return;
}
folderId = folder.id;
}
diff --git a/backend/src/controllers/v3/secretsController.ts b/backend/src/controllers/v3/secretsController.ts
index 8a9350a361..182d7f14f4 100644
--- a/backend/src/controllers/v3/secretsController.ts
+++ b/backend/src/controllers/v3/secretsController.ts
@@ -34,7 +34,7 @@ export const getSecretsRaw = async (req: Request, res: Response) => {
secret,
key
});
-
+
return rep;
})
});
@@ -88,7 +88,7 @@ export const createSecretRaw = async (req: Request, res: Response) => {
secretComment,
secretPath = "/"
} = req.body;
-
+
const key = await BotService.getWorkspaceKeyWithBot({
workspaceId: new Types.ObjectId(workspaceId)
});
@@ -102,12 +102,12 @@ export const createSecretRaw = async (req: Request, res: Response) => {
plaintext: secretValue,
key
});
-
+
const secretCommentEncrypted = encryptSymmetric128BitHexKeyUTF8({
plaintext: secretComment,
key
- });
-
+ });
+
const secret = await SecretService.createSecret({
secretName,
workspaceId: new Types.ObjectId(workspaceId),
@@ -135,7 +135,7 @@ export const createSecretRaw = async (req: Request, res: Response) => {
const secretWithoutBlindIndex = secret.toObject();
delete secretWithoutBlindIndex.secretBlindIndex;
-
+
return res.status(200).send({
secret: repackageSecretToRaw({
secret: secretWithoutBlindIndex,
@@ -202,11 +202,11 @@ export const updateSecretByNameRaw = async (req: Request, res: Response) => {
*/
export const deleteSecretByNameRaw = async (req: Request, res: Response) => {
const { secretName } = req.params;
- const {
- workspaceId,
- environment,
- type,
- secretPath = "/"
+ const {
+ workspaceId,
+ environment,
+ type,
+ secretPath = "/"
} = req.body;
const { secret } = await SecretService.deleteSecret({
@@ -391,11 +391,11 @@ export const updateSecretByName = async (req: Request, res: Response) => {
*/
export const deleteSecretByName = async (req: Request, res: Response) => {
const { secretName } = req.params;
- const {
- workspaceId,
- environment,
- type,
- secretPath = "/"
+ const {
+ workspaceId,
+ environment,
+ type,
+ secretPath = "/"
} = req.body;
const { secret } = await SecretService.deleteSecret({
diff --git a/backend/src/ee/controllers/v1/organizationsController.ts b/backend/src/ee/controllers/v1/organizationsController.ts
index 2dd212e771..2d2867d71c 100644
--- a/backend/src/ee/controllers/v1/organizationsController.ts
+++ b/backend/src/ee/controllers/v1/organizationsController.ts
@@ -8,8 +8,9 @@ import { EELicenseService } from '../../services';
*/
export const getOrganizationPlan = async (req: Request, res: Response) => {
const { organizationId } = req.params;
+ const workspaceId = req.query.workspaceId as string;
- const plan = await EELicenseService.getOrganizationPlan(organizationId);
+ const plan = await EELicenseService.getPlan(organizationId, workspaceId);
return res.status(200).send({
plan,
diff --git a/backend/src/ee/routes/v1/organizations.ts b/backend/src/ee/routes/v1/organizations.ts
index fd9fd08e94..711b5a17f2 100644
--- a/backend/src/ee/routes/v1/organizations.ts
+++ b/backend/src/ee/routes/v1/organizations.ts
@@ -5,7 +5,7 @@ import {
requireOrganizationAuth,
validateRequest
} from '../../../middleware';
-import { param, body } from 'express-validator';
+import { param, body, query } from 'express-validator';
import { organizationsController } from '../../controllers/v1';
import {
OWNER, ADMIN, MEMBER, ACCEPTED
@@ -21,6 +21,7 @@ router.get(
acceptedStatuses: [ACCEPTED]
}),
param('organizationId').exists().trim(),
+ query('workspaceId').optional().isString(),
validateRequest,
organizationsController.getOrganizationPlan
);
diff --git a/backend/src/ee/services/EELicenseService.ts b/backend/src/ee/services/EELicenseService.ts
index c98a5a449f..89e71e57bd 100644
--- a/backend/src/ee/services/EELicenseService.ts
+++ b/backend/src/ee/services/EELicenseService.ts
@@ -22,13 +22,14 @@ interface FeatureSet {
workspacesUsed: number;
memberLimit: number | null;
membersUsed: number;
+ environmentLimit: number | null;
+ environmentsUsed: number;
secretVersioning: boolean;
pitRecovery: boolean;
rbac: boolean;
customRateLimits: boolean;
customAlerts: boolean;
auditLogs: boolean;
- envLimit?: number | null;
}
/**
@@ -51,13 +52,14 @@ class EELicenseService {
workspacesUsed: 0,
memberLimit: null,
membersUsed: 0,
+ environmentLimit: null,
+ environmentsUsed: 0,
secretVersioning: true,
pitRecovery: true,
rbac: true,
customRateLimits: true,
customAlerts: true,
- auditLogs: false,
- envLimit: null
+ auditLogs: false
}
public localFeatureSet: NodeCache;
@@ -69,10 +71,10 @@ class EELicenseService {
});
}
- public async getOrganizationPlan(organizationId: string): PromiseENVIRONMENT
@@ -235,33 +242,46 @@ const IntegrationTile = ({ isFull />SECRET PATH
+INTEGRATION
-INTEGRATION
+{t('integrations.click-to-start')}
+