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

Requested changes

Browse Source
This commit is contained in:
Daniel Hougaard
2024-02-17 01:02:30 +01:00
parent 419916ee0c
commit a6e263eded
21 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/db/migrations/20240216154123_ghost_users.ts
View File

@@ -3,30 +3,30 @@ import { Knex } from "knex";
import { ProjectVersion, TableName } from "../schemas";
export async function up(knex: Knex): Promise<void> {
const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "ghost");
const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "isGhost");
const hasProjectVersionColumn = await knex.schema.hasColumn(TableName.Project, "version");
if (!hasGhostUserColumn) {
await knex.schema.alterTable(TableName.Users, (t) => {
t.boolean("ghost").defaultTo(false).notNullable();
t.boolean("isGhost").defaultTo(false).notNullable();
});
}
if (!hasProjectVersionColumn) {
await knex.schema.alterTable(TableName.Project, (t) => {
t.string("version").defaultTo(ProjectVersion.V1).notNullable();
t.text("upgradeStatus").nullable();
t.integer("version").defaultTo(ProjectVersion.V1).notNullable();
t.string("upgradeStatus").nullable();
});
}
}
export async function down(knex: Knex): Promise<void> {
const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "ghost");
const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "isGhost");
const hasProjectVersionColumn = await knex.schema.hasColumn(TableName.Project, "version");
if (hasGhostUserColumn) {
await knex.schema.alterTable(TableName.Users, (t) => {
t.dropColumn("ghost");
t.dropColumn("isGhost");
});
}

4
backend/src/db/schemas/models.ts
View File

