Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
chore: resolved personal override bug
=f3a700c0fd27
diff --git a/backend/e2e-test/routes/v1/personal-secret-version-access.spec.ts b/backend/e2e-test/routes/v1/personal-secret-version-access.spec.tsnew file mode 100644index 0000000000..801ca18427--- /dev/null+++ b/backend/e2e-test/routes/v1/personal-secret-version-access.spec.ts@@ -0,0 +1,199 @@+import jwt from "jsonwebtoken";++import {+ AccessScope,+ OrgMembershipRole,+ OrgMembershipStatus,+ ProjectMembershipRole,+ SecretType,+ TableName+} from "@app/db/schemas";+import { seedData1 } from "@app/db/seed-data";+import { getConfig, initEnvConfig } from "@app/lib/config/env";+import { initLogger, logger } from "@app/lib/logger";+import { alphaNumericNanoId } from "@app/lib/nanoid";+import { AuthMethod, AuthTokenType } from "@app/services/auth/auth-type";++const projectId = seedData1.projectV3.id;+const orgId = seedData1.organization.id;+const environment = seedData1.environment.slug;++const SHARED_VALUE = "shared-value";+const PERSONAL_VALUE = "owner-personal-override-value";++const secretKey = `PERSONAL_VERSION_${alphaNumericNanoId(8).toUpperCase()}`;++const ownerHeaders = () => ({ authorization: `Bearer ${jwtAuthToken}` });++let viewerUserId: string;+let viewerSessionId: string;+let viewerJwt: string;+let personalSecretId: string;+let sharedSecretId: string;++const viewerHeaders = () => ({ authorization: `Bearer ${viewerJwt}` });++const createSecret = async (type: SecretType, secretValue: string) => {+ const res = await testServer.inject({+ method: "POST",+ url: `/api/v3/secrets/raw/${secretKey}`,+ headers: ownerHeaders(),+ body: {+ workspaceId: projectId,+ environment,+ secretPath: "/",+ type,+ secretValue+ }+ });+ expect(res.statusCode).toBe(200);+};++const createViewerUser = async () => {+ const username = `personal-version-viewer-${alphaNumericNanoId(8)}@example.com`.toLowerCase();+ const [user] = await testDb(TableName.Users)+ .insert({ username, email: username, isGhost: false, isAccepted: true, authMethods: [AuthMethod.EMAIL] })+ .returning("*");++ const [orgMembership] = await testDb(TableName.Membership)+ .insert({+ scope: AccessScope.Organization,+ scopeOrgId: orgId,+ actorUserId: user.id,+ status: OrgMembershipStatus.Accepted,+ isActive: true+ })+ .returning("*");+ await testDb(TableName.MembershipRole).insert({ membershipId: orgMembership.id, role: OrgMembershipRole.Member });++ const [projectMembership] = await testDb(TableName.Membership)+ .insert({+ scope: AccessScope.Project,+ scopeOrgId: orgId,+ scopeProjectId: projectId,+ actorUserId: user.id+ })+ .returning("*");+ await testDb(TableName.MembershipRole).insert({+ membershipId: projectMembership.id,+ role: ProjectMembershipRole.Viewer+ });++ const [session] = await testDb(TableName.AuthTokenSession)+ .insert({+ userId: user.id,+ ip: "127.0.0.1",+ userAgent: "e2e-personal-version-access",+ accessVersion: 1,+ refreshVersion: 1,+ lastUsed: new Date()+ } as never)+ .returning("*");++ initLogger();+ await initEnvConfig(testHsmService, testKmsRootConfigDAL, testSuperAdminDAL, logger);++ return {+ userId: user.id,+ sessionId: session.id,+ token: jwt.sign(+ {+ authTokenType: AuthTokenType.ACCESS_TOKEN,+ userId: user.id,+ tokenVersionId: session.id,+ authMethod: AuthMethod.EMAIL,+ organizationId: orgId,+ accessVersion: 1+ },+ getConfig().AUTH_SECRET,+ { expiresIn: 3600 }+ )+ };+};++describe("Personal secret override version access", () => {+ beforeAll(async () => {+ await createSecret(SecretType.Shared, SHARED_VALUE);+ await createSecret(SecretType.Personal, PERSONAL_VALUE);++ const secrets = await testDb(TableName.SecretV2).where({ key: secretKey });+ personalSecretId = secrets.find((el) => el.type === SecretType.Personal)!.id;+ sharedSecretId = secrets.find((el) => el.type === SecretType.Shared)!.id;++ const viewer = await createViewerUser();+ viewerUserId = viewer.userId;+ viewerSessionId = viewer.sessionId;+ viewerJwt = viewer.token;+ });++ afterAll(async () => {+ await testDb(TableName.AuthTokenSession).where({ id: viewerSessionId }).del();+ await testDb(TableName.Membership).where({ actorUserId: viewerUserId }).del();+ await testDb(TableName.Users).where({ id: viewerUserId }).del();++ const res = await testServer.inject({+ method: "DELETE",+ url: `/api/v3/secrets/raw/${secretKey}`,+ headers: ownerHeaders(),+ body: { workspaceId: projectId, environment, secretPath: "/" }+ });+ expect(res.statusCode).toBe(200);+ });++ test("another project user cannot list versions of someone else's personal override", async () => {+ const res = await testServer.inject({+ method: "GET",+ url: `/api/v1/dashboard/secret-versions/${personalSecretId}?offset=0&limit=20`,+ headers: viewerHeaders()+ });++ expect(res.statusCode).toBe(403);+ expect(res.payload).not.toContain(PERSONAL_VALUE);+ });++ test("another project user cannot read a version value of someone else's personal override", async () => {+ const res = await testServer.inject({+ method: "GET",+ url: `/api/v1/dashboard/secret-versions/${personalSecretId}/value/1`,+ headers: viewerHeaders()+ });++ expect(res.statusCode).toBe(403);+ expect(res.payload).not.toContain(PERSONAL_VALUE);+ });++ test("another project user cannot reach the personal override through the EE versions route", async () => {+ const res = await testServer.inject({+ method: "GET",+ url: `/api/v1/secret/${personalSecretId}/secret-versions?offset=0&limit=20`,+ headers: viewerHeaders()+ });++ expect(res.statusCode).toBe(403);+ expect(res.payload).not.toContain(PERSONAL_VALUE);+ });++ test("the owner can still read their own personal override version value", async () => {+ const res = await testServer.inject({+ method: "GET",+ url: `/api/v1/dashboard/secret-versions/${personalSecretId}/value/1`,+ headers: ownerHeaders()+ });++ expect(res.statusCode).toBe(200);+ expect(res.json().value).toBe(PERSONAL_VALUE);+ });++ test("shared secret versions remain readable by another project user", async () => {+ const res = await testServer.inject({+ method: "GET",+ url: `/api/v1/dashboard/secret-versions/${sharedSecretId}?offset=0&limit=20`,+ headers: viewerHeaders()+ });++ expect(res.statusCode).toBe(200);+ expect(res.json().secretVersions).toEqual(+ expect.arrayContaining([expect.objectContaining({ secretKey, version: 1 })])+ );+ });+});diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.tsindex 54abdd0555..2685d116d8 100644--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts@@ -622,7 +622,9 @@ export const reshapeBridgeSecret = (rotationId?: string;secretReminderRecipients?: TSecretReminderRecipient[];},- secretValueHidden: boolean+ secretValueHidden: boolean,+ // a personal override is only ever readable by its owner, so unmasking one requires proving who is asking+ actorUserId?: string | null) => ({secretKey: secret.key,secretPath,@@ -658,7 +660,10 @@ export const reshapeBridgeSecret = (secretReminderRecipients: secret.secretReminderRecipients || [],...(secretValueHidden? {- secretValue: secret.type === SecretType.Personal ? secret.value : INFISICAL_SECRET_VALUE_HIDDEN_MASK,+ secretValue:+ secret.type === SecretType.Personal && Boolean(actorUserId) && secret.userId === actorUserId+ ? secret.value+ : INFISICAL_SECRET_VALUE_HIDDEN_MASK,secretValueHidden: true}: {diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.tsindex 2effc24060..3efdbfc5d2 100644--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts@@ -867,7 +867,8 @@ export const secretV2BridgeServiceFactory = ({comment: inputSecret.secretComment || "",secretMetadata: undefined},- secretValueHidden+ secretValueHidden,+ actorId);};@@ -1015,7 +1016,8 @@ export const secretV2BridgeServiceFactory = ({? secretManagerDecryptor({ cipherTextBlob: deletedSecret[0].encryptedComment }).toString(): ""},- secretValueHidden+ secretValueHidden,+ actorId);} catch (err) {// deferred errors aren't return as DatabaseError@@ -1195,7 +1197,8 @@ export const secretV2BridgeServiceFactory = ({? secretManagerDecryptor({ cipherTextBlob: secret.encryptedComment }).toString(): ""},- secretValueHidden+ secretValueHidden,+ userId);});@@ -1535,7 +1538,6 @@ export const secretV2BridgeServiceFactory = ({});const isValueMasked = secretValueHidden && !isPersonalSecret;- const isValueDiscarded = isValueMasked && secret.type !== SecretType.Personal;return reshapeBridgeSecret(projectId,@@ -1550,10 +1552,8 @@ export const secretV2BridgeServiceFactory = ({? secretManagerDecryptor({ cipherTextBlob: el.encryptedValue }).toString(): el.value || ""})),- // reshapeBridgeSecret still surfaces the real plaintext for Personal secrets even when- // masking, so the decrypt is only skippable when the value is certain to be discarded.value:- !isValueDiscarded && secret.encryptedValue+ !isValueMasked && secret.encryptedValue? secretManagerDecryptor({ cipherTextBlob: secret.encryptedValue }).toString(): "",comment: secret.encryptedComment@@ -1888,7 +1888,7 @@ export const secretV2BridgeServiceFactory = ({[`${TableName.SecretV2}.userId` as "userId"]: secretType === SecretType.Personal ? actorId : null}): secretVersionDAL- .findOne({+ .findOneWithSecretTags({folderId,version,type: secretType,@@ -1897,16 +1897,24 @@ export const secretV2BridgeServiceFactory = ({}).then((el) =>el- ? SecretsV2Schema.extend({- tags: z- .object({ slug: z.string(), name: z.string(), id: z.string(), color: z.string() })- .array()- .default([])- .optional()- }).parse({- ...el,- id: el.secretId- })+ ? {+ ...SecretsV2Schema.extend({+ tags: z+ .object({+ slug: z.string(),+ name: z.string(),+ id: z.string(),+ color: z.string().nullable().optional()+ })+ .array()+ .default([])+ .optional()+ }).parse({+ ...el,+ id: el.secretId+ }),+ secretMetadata: undefined+ }: undefined));@@ -2070,16 +2078,13 @@ export const secretV2BridgeServiceFactory = ({path,{...secret,- secretMetadata:- "secretMetadata" in secret- ? secret.secretMetadata?.map((el) => ({- isEncrypted: Boolean(el.encryptedValue),- key: el.key,- value: el.encryptedValue- ? secretManagerDecryptor({ cipherTextBlob: el.encryptedValue }).toString()- : el.value || ""- }))- : undefined,+ secretMetadata: secret.secretMetadata?.map((el) => ({+ isEncrypted: Boolean(el.encryptedValue),+ key: el.key,+ value: el.encryptedValue+ ? secretManagerDecryptor({ cipherTextBlob: el.encryptedValue }).toString()+ : el.value || ""+ })),value: secretValue,comment: secret.encryptedComment? secretManagerDecryptor({ cipherTextBlob: secret.encryptedComment }).toString()@@ -2347,7 +2352,8 @@ export const secretV2BridgeServiceFactory = ({value: el.encryptedValue ? secretManagerDecryptor({ cipherTextBlob: el.encryptedValue }).toString() : "",comment: el.encryptedComment ? secretManagerDecryptor({ cipherTextBlob: el.encryptedComment }).toString() : ""},- secretValueHidden+ secretValueHidden,+ actorId);});};@@ -2847,7 +2853,8 @@ export const secretV2BridgeServiceFactory = ({? secretManagerDecryptor({ cipherTextBlob: el.encryptedComment }).toString(): ""},- secretValueHidden+ secretValueHidden,+ actorId)};});@@ -2986,7 +2993,8 @@ export const secretV2BridgeServiceFactory = ({? secretManagerDecryptor({ cipherTextBlob: el.encryptedComment }).toString(): ""},- secretValueHidden+ secretValueHidden,+ actorId);});} catch (err) {@@ -3045,6 +3053,10 @@ export const secretV2BridgeServiceFactory = ({if (!canRead) throw new ForbiddenRequestError({ message: "You do not have permission to read secret versions" });+ if (secret.type === SecretType.Personal && secret.userId !== actorId) {+ throw new ForbiddenRequestError({ message: "You are not allowed to access this secret" });+ }+const { decryptor: secretManagerDecryptor } = await kmsService.createCipherPairWithDataKey({type: KmsDataKey.SecretManager,projectId: folder.projectId@@ -3085,7 +3097,8 @@ export const secretV2BridgeServiceFactory = ({? secretManagerDecryptor({ cipherTextBlob: el.encryptedComment }).toString(): ""},- secretValueHidden+ secretValueHidden,+ actorId),redactedByActor: el.isRedacted? {diff --git a/backend/src/services/secret-v2-bridge/secret-version-dal.ts b/backend/src/services/secret-v2-bridge/secret-version-dal.tsindex d9de78b0ae..12a772eca7 100644--- a/backend/src/services/secret-v2-bridge/secret-version-dal.ts+++ b/backend/src/services/secret-v2-bridge/secret-version-dal.ts@@ -42,6 +42,58 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {}};+ const findOneWithSecretTags = async (filter: Partial<TSecretVersionsV2>, tx?: Knex) => {+ try {+ const rawDocs = await (tx || db.replicaNode())(TableName.SecretVersionV2)+ // eslint-disable-next-line+ .where(buildFindFilter(filter, TableName.SecretVersionV2))+ .leftJoin(TableName.SecretV2, `${TableName.SecretVersionV2}.secretId`, `${TableName.SecretV2}.id`)+ .leftJoin(+ TableName.SecretV2JnTag,+ `${TableName.SecretV2}.id`,+ `${TableName.SecretV2JnTag}.${TableName.SecretV2}Id`+ )+ .leftJoin(+ TableName.SecretTag,+ `${TableName.SecretV2JnTag}.${TableName.SecretTag}Id`,+ `${TableName.SecretTag}.id`+ )+ .leftJoin(TableName.SecretFolder, `${TableName.SecretV2}.folderId`, `${TableName.SecretFolder}.id`)+ .leftJoin(TableName.Environment, function joinActiveEnvForFolder() {+ this.on(`${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`).andOnNull(+ `${TableName.Environment}.deleteAfter`+ );+ })+ .select(selectAllTableCols(TableName.SecretVersionV2))+ .select(db.ref("projectId").withSchema(TableName.Environment).as("projectId"))+ .select(db.ref("id").withSchema(TableName.SecretTag).as("tagId"))+ .select(db.ref("color").withSchema(TableName.SecretTag).as("tagColor"))+ .select(db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug"));++ const docs = sqlNestRelationships({+ data: rawDocs,+ key: "id",+ parentMapper: (el) => ({ ...SecretVersionsV2Schema.parse(el), projectId: el.projectId }),+ childrenMapper: [+ {+ key: "tagId",+ label: "tags" as const,+ mapper: ({ tagId: id, tagColor: color, tagSlug: slug }) => ({+ id,+ color,+ slug,+ name: slug+ })+ }+ ]+ });++ return docs?.[0];+ } catch (error) {+ throw new DatabaseError({ error, name: "FindOneWithSecretTags" });+ }+ };+const findBySecretId = async (secretId: string, { offset, limit, sort, tx }: TFindOpt<TSecretVersionsV2> = {}) => {try {const query = (tx || db.replicaNode())(TableName.SecretVersionV2)@@ -584,6 +636,7 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {findByIdsWithLatestVersion,findByIdAndPreviousVersion,findOne,+ findOneWithSecretTags,findByParentVersionIds};};