@@ -113,8 +113,8 @@ export enum SecretType {
}
export enum ProjectVersion {
V1 = "v1",
V2 = "v2"
V1 = 1,
V2 = 2
}
export enum ProjectUpgradeStatus {

2
backend/src/db/schemas/projects.ts
View File

@@ -15,7 +15,7 @@ export const ProjectsSchema = z.object({
orgId: z.string().uuid(),
createdAt: z.date(),
updatedAt: z.date(),
version: z.string().default("v1"),
version: z.number().default(1),
upgradeStatus: z.string().nullable().optional()
});

2
backend/src/db/schemas/users.ts
View File

@@ -20,7 +20,7 @@ export const UsersSchema = z.object({
devices: z.unknown().nullable().optional(),
createdAt: z.date(),
updatedAt: z.date(),
ghost: z.boolean().default(false)
isGhost: z.boolean().default(false)
});
export type TUsers = z.infer<typeof UsersSchema>;

2
backend/src/ee/services/saml-config/saml-config-service.ts
View File

@@ -339,7 +339,7 @@ export const samlConfigServiceFactory = ({
firstName,
lastName,
authMethods: [AuthMethod.EMAIL],
ghost: false
isGhost: false
},
tx
);

2
backend/src/services/auth/auth-login-service.ts
View File

@@ -275,7 +275,7 @@ export const authLoginServiceFactory = ({ userDAL, tokenService, smtpService }:
if (isOauthSignUpDisabled) throw new BadRequestError({ message: "User signup disabled", name: "Oauth 2 login" });
if (!user) {
user = await userDAL.create({ email, firstName, lastName, authMethods: [authMethod], ghost: false });
user = await userDAL.create({ email, firstName, lastName, authMethods: [authMethod], isGhost: false });
}
const isLinkingRequired = !user?.authMethods?.includes(authMethod);
const isUserCompleted = user.isAccepted;

2
backend/src/services/auth/auth-signup-service.ts
View File

@@ -50,7 +50,7 @@ export const authSignupServiceFactory = ({
throw new Error("Failed to send verification code for complete account");
}
if (!user) {
user = await userDAL.create({ authMethods: [AuthMethod.EMAIL], email, ghost: false });
user = await userDAL.create({ authMethods: [AuthMethod.EMAIL], email, isGhost: false });
}
if (!user) throw new Error("Failed to create user");

6
backend/src/services/org/org-dal.ts
View File

@@ -77,7 +77,7 @@ export const orgDALFactory = (db: TDbClient) => {
db.ref("id").withSchema(TableName.Users).as("userId"),
db.ref("publicKey").withSchema(TableName.UserEncryptionKey)
)
.where({ ghost: false }); // MAKE SURE USER IS NOT A GHOST USER
.where({ isGhost: false }); // MAKE SURE USER IS NOT A GHOST USER
return members.map(({ email, firstName, lastName, userId, publicKey, ...data }) => ({
...data,
user: { email, firstName, lastName, id: userId, publicKey }
@@ -136,7 +136,7 @@ export const orgDALFactory = (db: TDbClient) => {
db.ref("id").withSchema(TableName.Users).as("userId"),
db.ref("publicKey").withSchema(TableName.UserEncryptionKey)
)
.where({ ghost: true });
.where({ isGhost: true });
return member;
} catch (error) {
return null;
@@ -150,7 +150,7 @@ export const orgDALFactory = (db: TDbClient) => {
.join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
.leftJoin(TableName.UserEncryptionKey, `${TableName.UserEncryptionKey}.userId`, `${TableName.Users}.id`)
.select(db.ref("id").withSchema(TableName.Users).as("userId"))
.where({ ghost: true });
.where({ isGhost: true });
return !!member;
} catch (error) {
return false;

4
backend/src/services/org/org-service.ts
View File

@@ -138,7 +138,7 @@ export const orgServiceFactory = ({
const user = await userDAL.create(
{
ghost: true,
isGhost: true,
authMethods: [AuthMethod.EMAIL],
email,
isAccepted: true
@@ -401,7 +401,7 @@ export const orgServiceFactory = ({
email: inviteeEmail,
isAccepted: false,
authMethods: [AuthMethod.EMAIL],
ghost: false
isGhost: false
},
tx
);

2
backend/src/services/project-bot/project-bot-service.ts
View File

@@ -119,7 +119,7 @@ export const projectBotServiceFactory = ({
throw new BadRequestError({ message: "Failed to find project by bot ID" });
}
if (project.version === "v2") {
if (project.version === ProjectVersion.V2) {
throw new BadRequestError({ message: "Failed to set bot active, project has a default bot enabled" });
}

12
backend/src/services/project-membership/project-membership-dal.ts
View File

@@ -24,17 +24,17 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
db.ref("projectId").withSchema(TableName.ProjectMembership),
db.ref("role").withSchema(TableName.ProjectMembership),
db.ref("roleId").withSchema(TableName.ProjectMembership),
db.ref("ghost").withSchema(TableName.Users),
db.ref("isGhost").withSchema(TableName.Users),
db.ref("email").withSchema(TableName.Users),
db.ref("publicKey").withSchema(TableName.UserEncryptionKey),
db.ref("firstName").withSchema(TableName.Users),
db.ref("lastName").withSchema(TableName.Users),
db.ref("id").withSchema(TableName.Users).as("userId")
)
.where({ ghost: false });
return members.map(({ email, firstName, lastName, publicKey, ghost, ...data }) => ({
.where({ isGhost: false });
return members.map(({ email, firstName, lastName, publicKey, isGhost, ...data }) => ({
...data,
user: { email, firstName, lastName, id: data.userId, publicKey, ghost }
user: { email, firstName, lastName, id: data.userId, publicKey, isGhost }
}));
} catch (error) {
throw new DatabaseError({ error, name: "Find all project members" });
@@ -47,7 +47,7 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
.where({ projectId })
.join(TableName.Users, `${TableName.ProjectMembership}.userId`, `${TableName.Users}.id`)
.select(selectAllTableCols(TableName.Users))
.where({ ghost: true })
.where({ isGhost: true })
.first();
return ghostUser;
@@ -72,7 +72,7 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
db.ref("email").withSchema(TableName.Users)
)
.whereIn("email", emails)
.where({ ghost: false });
.where({ isGhost: false });
return members.map(({ userId, email, ...data }) => ({
...data,
user: { id: userId, email }

6
backend/src/services/project-membership/project-membership-service.ts
View File

@@ -16,11 +16,11 @@ import { getConfig } from "@app/lib/config/env";
import { infisicalSymmetricDecrypt } from "@app/lib/crypto/encryption";
import { BadRequestError } from "@app/lib/errors";
import { groupBy } from "@app/lib/fn";
import { createWsMembers } from "@app/lib/project";
import { ActorType } from "../auth/auth-type";
import { TOrgDALFactory } from "../org/org-dal";
import { TProjectDALFactory } from "../project/project-dal";
import { createWsMembers } from "../project/project-fns";
import { TProjectBotDALFactory } from "../project-bot/project-bot-dal";
import { TProjectKeyDALFactory } from "../project-key/project-key-dal";
import { TProjectRoleDALFactory } from "../project-role/project-role-dal";
@@ -320,7 +320,7 @@ export const projectMembershipServiceFactory = ({
const membershipUser = await userDAL.findUserByProjectMembershipId(membershipId);
if (membershipUser?.ghost) {
if (membershipUser?.isGhost) {
throw new BadRequestError({
message: "Unauthorized member update",
name: "Update project membership"
@@ -365,7 +365,7 @@ export const projectMembershipServiceFactory = ({
const member = await userDAL.findUserByProjectMembershipId(membershipId);
if (member?.ghost) {
if (member?.isGhost) {
throw new BadRequestError({
message: "Unauthorized member delete",
name: "Delete project membership"

2
backend/src/services/project/project-dal.ts
View File

@@ -60,7 +60,7 @@ export const projectDALFactory = (db: TDbClient) => {
.where({ projectId })
.join(TableName.Users, `${TableName.ProjectMembership}.userId`, `${TableName.Users}.id`)
.select(selectAllTableCols(TableName.Users))
.where({ ghost: true })
.where({ isGhost: true })
.first();
return ghostUser;
} catch (error) {

2
backend/src/services/super-admin/super-admin-service.ts
View File

@@ -70,7 +70,7 @@ export const superAdminServiceFactory = ({
lastName,
email,
superAdmin: true,
ghost: false,
isGhost: false,
isAccepted: true,
authMethods: [AuthMethod.EMAIL]
},

2
backend/src/services/user/user-dal.ts
View File

@@ -23,7 +23,7 @@ export const userDALFactory = (db: TDbClient) => {
const findUserEncKeyByEmail = async (email: string) => {
try {
return await db(TableName.Users)
.where({ email, ghost: false })
.where({ email, isGhost: false })
.join(TableName.UserEncryptionKey, `${TableName.Users}.id`, `${TableName.UserEncryptionKey}.userId`)
.first();
} catch (error) {

7
frontend/src/components/v2/UpgradeProjectAlert/UpgradeProjectAlert.tsx
View File

@@ -5,6 +5,7 @@ import { useNotificationContext } from "@app/components/context/Notifications/No
import { useProjectPermission } from "@app/context";
import { useGetUpgradeProjectStatus, useUpgradeProject } from "@app/hooks/api";
import { Workspace } from "@app/hooks/api/types";
import { ProjectVersion } from "@app/hooks/api/workspace/types";
import { Alert } from "../Alert";
import { Button } from "../Button";
@@ -55,7 +56,7 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
let interval: NodeJS.Timeout | null = null;
if (membership.role === "admin") {
if (project.version === "v1") {
if (project.version === ProjectVersion.V1) {
getLatestProjectStatus();
}
@@ -72,7 +73,7 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
}
interval = setInterval(() => {
if (project.version === "v1") {
if (project.version === ProjectVersion.V1) {
getLatestProjectStatus();
}
}, 5_000);
@@ -92,7 +93,7 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
(currentStatus === null && statusIsLoading)) &&
projectStatus?.status !== "FAILED";
if (project.version !== "v1") return null;
if (project.version !== ProjectVersion.V1) return null;
if (membership.role !== "admin") return null;
return (

7
frontend/src/hooks/api/workspace/types.ts
View File

@@ -1,9 +1,14 @@
export enum ProjectVersion {
V1 = 1,
V2 = 2
}
export type Workspace = {
__v: number;
id: string;
name: string;
orgId: string;
version: "v1" | "v2";
version: ProjectVersion;
upgradeStatus: string | null;
autoCapitalization: boolean;
environments: WorkspaceEnv[];

5
frontend/src/views/IntegrationsPage/IntegrationsPage.tsx
View File

@@ -17,6 +17,7 @@ import {
useUpdateBotActiveStatus
} from "@app/hooks/api";
import { IntegrationAuth } from "@app/hooks/api/types";
import { ProjectVersion } from "@app/hooks/api/workspace/types";
import { CloudIntegrationSection } from "./components/CloudIntegrationSection";
import { FrameworkIntegrationSection } from "./components/FrameworkIntegrationSection";
@@ -92,7 +93,7 @@ export const IntegrationsPage = withProjectPermission(
isIntegrationsAuthorizedEmpty &&
isIntegrationsEmpty
) {
if (bot?.id && currentWorkspace?.version === "v1")
if (bot?.id && currentWorkspace?.version === ProjectVersion.V1)
updateBotActiveStatusSync({
isActive: false,
botId: bot.id,
@@ -113,7 +114,7 @@ export const IntegrationsPage = withProjectPermission(
if (!selectedCloudIntegration) return;
try {
if (bot && !bot.isActive && currentWorkspace?.version === "v1") {
if (bot && !bot.isActive && currentWorkspace?.version === ProjectVersion.V1) {
const botKey = generateBotKey(bot.publicKey, latestWsKey!);
await updateBotActiveStatus({
workspaceId,

5
frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx
View File

@@ -55,6 +55,7 @@ import {
useUploadWsKey
} from "@app/hooks/api";
import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
import { ProjectVersion } from "@app/hooks/api/workspace/types";
const addMemberFormSchema = z.object({
orgMembershipId: z.string().trim()
@@ -117,14 +118,14 @@ export const MemberListTab = () => {
if (!orgUser) return;
try {
if (currentWorkspace.version === "v1") {
if (currentWorkspace.version === ProjectVersion.V1) {
await addUserToWorkspace({
workspaceId,
userPrivateKey,
decryptKey: wsKey,
members: [{ orgMembershipId, userPublicKey: orgUser.user.publicKey }]
});
} else if (currentWorkspace.version === "v2") {
} else if (currentWorkspace.version === ProjectVersion.V2) {
await addUserToWorkspaceNonE2EE({
projectId: workspaceId,
emails: [orgUser.user.email]

5
frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
View File

@@ -40,6 +40,7 @@ import {
useGetUserWsKey,
useUpdateSecretV3
} from "@app/hooks/api";
import { ProjectVersion } from "@app/hooks/api/workspace/types";
import { FolderBreadCrumbs } from "./components/FolderBreadCrumbs";
import { ProjectIndexSecretsSection } from "./components/ProjectIndexSecretsSection";
@@ -317,7 +318,9 @@ export const SecretOverviewPage = () => {
</p>
</div>
{currentWorkspace?.version === "v1" && <UpgradeProjectAlert project={currentWorkspace} />}
{currentWorkspace?.version === ProjectVersion.V1 && (
<UpgradeProjectAlert project={currentWorkspace} />
)}
<div className="mt-8 flex items-center justify-between">
<FolderBreadCrumbs secretPath={secretPath} onResetSearch={handleResetSearch} />
<div className="w-80">

3
frontend/src/views/Settings/ProjectSettingsPage/components/E2EESection/E2EESection.tsx
View File

@@ -6,6 +6,7 @@ import {
import { Alert, AlertDescription, Checkbox } from "@app/components/v2";
import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
import { useGetUserWsKey, useGetWorkspaceBot, useUpdateBotActiveStatus } from "@app/hooks/api";
import { ProjectVersion } from "@app/hooks/api/workspace/types";
export const E2EESection = () => {
const { currentWorkspace } = useWorkspace();
@@ -78,7 +79,7 @@ export const E2EESection = () => {
if (!currentWorkspace) return null;
return bot && currentWorkspace.version === "v1" ? (
return bot && currentWorkspace.version === ProjectVersion.V1 ? (
<div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
<p className="mb-3 text-xl font-semibold">End-to-End Encryption</p>
<p className="mb-8 text-gray-400">