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
refactor(blind-index): drop the org opt-out and add an org-wide value search
Calvin3db10fbcfda2
diff --git a/backend/e2e-test/routes/v1/insights-secret-value-search.spec.ts b/backend/e2e-test/routes/v1/insights-secret-value-search.spec.tsnew file mode 100644index 0000000000..dc0e74e798--- /dev/null+++ b/backend/e2e-test/routes/v1/insights-secret-value-search.spec.ts@@ -0,0 +1,250 @@+import { createIsolatedOrgAndProject } from "e2e-test/testUtils/fixtures";+import { createFolder } from "e2e-test/testUtils/folders";+import { createSecretV2, deleteSecretV2, updateSecretV2 } from "e2e-test/testUtils/secrets";++const DEV_ENV = "dev";+const PROD_ENV = "prod";++type TFoundSecret = {+ key: string;+ projectId: string;+ projectName: string;+ environment: { name: string; slug: string };+ secretPath: string;+};++const searchByValue = async (secretValue: string, authToken: string) => {+ const res = await testServer.inject({+ method: "POST",+ url: "/api/v1/insights/secrets/search-by-value",+ headers: { authorization: `Bearer ${authToken}` },+ body: { secretValue }+ });+ expect(res.statusCode).toBe(200);+ return res.json().secrets as TFoundSecret[];+};++const at = (secrets: TFoundSecret[]) =>+ secrets.map((s) => `${s.environment.slug}${s.secretPath}${s.key}`).sort();++describe("Finding a secret by its value across an organization", () => {+ let orgId: string;+ let projectId: string;+ let authToken: string;+ let cleanup: () => Promise<void>;++ beforeAll(async () => {+ ({ orgId, projectId, authToken, cleanup } = await createIsolatedOrgAndProject("org-secret-search-e2e"));+ });++ afterAll(async () => {+ await cleanup();+ });++ test("a value that nothing holds is not found", async () => {+ expect(await searchByValue("a-value-no-secret-holds", authToken)).toEqual([]);+ });++ test("a value is found at the one place that holds it", async () => {+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "FINDABLE",+ value: "find-me-please",+ authToken+ });++ const found = await searchByValue("find-me-please", authToken);++ expect(found).toHaveLength(1);+ expect(found[0]).toMatchObject({+ key: "FINDABLE",+ projectId,+ environment: { slug: DEV_ENV },+ secretPath: "/"+ });+ });++ // The question this API exists to answer: a value is believed compromised, so where else is it?+ test("a value copied across environments and folders is found in every one of them", async () => {+ await createFolder({ workspaceId: projectId, environmentSlug: DEV_ENV, secretPath: "/", name: "nested", authToken });++ const shared = "the-same-value-everywhere";+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "COPY_ROOT",+ value: shared,+ authToken+ });+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/nested",+ key: "COPY_NESTED",+ value: shared,+ authToken+ });+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: PROD_ENV,+ secretPath: "/",+ key: "COPY_PROD",+ value: shared,+ authToken+ });++ expect(at(await searchByValue(shared, authToken))).toEqual([+ `${DEV_ENV}/COPY_ROOT`,+ `${DEV_ENV}/nestedCOPY_NESTED`,+ `${PROD_ENV}/COPY_PROD`+ ]);+ });++ test("a near-miss value is not found", async () => {+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "EXACT",+ value: "case-sensitive-value",+ authToken+ });++ expect(await searchByValue("Case-Sensitive-Value", authToken)).toEqual([]);+ expect(await searchByValue("case-sensitive-valu", authToken)).toEqual([]);+ });++ test("a rotated value stops being found and the new one starts", async () => {+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "ROTATES",+ value: "the-old-value",+ authToken+ });+ expect(await searchByValue("the-old-value", authToken)).toHaveLength(1);++ await updateSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "ROTATES",+ value: "the-new-value",+ authToken+ });++ expect(await searchByValue("the-old-value", authToken)).toEqual([]);+ expect(await searchByValue("the-new-value", authToken)).toHaveLength(1);+ });++ // A rename carries no value, so the secret must still be findable by the value it still holds.+ test("renaming a secret does not stop it being found by its value", async () => {+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "BEFORE_RENAME",+ value: "survives-a-rename",+ authToken+ });++ await updateSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "BEFORE_RENAME",+ newKey: "AFTER_RENAME",+ authToken+ });++ const found = await searchByValue("survives-a-rename", authToken);+ expect(found).toHaveLength(1);+ expect(found[0].key).toBe("AFTER_RENAME");+ });++ test("a deleted secret stops being found", async () => {+ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "TEMPORARY",+ value: "here-then-gone",+ authToken+ });+ expect(await searchByValue("here-then-gone", authToken)).toHaveLength(1);++ await deleteSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "TEMPORARY",+ authToken+ });++ expect(await searchByValue("here-then-gone", authToken)).toEqual([]);+ });++ // This is the test the org-scoped index exists for. The project-scoped digest cannot match across+ // projects, so a search that found only the first project would pass every test above and still be+ // broken for the case the feature was built for.+ test("a value held in a second project of the same org is found in both", async () => {+ const shared = `across-projects-${Date.now()}`;++ const secondProjectRes = await testServer.inject({+ method: "POST",+ url: "/api/v1/projects",+ headers: { authorization: `Bearer ${authToken}` },+ body: { projectName: "org-secret-search-e2e-second" }+ });+ expect(secondProjectRes.statusCode).toBe(200);+ const secondProjectId = secondProjectRes.json().project.id as string;++ await createSecretV2({+ workspaceId: projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "IN_FIRST_PROJECT",+ value: shared,+ authToken+ });+ await createSecretV2({+ workspaceId: secondProjectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "IN_SECOND_PROJECT",+ value: shared,+ authToken+ });++ const found = await searchByValue(shared, authToken);++ expect(found.map((f) => f.key).sort()).toEqual(["IN_FIRST_PROJECT", "IN_SECOND_PROJECT"]);+ expect(new Set(found.map((f) => f.projectId))).toEqual(new Set([projectId, secondProjectId]));+ });++ // The org digest is keyed by the org data key, so one org's values must never match another's.+ test("a value held in another organization is not found", async () => {+ const other = await createIsolatedOrgAndProject("org-secret-search-e2e-other");+ try {+ const value = "value-in-a-different-org";+ await createSecretV2({+ workspaceId: other.projectId,+ environmentSlug: DEV_ENV,+ secretPath: "/",+ key: "OTHER_ORG",+ value,+ authToken: other.authToken+ });++ expect(await searchByValue(value, other.authToken)).toHaveLength(1);+ expect(await searchByValue(value, authToken)).toEqual([]);+ expect(other.orgId).not.toBe(orgId);+ } finally {+ await other.cleanup();+ }+ });+});diff --git a/backend/e2e-test/secret-value-org-blind-index.spec.ts b/backend/e2e-test/secret-value-org-blind-index.spec.tsdeleted file mode 100644index 554f7ad718..0000000000--- a/backend/e2e-test/secret-value-org-blind-index.spec.ts+++ /dev/null@@ -1,219 +0,0 @@-import { randomUUID } from "node:crypto";--import { Knex } from "knex";-import { afterAll, beforeAll, describe, expect, test } from "vitest";--import { SecretType, TableName } from "@app/db/schemas";-import { seedData1 } from "@app/db/seed-data";--declare const testDb: Knex;--// The digests are what the feature exists to produce, so these assertions read them straight off the-// row rather than through an API that does not expose them.-type TDigests = { secretValueBlindIndex: string | null; secretValueOrgBlindIndex: string | null };--const readSecretRow = async (secretId: string): Promise<TDigests> => {- const row = await testDb(TableName.SecretV2)- .where({ id: secretId })- .select("secretValueBlindIndex", "secretValueOrgBlindIndex")- .first();- if (!row) throw new Error(`No secrets_v2 row for '${secretId}'`);- return row as TDigests;-};--const readLatestVersionRow = async (secretId: string): Promise<TDigests> => {- const row = await testDb(TableName.SecretVersionV2)- .where({ secretId })- .orderBy("version", "desc")- .select("secretValueBlindIndex", "secretValueOrgBlindIndex")- .first();- if (!row) throw new Error(`No secret_versions_v2 row for secret '${secretId}'`);- return row as TDigests;-};--const createSecret = async (dto: { key: string; value: string }) => {- const res = await testServer.inject({- method: "POST",- url: `/api/v3/secrets/raw/${dto.key}`,- headers: { authorization: `Bearer ${jwtAuthToken}` },- body: {- workspaceId: seedData1.projectV3.id,- environment: seedData1.environment.slug,- type: SecretType.Shared,- secretPath: "/",- secretKey: dto.key,- secretValue: dto.value- }- });- expect(res.statusCode).toBe(200);- return JSON.parse(res.payload).secret as { id: string };-};--const updateSecret = async (dto: { key: string; value: string }) => {- const res = await testServer.inject({- method: "PATCH",- url: `/api/v3/secrets/raw/${dto.key}`,- headers: { authorization: `Bearer ${jwtAuthToken}` },- body: {- workspaceId: seedData1.projectV3.id,- environment: seedData1.environment.slug,- type: SecretType.Shared,- secretPath: "/",- secretValue: dto.value- }- });- expect(res.statusCode).toBe(200);- return JSON.parse(res.payload).secret as { id: string };-};--const deleteSecret = async (key: string) => {- await testServer.inject({- method: "DELETE",- url: `/api/v3/secrets/raw/${key}`,- headers: { authorization: `Bearer ${jwtAuthToken}` },- body: {- workspaceId: seedData1.projectV3.id,- environment: seedData1.environment.slug,- type: SecretType.Shared,- secretPath: "/"- }- });-};--const setOrgBlindIndexEnabled = async (enabled: boolean) =>- testDb(TableName.Organization)- .where({ id: seedData1.organization.id })- .update({ secretValueOrgBlindIndexEnabled: enabled });--describe("secret value org blind index", () => {- const keys: string[] = [];-- const key = (label: string) => {- const name = `ORG_BI_${label}_${randomUUID().slice(0, 8)}`.toUpperCase();- keys.push(name);- return name;- };-- beforeAll(async () => {- await setOrgBlindIndexEnabled(true);- });-- afterAll(async () => {- await Promise.all(keys.map((k) => deleteSecret(k)));- await setOrgBlindIndexEnabled(true);- });-- test("a created secret carries both digests on the secret and its version", async () => {- const name = key("create");- const secret = await createSecret({ key: name, value: "a-value" });-- const [row, version] = await Promise.all([readSecretRow(secret.id), readLatestVersionRow(secret.id)]);-- expect(row.secretValueBlindIndex).toEqual(expect.any(String));- expect(row.secretValueOrgBlindIndex).toEqual(expect.any(String));- expect(version.secretValueBlindIndex).toBe(row.secretValueBlindIndex);- expect(version.secretValueOrgBlindIndex).toBe(row.secretValueOrgBlindIndex);- });-- test("the org digest differs from the project digest for the same value", async () => {- const name = key("distinct");- const secret = await createSecret({ key: name, value: "another-value" });-- const row = await readSecretRow(secret.id);-- expect(row.secretValueOrgBlindIndex).not.toBe(row.secretValueBlindIndex);- });-- test("two secrets holding the same value share both digests", async () => {- const value = `shared-${randomUUID()}`;- const first = await createSecret({ key: key("same_a"), value });- const second = await createSecret({ key: key("same_b"), value });-- const [a, b] = await Promise.all([readSecretRow(first.id), readSecretRow(second.id)]);-- expect(a.secretValueOrgBlindIndex).toBe(b.secretValueOrgBlindIndex);- expect(a.secretValueBlindIndex).toBe(b.secretValueBlindIndex);- });-- test("secrets holding different values get different org digests", async () => {- const first = await createSecret({ key: key("diff_a"), value: `one-${randomUUID()}` });- const second = await createSecret({ key: key("diff_b"), value: `two-${randomUUID()}` });-- const [a, b] = await Promise.all([readSecretRow(first.id), readSecretRow(second.id)]);-- expect(a.secretValueOrgBlindIndex).not.toBe(b.secretValueOrgBlindIndex);- });-- test("an update rewrites both digests", async () => {- const name = key("update");- const created = await createSecret({ key: name, value: "before" });- const before = await readSecretRow(created.id);-- await updateSecret({ key: name, value: "after" });- const after = await readSecretRow(created.id);-- expect(after.secretValueBlindIndex).not.toBe(before.secretValueBlindIndex);- expect(after.secretValueOrgBlindIndex).not.toBe(before.secretValueOrgBlindIndex);- expect(after.secretValueOrgBlindIndex).toEqual(expect.any(String));- });-- // A rename or comment edit carries no value, so knex must leave both digest columns alone rather- // than writing NULL over them. Nulling them silently removes the secret from duplicate detection.- test("an update that carries no value leaves both digests intact", async () => {- const name = key("novalue");- const created = await createSecret({ key: name, value: "keep-me" });- const before = await readSecretRow(created.id);- expect(before.secretValueOrgBlindIndex).toEqual(expect.any(String));-- const res = await testServer.inject({- method: "PATCH",- url: `/api/v3/secrets/raw/${name}`,- headers: { authorization: `Bearer ${jwtAuthToken}` },- body: {- workspaceId: seedData1.projectV3.id,- environment: seedData1.environment.slug,- type: SecretType.Shared,- secretPath: "/",- secretComment: "comment only, no value"- }- });- expect(res.statusCode).toBe(200);-- const after = await readSecretRow(created.id);- expect(after.secretValueBlindIndex).toBe(before.secretValueBlindIndex);- expect(after.secretValueOrgBlindIndex).toBe(before.secretValueOrgBlindIndex);-- const version = await readLatestVersionRow(created.id);- expect(version.secretValueBlindIndex).toBe(before.secretValueBlindIndex);- expect(version.secretValueOrgBlindIndex).toBe(before.secretValueOrgBlindIndex);- });-- test("an org that has opted out gets no org digest on the secret or its version", async () => {- await setOrgBlindIndexEnabled(false);-- const name = key("optout");- const secret = await createSecret({ key: name, value: "not-fingerprinted" });-- const [row, version] = await Promise.all([readSecretRow(secret.id), readLatestVersionRow(secret.id)]);-- expect(row.secretValueBlindIndex).toEqual(expect.any(String));- expect(row.secretValueOrgBlindIndex).toBeNull();- expect(version.secretValueOrgBlindIndex).toBeNull();-- await setOrgBlindIndexEnabled(true);- });-- test("turning the opt-out back off resumes writing the org digest on the next write", async () => {- await setOrgBlindIndexEnabled(false);- const name = key("resume");- const created = await createSecret({ key: name, value: "first" });- const whileOptedOut = await readSecretRow(created.id);- expect(whileOptedOut.secretValueOrgBlindIndex).toBeNull();-- await setOrgBlindIndexEnabled(true);- await updateSecret({ key: name, value: "second" });-- const afterOptIn = await readSecretRow(created.id);- expect(afterOptIn.secretValueOrgBlindIndex).toEqual(expect.any(String));- });-});diff --git a/backend/e2e-test/setup/reset-shared-org-flags.ts b/backend/e2e-test/setup/reset-shared-org-flags.tsindex 557ef53519..e1a53eb483 100644--- a/backend/e2e-test/setup/reset-shared-org-flags.ts+++ b/backend/e2e-test/setup/reset-shared-org-flags.ts@@ -12,7 +12,6 @@ import { seedData1 } from "@app/db/seed-data";// auth-idp-attacks.spec.ts scimEnabled// privilege-boundary-removal.spec.ts shouldUseNewPrivilegeSystem// membership-downgrade-boundary.spec.ts shouldUseNewPrivilegeSystem-// secret-value-org-blind-index.spec.ts secretValueOrgBlindIndexEnabled//// Those afterAll hooks don't run when a file dies hard — a worker OOM or a// file-level timeout — and a leaked flag then breaks every later spec that logs@@ -33,7 +32,6 @@ beforeAll(async () => {enforceMfa: false,authEnforced: false,scimEnabled: false,- shouldUseNewPrivilegeSystem: true,- secretValueOrgBlindIndexEnabled: true+ shouldUseNewPrivilegeSystem: true});});diff --git a/backend/e2e-test/testUtils/insights.ts b/backend/e2e-test/testUtils/insights.tsindex 2312e7015e..0fef6ea21a 100644--- a/backend/e2e-test/testUtils/insights.ts+++ b/backend/e2e-test/testUtils/insights.ts@@ -63,6 +63,7 @@ export const projectScopedInsightsDepStubs: Pick<findStaleByProject: unreachable("secretV2BridgeDAL.findStaleByProject"),countStaleByProject: unreachable("secretV2BridgeDAL.countStaleByProject"),findDuplicatedSecretValues: unreachable("secretV2BridgeDAL.findDuplicatedSecretValues"),+ findSecretsByOrgBlindIndex: unreachable("secretV2BridgeDAL.findSecretsByOrgBlindIndex"),countByProject: unreachable("secretV2BridgeDAL.countByProject")},dynamicSecretDAL: {@@ -75,7 +76,8 @@ export const projectScopedInsightsDepStubs: Pick<getBotKey: unreachable("projectBotService.getBotKey")},projectDAL: {- findById: unreachable("projectDAL.findById")+ findById: unreachable("projectDAL.findById"),+ find: unreachable("projectDAL.find")},userDAL: {find: unreachable("userDAL.find")diff --git a/backend/src/db/migrations/20260923120000_add-secret-value-org-blind-index.ts b/backend/src/db/migrations/20260923120000_add-secret-value-org-blind-index.tsindex 8b4aba2b8e..813302a7a7 100644--- a/backend/src/db/migrations/20260923120000_add-secret-value-org-blind-index.ts+++ b/backend/src/db/migrations/20260923120000_add-secret-value-org-blind-index.ts@@ -22,20 +22,13 @@ export async function up(knex: Knex): Promise<void> {}}- if (await knex.schema.hasTable(TableName.Organization)) {- const hasColumn = await knex.schema.hasColumn(TableName.Organization, "secretValueOrgBlindIndexEnabled");- if (!hasColumn) {- await knex.schema.alterTable(TableName.Organization, (t) => {- t.boolean("secretValueOrgBlindIndexEnabled").defaultTo(true).notNullable();- });- }- }-- await knex.raw(`+ if (await knex.schema.hasTable(TableName.SecretV2)) {+ await knex.raw(`CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_secrets_v2_secret_value_org_blind_indexON ${TableName.SecretV2} ("secretValueOrgBlindIndex")WHERE "secretValueOrgBlindIndex" IS NOT NULL`);+ }}export async function down(knex: Knex): Promise<void> {@@ -58,15 +51,6 @@ export async function down(knex: Knex): Promise<void> {});}}-- if (await knex.schema.hasTable(TableName.Organization)) {- const hasColumn = await knex.schema.hasColumn(TableName.Organization, "secretValueOrgBlindIndexEnabled");- if (hasColumn) {- await knex.schema.alterTable(TableName.Organization, (t) => {- t.dropColumn("secretValueOrgBlindIndexEnabled");- });- }- }}// CONCURRENTLY requires running outside a transactiondiff --git a/backend/src/db/schemas/organizations.ts b/backend/src/db/schemas/organizations.tsindex 3374029e92..54afbf3beb 100644--- a/backend/src/db/schemas/organizations.ts+++ b/backend/src/db/schemas/organizations.ts@@ -43,8 +43,7 @@ export const OrganizationsSchema = z.object({blockDuplicateSecretSyncDestinations: z.boolean().default(false),secretShareBrandConfig: z.unknown().nullable().optional(),defaultCertManagerProjectId: z.string().nullable().optional(),- allowCrossProjectSecretSharing: z.boolean().default(false),- secretValueOrgBlindIndexEnabled: z.boolean().default(true)+ allowCrossProjectSecretSharing: z.boolean().default(false)});export type TOrganizations = z.infer<typeof OrganizationsSchema>;diff --git a/backend/src/ee/routes/v1/insights-router.ts b/backend/src/ee/routes/v1/insights-router.tsindex a87b827f8e..c7429d4c7b 100644--- a/backend/src/ee/routes/v1/insights-router.ts+++ b/backend/src/ee/routes/v1/insights-router.ts@@ -124,6 +124,56 @@ export const registerInsightsRouter = async (server: FastifyZodProvider) => {}});+ // POST rather than GET because the secret value goes in the body. A GET would put it in the URL,+ // where it lands in access logs, proxy logs and browser history.+ server.route({+ method: "POST",+ url: "/secrets/search-by-value",+ config: {+ rateLimit: writeLimit+ },+ onRequest: verifyAuth([AuthMode.JWT]),+ schema: {+ operationId: "searchInsightsSecretsByValue",+ description:+ "Find every secret in the organization whose value matches the one supplied, in projects the caller can read.",+ security: [{ bearerAuth: [] }],+ body: z.object({+ secretValue: z.string().min(1).max(10_000).describe("The secret value to look for.")+ }),+ response: {+ 200: z.object({+ secrets: z+ .object({+ key: z.string(),+ projectId: z.string(),+ projectName: z.string(),+ environment: z.object({ name: z.string(), slug: z.string() }),+ secretPath: z.string()+ })+ .array()+ })+ }+ },+ handler: async (req) => {+ const result = await server.services.insights.findSecretsByValue(+ { secretValue: req.body.secretValue },+ req.permission+ );++ await server.services.auditLog.createAuditLog({+ ...req.auditLogInfo,+ orgId: req.permission.orgId,+ event: {+ type: EventType.SEARCH_INSIGHTS_SECRETS_BY_VALUE,+ metadata: { matchCount: result.secrets.length }+ }+ });++ return result;+ }+ });+server.route({method: "GET",url: "/secrets/projects",diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex 12020e8be9..2a189cf29d 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -708,6 +708,7 @@ export enum EventType {VIEW_INSIGHTS_SECRETS_MANAGEMENT_ACCESS_LOCATIONS = "view-insights-secrets-management-access-locations",VIEW_INSIGHTS_SECRETS_MANAGEMENT_SUMMARY = "view-insights-secrets-management-summary",VIEW_INSIGHTS_SECRETS_DUPLICATION = "view-insights-secrets-duplication",+ SEARCH_INSIGHTS_SECRETS_BY_VALUE = "search-insights-secrets-by-value",VIEW_INSIGHTS_SECRETS_MANAGEMENT_COUNTS = "view-insights-secrets-management-counts",VIEW_INSIGHTS_SECRETS_MANAGEMENT_USAGE = "view-insights-secrets-management-usage",VIEW_INSIGHTS_SECRETS_MANAGEMENT_PROJECT_WARNINGS = "view-insights-secrets-management-project-warnings",@@ -5858,6 +5859,15 @@ interface ViewSecretManagementInsightsSummaryEvent {};}+// The searched value is never recorded, only how many places it was found in. An audit log is read by+// more people than the search itself is run by, so logging the value would widen who learns it.+interface SearchInsightsSecretsByValueEvent {+ type: EventType.SEARCH_INSIGHTS_SECRETS_BY_VALUE;+ metadata: {+ matchCount: number;+ };+}+interface ViewInsightsSecretsDuplicationEvent {type: EventType.VIEW_INSIGHTS_SECRETS_DUPLICATION;metadata: {@@ -8239,6 +8249,7 @@ export type Event =| ViewInsightsAuthMethodsEvent| ViewSecretManagementInsightsSummaryEvent| ViewInsightsSecretsDuplicationEvent+ | SearchInsightsSecretsByValueEvent| ViewSecretManagementInsightsCountsEvent| ViewSecretManagementInsightsUsageEvent| ViewSecretManagementInsightsProjectWarningsEventdiff --git a/backend/src/ee/services/honey-token/honey-token-service.ts b/backend/src/ee/services/honey-token/honey-token-service.tsindex 89829b1ba0..bb32d7d144 100644--- a/backend/src/ee/services/honey-token/honey-token-service.ts+++ b/backend/src/ee/services/honey-token/honey-token-service.ts@@ -91,7 +91,7 @@ export type THoneyTokenServiceFactoryDep = {kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;appConnectionDAL: Pick<TAppConnectionDALFactory, "findById">;appConnectionService: Pick<TAppConnectionServiceFactory, "validateAppConnectionUsageById">;- orgDAL: Pick<TOrgDALFactory, "findOrgMembersByRole" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgMembersByRole">;projectDAL: Pick<TProjectDALFactory, "findById">;smtpService: Pick<TSmtpService, "sendMail">;folderDAL: Pick<@@ -326,7 +326,7 @@ export const honeyTokenServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actor.orgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actor.orgId, kmsService });const secretEntries = Object.entries(secretsMapping).map(([credentialField, secretKey]) => {const credentialValue = honeyTokenCredentials[credentialField];@@ -380,7 +380,7 @@ export const honeyTokenServiceFactory = ({encryptedValue: secretEncryptor({plainText: Buffer.from(value)}).cipherTextBlob,- blindIndexes: await blindIndexer.generate(Buffer.from(value)),+ blindIndexes: await blindIndexer.generateBlindIndexes(Buffer.from(value)),references: []})));@@ -531,7 +531,7 @@ export const honeyTokenServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actor.orgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actor.orgId, kmsService });const secretEntries = Object.entries(nextSecretsMapping).map(([credentialField, secretKey]) => {const credentialValue = decryptedCredentials[credentialField];@@ -564,7 +564,7 @@ export const honeyTokenServiceFactory = ({encryptedValue: secretEncryptor({plainText: Buffer.from(value)}).cipherTextBlob,- blindIndexes: await blindIndexer.generate(Buffer.from(value)),+ blindIndexes: await blindIndexer.generateBlindIndexes(Buffer.from(value)),references: []})));diff --git a/backend/src/ee/services/insights/insights-service.test.ts b/backend/src/ee/services/insights/insights-service.test.tsindex 9925d1e2db..397b33fcb1 100644--- a/backend/src/ee/services/insights/insights-service.test.ts+++ b/backend/src/ee/services/insights/insights-service.test.ts@@ -53,6 +53,7 @@ const projectScopedDepStubs: Pick<findStaleByProject: unreachable("secretV2BridgeDAL.findStaleByProject"),countStaleByProject: unreachable("secretV2BridgeDAL.countStaleByProject"),findDuplicatedSecretValues: unreachable("secretV2BridgeDAL.findDuplicatedSecretValues"),+ findSecretsByOrgBlindIndex: unreachable("secretV2BridgeDAL.findSecretsByOrgBlindIndex"),countByProject: unreachable("secretV2BridgeDAL.countByProject")},dynamicSecretDAL: {@@ -65,7 +66,8 @@ const projectScopedDepStubs: Pick<getBotKey: unreachable("projectBotService.getBotKey")},projectDAL: {- findById: unreachable("projectDAL.findById")+ findById: unreachable("projectDAL.findById"),+ find: unreachable("projectDAL.find")},userDAL: {find: unreachable("userDAL.find")diff --git a/backend/src/ee/services/insights/insights-service.ts b/backend/src/ee/services/insights/insights-service.tsindex 9eca72645f..6121359983 100644--- a/backend/src/ee/services/insights/insights-service.ts+++ b/backend/src/ee/services/insights/insights-service.ts@@ -1,7 +1,7 @@import { ForbiddenError } from "@casl/ability";// import geoip from "geoip-lite";-import { ActionProjectType, IdentityAuthMethod, OrganizationActionScope } from "@app/db/schemas";+import { ActionProjectType, IdentityAuthMethod, OrganizationActionScope, ProjectType } from "@app/db/schemas";import { TClickHouseAuditLogDALFactory } from "@app/ee/services/audit-log/audit-log-clickhouse-dal";import { TAuditLogDALFactory } from "@app/ee/services/audit-log/audit-log-dal";import { TDynamicSecretDALFactory } from "@app/ee/services/dynamic-secret/dynamic-secret-dal";@@ -16,6 +16,7 @@ import { TPermissionServiceFactory } from "@app/ee/services/permission/permissioimport {ProjectPermissionHoneyTokenActions,ProjectPermissionInsightsActions,+ ProjectPermissionSecretActions,ProjectPermissionSub} from "@app/ee/services/permission/project-permission";import { TSecretRotationV2DALFactory } from "@app/ee/services/secret-rotation-v2/secret-rotation-v2-dal";@@ -33,6 +34,7 @@ import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectBotServiceFactory } from "@app/services/project-bot/project-bot-service";import { TReminderDALFactory } from "@app/services/reminder/reminder-dal";import { TSecretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal";+import { createSecretBlindIndexer } from "@app/services/secret-v2-bridge/secret-blind-index-fns";import { containsSecretReference } from "@app/services/secret-v2-bridge/secret-reference-fns";import { TSecretV2BridgeDALFactory } from "@app/services/secret-v2-bridge/secret-v2-bridge-dal";import { TUserDALFactory } from "@app/services/user/user-dal";@@ -51,6 +53,7 @@ import {VALUE_EVENT_TYPES} from "./insights-fns";import {+ TFindSecretsByValueDTO,TGetAccessVolumeDTO,TGetAuthMethodDistributionDTO,TGetInsightsCalendarDTO,@@ -79,12 +82,16 @@ export type TInsightsServiceFactoryDep = {folderDAL: Pick<TSecretFolderDALFactory, "findSecretPathByFolderIds" | "countByProject">;secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory,- "findStaleByProject" | "countStaleByProject" | "findDuplicatedSecretValues" | "countByProject"+ | "findStaleByProject"+ | "countStaleByProject"+ | "findDuplicatedSecretValues"+ | "findSecretsByOrgBlindIndex"+ | "countByProject">;dynamicSecretDAL: Pick<TDynamicSecretDALFactory, "countByProject">;honeyTokenDAL: Pick<THoneyTokenDALFactory, "countByProjectId">;projectBotService: Pick<TProjectBotServiceFactory, "getBotKey">;- projectDAL: Pick<TProjectDALFactory, "findById">;+ projectDAL: Pick<TProjectDALFactory, "findById" | "find">;userDAL: Pick<TUserDALFactory, "find">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;keyStore: Pick<TKeyStoreFactory, "setItemWithExpiry" | "getItem" | "ttl">;@@ -479,6 +486,79 @@ export const insightsServiceFactory = ({});};+ // Answers "is this value in use anywhere in my organization", the question someone asks when they+ // learn a value is compromised. The caller supplies the value, so nothing here reveals a value that+ // was not already known; what it reveals is the locations, which is why each hit is filtered against+ // the actor's permission on the project holding it.+ //+ // Deliberately not gated on the insights entitlement. It only reads, and CODE_QUALITY.md's license+ // rule is that reads are never gated; a customer answering "where else is this leaked credential"+ // should not be blocked on their plan.+ const findSecretsByValue = async (dto: TFindSecretsByValueDTO, actorDto: OrgServiceActor) => {+ const projects = await projectDAL.find({ orgId: actorDto.orgId, type: ProjectType.SecretManager });+ if (!projects.length) return { secrets: [] };++ // Every project in an org shares the org data key, so one indexer answers for all of them.+ const { generateOrgLevelBlindIndex } = await createSecretBlindIndexer({+ projectId: projects[0].id,+ orgId: actorDto.orgId,+ kmsService+ });+ const secretValueOrgBlindIndex = await generateOrgLevelBlindIndex(Buffer.from(dto.secretValue));++ const matches = await secretV2BridgeDAL.findSecretsByOrgBlindIndex(actorDto.orgId, secretValueOrgBlindIndex);+ if (!matches.length) return { secrets: [] };++ const readableProjectIds = new Set<string>();+ await Promise.all(+ [...new Set(matches.map((match) => match.projectId))].map(async (projectId) => {+ try {+ const { permission } = await permissionService.getProjectPermission({+ actor: actorDto.type,+ actorId: actorDto.id,+ projectId,+ actorAuthMethod: actorDto.authMethod,+ actorOrgId: actorDto.orgId,+ actionProjectType: ActionProjectType.SecretManager+ });+ // DescribeSecret, not a read of the value: this answers where a value the caller already has+ // is used, so the permission that matters is whether they may know the secret exists.+ if (permission.can(ProjectPermissionSecretActions.DescribeSecret, ProjectPermissionSub.Secrets)) {+ readableProjectIds.add(projectId);+ }+ } catch {+ // No membership in that project. A value the actor cannot see the location of is simply absent+ // from their results rather than an error, so one inaccessible project does not fail the search.+ }+ })+ );++ const visible = matches.filter((match) => readableProjectIds.has(match.projectId));+ if (!visible.length) return { secrets: [] };++ const pathsByProject = await Promise.all(+ [...new Set(visible.map((match) => match.projectId))].map(async (projectId) => {+ const folderIds = [...new Set(visible.filter((m) => m.projectId === projectId).map((m) => m.folderId))];+ const folders = await folderDAL.findSecretPathByFolderIds(projectId, folderIds);+ return folders;+ })+ );+ const pathByFolderId = new Map<string, string>();+ pathsByProject.flat().forEach((folder) => {+ if (folder) pathByFolderId.set(folder.id, folder.path);+ });++ return {+ secrets: visible.map((match) => ({+ key: match.key,+ projectId: match.projectId,+ projectName: match.projectName,+ environment: { name: match.environmentName, slug: match.environment },+ secretPath: pathByFolderId.get(match.folderId) ?? "/"+ }))+ };+ };+const getSecretsDuplication = async (dto: TGetSecretsDuplicationDTO, actorDto: OrgServiceActor) => {await checkInsightsPermission(permissionService, licenseService, dto.projectId, actorDto);@@ -773,6 +853,7 @@ export const insightsServiceFactory = ({getAuthMethodDistribution,getSummary,getSecretsDuplication,+ findSecretsByValue,getCounts,getSecretsUsageInsights,getSecretsProjects,diff --git a/backend/src/ee/services/insights/insights-types.ts b/backend/src/ee/services/insights/insights-types.tsindex 7af2b9d9a1..30d9f68858 100644--- a/backend/src/ee/services/insights/insights-types.ts+++ b/backend/src/ee/services/insights/insights-types.ts@@ -34,6 +34,10 @@ export type TGetInsightsSummaryDTO = {staleSecretsLimit?: number;};+export type TFindSecretsByValueDTO = {+ secretValue: string;+};+export type TGetSecretsDuplicationDTO = {projectId: string;};diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.tsindex 2a389fc7c9..e2cecef2f0 100644--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts@@ -35,7 +35,6 @@ import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/micimport { TProjectMicrosoftTeamsConfigDALFactory } from "@app/services/microsoft-teams/project-microsoft-teams-config-dal";import { TNotificationServiceFactory } from "@app/services/notification/notification-service";import { NotificationType } from "@app/services/notification/notification-types";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectBotServiceFactory } from "@app/services/project-bot/project-bot-service";import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";@@ -149,7 +148,6 @@ type TSecretApprovalRequestServiceFactoryDep = {"checkProjectUpgradeStatus" | "findById" | "findProjectById" | "findProjectWithOrg">;secretQueueService: Pick<TSecretQueueFactory, "syncSecrets" | "removeSecretReminder">;- orgDAL: Pick<TOrgDALFactory, "findById">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey" | "encryptWithInputKey" | "decryptWithInputKey">;secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory,@@ -201,7 +199,6 @@ export const secretApprovalRequestServiceFactory = ({projectEnvDAL,secretApprovalPolicyDAL,kmsService,- orgDAL,secretV2BridgeDAL,secretVersionV2BridgeDAL,secretVersionTagV2BridgeDAL,@@ -893,7 +890,7 @@ export const secretApprovalRequestServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService });const conflicts: Array<{ secretId: string; op: SecretOperations }> = [];let secretCreationCommits = secretApprovalSecrets.filter(({ op }) => op === SecretOperations.Create);@@ -974,7 +971,7 @@ export const secretApprovalRequestServiceFactory = ({const creationBlindIndexes = await Promise.all(secretCreationCommits.map((el) =>el.encryptedValue- ? blindIndexer.generate(secretManagerDecryptor({ cipherTextBlob: el.encryptedValue }))+ ? blindIndexer.generateBlindIndexes(secretManagerDecryptor({ cipherTextBlob: el.encryptedValue })): Promise.resolve(null)));@@ -1096,7 +1093,9 @@ export const secretApprovalRequestServiceFactory = ({const shouldComputeBlindIndex =!el.secret?.isRotatedSecret && el.encryptedValue !== null && el.encryptedValue !== undefined;return shouldComputeBlindIndex- ? blindIndexer.generate(secretManagerDecryptor({ cipherTextBlob: el.encryptedValue as Buffer }))+ ? blindIndexer.generateBlindIndexes(+ secretManagerDecryptor({ cipherTextBlob: el.encryptedValue as Buffer })+ ): Promise.resolve(null);}));diff --git a/backend/src/ee/services/secret-replication/secret-replication-service.ts b/backend/src/ee/services/secret-replication/secret-replication-service.tsindex f10b33fb7d..9fdbc50852 100644--- a/backend/src/ee/services/secret-replication/secret-replication-service.ts+++ b/backend/src/ee/services/secret-replication/secret-replication-service.ts@@ -94,7 +94,7 @@ type TSecretReplicationServiceFactoryDep = {kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;folderCommitService: Pick<TFolderCommitServiceFactory, "createCommit">;projectFolderGrantDAL: Pick<TProjectFolderGrantDALFactory, "find">;- orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgById">;};export type TSecretReplicationServiceFactory = ReturnType<typeof secretReplicationServiceFactory>;@@ -284,7 +284,7 @@ export const secretReplicationServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId, kmsService });// these are the secrets to be added in replicated foldersconst sourceLocalSecrets = await secretV2BridgeDAL.find({ folderId: folder.id, type: SecretType.Shared });@@ -525,7 +525,9 @@ export const secretReplicationServiceFactory = ({secretMetadata: doc.rawSecretMetadata,references: doc.secretValue ? getAllSecretReferences(doc.secretValue).nestedReferences : [],parentSecretVersionId: sourceSecretLatestVersions[doc.id],- blindIndexes: await blindIndexer.generateOptional(doc.secretValue)+ blindIndexes: await (doc.secretValue+ ? blindIndexer.generateBlindIndexes(Buffer.from(doc.secretValue))+ : null)};}))@@ -559,7 +561,9 @@ export const secretReplicationServiceFactory = ({secretMetadata: doc.rawSecretMetadata,references: doc.secretValue ? getAllSecretReferences(doc.secretValue).nestedReferences : [],parentSecretVersionId: sourceSecretLatestVersions[doc.id],- blindIndexes: await blindIndexer.generateOptional(doc.secretValue)+ blindIndexes: await (doc.secretValue+ ? blindIndexer.generateBlindIndexes(Buffer.from(doc.secretValue))+ : null)}};})diff --git a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.tsindex 362c68f914..2f0ca2a876 100644--- a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts+++ b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts@@ -79,7 +79,6 @@ import { ActorType } from "@app/services/auth/auth-type";import { TFolderCommitServiceFactory } from "@app/services/folder-commit/folder-commit-service";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TProjectBotServiceFactory } from "@app/services/project-bot/project-bot-service";import { TResourceMetadataDALFactory } from "@app/services/resource-metadata/resource-metadata-dal";import { TSecretQueueFactory } from "@app/services/secret/secret-queue";@@ -143,7 +142,6 @@ export type TSecretRotationV2ServiceFactoryDep = {appConnectionService: Pick<TAppConnectionServiceFactory, "validateAppConnectionUsageById">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getOrgPermission">;projectBotService: Pick<TProjectBotServiceFactory, "getBotKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;licenseService: Pick<TLicenseServiceFactory, "getPlan">;auditLogService: Pick<TAuditLogServiceFactory, "createAuditLog">;@@ -235,7 +233,6 @@ export const secretRotationV2ServiceFactory = ({projectBotService,licenseService,kmsService,- orgDAL,auditLogService,secretQueueService,keyStore,@@ -700,7 +697,6 @@ export const secretRotationV2ServiceFactory = ({projectId,orgId: actor.orgId,kmsService,- orgDAL,tx});@@ -710,7 +706,7 @@ export const secretRotationV2ServiceFactory = ({encryptedValue: encryptor({plainText: Buffer.from(value)}).cipherTextBlob,- blindIndexes: await blindIndexer.generate(Buffer.from(value)),+ blindIndexes: await blindIndexer.generateBlindIndexes(Buffer.from(value)),references: []})));@@ -1111,7 +1107,7 @@ export const secretRotationV2ServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actor.orgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actor.orgId, kmsService });const updatedRotation = await secretRotationV2DAL.transaction(async (tx) => {const conflictingRotation = await secretRotationV2DAL.findOne({@@ -1372,7 +1368,6 @@ export const secretRotationV2ServiceFactory = ({projectId,orgId: connection.orgId,kmsService,- orgDAL,tx});@@ -1388,7 +1383,7 @@ export const secretRotationV2ServiceFactory = ({encryptedValue: encryptor({plainText: Buffer.from(value)}).cipherTextBlob,- blindIndexes: await blindIndexer.generate(Buffer.from(value)),+ blindIndexes: await blindIndexer.generateBlindIndexes(Buffer.from(value)),references: []}}))@@ -2102,7 +2097,6 @@ export const secretRotationV2ServiceFactory = ({projectId,orgId: actor.orgId,kmsService,- orgDAL,tx});@@ -2125,7 +2119,7 @@ export const secretRotationV2ServiceFactory = ({encryptedValue: encryptor({plainText: passwordBuffer}).cipherTextBlob,- blindIndexes: await blindIndexer.generate(passwordBuffer),+ blindIndexes: await blindIndexer.generateBlindIndexes(passwordBuffer),references: []}}diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 2ca8df1347..7898b66f38 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -2471,7 +2471,6 @@ export const registerRoutes = async (secretVersionTagDAL,secretQueueService,kmsService,- orgDAL,secretV2BridgeDAL,secretApprovalPolicyDAL,secretVersionV2BridgeDAL,@@ -2531,7 +2530,6 @@ export const registerRoutes = async (secretApprovalPolicyService,secretV2BridgeDAL,kmsService,- orgDAL,secretVersionDAL: secretVersionV2BridgeDAL,secretTagDAL,secretVersionTagDAL: secretVersionTagV2BridgeDAL,@@ -3121,7 +3119,6 @@ export const registerRoutes = async (projectService,smtpService,kmsService,- orgDAL,projectEnvDAL,secretVersionDAL: secretVersionV2BridgeDAL,secretTagDAL,@@ -3331,7 +3328,6 @@ export const registerRoutes = async (projectBotService,licenseService,kmsService,- orgDAL,auditLogService,secretV2BridgeDAL,secretTagDAL,diff --git a/backend/src/server/routes/v1/organization-router.ts b/backend/src/server/routes/v1/organization-router.tsindex aaed6f067c..2e96bf6b99 100644--- a/backend/src/server/routes/v1/organization-router.ts+++ b/backend/src/server/routes/v1/organization-router.ts@@ -431,12 +431,6 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {.boolean().optional().describe("Allow secret imports and references to target secrets in other projects within the organization"),- secretValueOrgBlindIndexEnabled: z- .boolean()- .optional()- .describe(- "Fingerprint secret values with an organization-scoped key so identical values can be matched across projects"- ),secretShareBrandConfig: z.object({primaryColor: zdiff --git a/backend/src/services/external-migration/external-migration-fns/envkey.ts b/backend/src/services/external-migration/external-migration-fns/envkey.tsindex 625232cb73..ffdf80e9c0 100644--- a/backend/src/services/external-migration/external-migration-fns/envkey.ts+++ b/backend/src/services/external-migration/external-migration-fns/envkey.ts@@ -5,7 +5,6 @@ import tweetnaclUtil from "tweetnacl-util";import { crypto } from "@app/lib/crypto/cryptography";import { BadRequestError } from "@app/lib/errors";import { logger } from "@app/lib/logger";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TFolderCommitServiceFactory } from "../../folder-commit/folder-commit-service";import { TKmsServiceFactory } from "../../kms/kms-service";@@ -27,7 +26,6 @@ export type TImportDataIntoInfisicalDTO = {projectDAL: Pick<TProjectDALFactory, "transaction">;projectEnvDAL: Pick<TProjectEnvDALFactory, "find" | "findLastEnvPosition" | "create" | "findOne">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;secretDAL: Pick<TSecretV2BridgeDALFactory, "insertMany" | "upsertSecretReferences" | "findBySecretKeys" | "find">;secretVersionDAL: Pick<TSecretVersionV2DALFactory, "insertMany" | "create">;diff --git a/backend/src/services/external-migration/external-migration-fns/import.ts b/backend/src/services/external-migration/external-migration-fns/import.tsindex 0fe6546248..7307721d7b 100644--- a/backend/src/services/external-migration/external-migration-fns/import.ts+++ b/backend/src/services/external-migration/external-migration-fns/import.ts@@ -19,7 +19,6 @@ export const importDataIntoInfisicalFn = async ({projectDAL,secretDAL,kmsService,- orgDAL,secretVersionDAL,secretTagDAL,secretVersionTagDAL,@@ -306,7 +305,6 @@ export const importDataIntoInfisicalFn = async ({projectId: selectedProjectId,orgId: actorOrgId,kmsService,- orgDAL,tx});@@ -335,7 +333,9 @@ export const importDataIntoInfisicalFn = async ({encryptedValue: el.secretValue? secretManagerEncrypt({ plainText: Buffer.from(el.secretValue) }).cipherTextBlob: undefined,- blindIndexes: await blindIndexer.generateOptional(el.secretValue),+ blindIndexes: await (el.secretValue+ ? blindIndexer.generateBlindIndexes(Buffer.from(el.secretValue))+ : null),key: el.secretKey,references,type: SecretType.Shareddiff --git a/backend/src/services/external-migration/external-migration-queue.ts b/backend/src/services/external-migration/external-migration-queue.tsindex 8721491087..a5aa5870a6 100644--- a/backend/src/services/external-migration/external-migration-queue.ts+++ b/backend/src/services/external-migration/external-migration-queue.ts@@ -8,7 +8,6 @@ import { crypto } from "@app/lib/crypto/cryptography";import { logger } from "@app/lib/logger";import { recordLegacyRootKeyUsageMetric } from "@app/lib/telemetry/metrics";import { QueueJobs, QueueName, TQueueServiceFactory } from "@app/queue";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TFolderCommitServiceFactory } from "../folder-commit/folder-commit-service";import { TKmsServiceFactory } from "../kms/kms-service";@@ -43,7 +42,6 @@ export type TExternalMigrationQueueFactoryDep = {projectDAL: Pick<TProjectDALFactory, "transaction">;projectEnvDAL: Pick<TProjectEnvDALFactory, "find" | "findLastEnvPosition" | "create" | "findOne">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;secretDAL: Pick<TSecretV2BridgeDALFactory, "insertMany" | "upsertSecretReferences" | "findBySecretKeys" | "find">;secretVersionDAL: Pick<TSecretVersionV2DALFactory, "insertMany" | "create">;@@ -73,7 +71,6 @@ export const externalMigrationQueueFactory = ({projectEnvService,secretV2BridgeService,kmsService,- orgDAL,projectEnvDAL,secretDAL,secretVersionDAL,@@ -155,7 +152,6 @@ export const externalMigrationQueueFactory = ({secretVersionTagDAL,folderDAL,kmsService,- orgDAL,projectService,projectEnvService,secretV2BridgeService,diff --git a/backend/src/services/org/org-schema.ts b/backend/src/services/org/org-schema.tsindex 1699c9df79..545d364d26 100644--- a/backend/src/services/org/org-schema.ts+++ b/backend/src/services/org/org-schema.ts@@ -31,7 +31,6 @@ export const sanitizedOrganizationSchema = OrganizationsSchema.pick({maxSharedSecretViewLimit: true,blockDuplicateSecretSyncDestinations: true,allowCrossProjectSecretSharing: true,- secretValueOrgBlindIndexEnabled: true,rootOrgId: true,parentOrgId: true,secretShareBrandConfig: truediff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.tsindex dc63160d8e..7bf1c1d059 100644--- a/backend/src/services/org/org-service.ts+++ b/backend/src/services/org/org-service.ts@@ -459,7 +459,6 @@ export const orgServiceFactory = ({maxSharedSecretViewLimit,blockDuplicateSecretSyncDestinations,allowCrossProjectSecretSharing,- secretValueOrgBlindIndexEnabled,secretShareBrandConfig}}: TUpdateOrgDTO) => {@@ -665,7 +664,6 @@ export const orgServiceFactory = ({maxSharedSecretViewLimit,blockDuplicateSecretSyncDestinations,allowCrossProjectSecretSharing,- secretValueOrgBlindIndexEnabled,secretShareBrandConfig});if (!org) throw new NotFoundError({ message: `Organization with ID '${orgId}' not found` });diff --git a/backend/src/services/org/org-types.ts b/backend/src/services/org/org-types.tsindex badce00d09..cad5ea20ce 100644--- a/backend/src/services/org/org-types.ts+++ b/backend/src/services/org/org-types.ts@@ -90,7 +90,6 @@ export type TUpdateOrgDTO = {maxSharedSecretViewLimit: number | null;blockDuplicateSecretSyncDestinations: boolean;allowCrossProjectSecretSharing: boolean;- secretValueOrgBlindIndexEnabled: boolean;secretShareBrandConfig: TSecretShareBrandConfig;}>;} & TOrgPermission;diff --git a/backend/src/services/project/project-queue.ts b/backend/src/services/project/project-queue.tsindex 58b56686f7..457b241dcc 100644--- a/backend/src/services/project/project-queue.ts+++ b/backend/src/services/project/project-queue.ts@@ -76,7 +76,7 @@ type TProjectQueueFactoryDep = {TProjectDALFactory,"findOne" | "transaction" | "updateById" | "setProjectUpgradeStatus" | "find" | "findById">;- orgDAL: Pick<TOrgDALFactory, "findMembership" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findMembership">;membershipUserDAL: TMembershipUserDALFactory;membershipRoleDAL: TMembershipRoleDALFactory;};@@ -701,7 +701,7 @@ export const projectQueueFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: project.orgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: project.orgId, kmsService });let totalProcessed = 0;@@ -715,7 +715,7 @@ export const projectQueueFactory = ({for (const secret of secrets) {if (secret.encryptedValue) {const decryptedValue = decryptor({ cipherTextBlob: secret.encryptedValue });- const blindIndexes = await blindIndexer.generate(decryptedValue);+ const blindIndexes = await blindIndexer.generateBlindIndexes(decryptedValue);updates.push({ id: secret.id, ...blindIndexes });}}diff --git a/backend/src/services/secret-folder/secret-folder-service.ts b/backend/src/services/secret-folder/secret-folder-service.tsindex a1cc9bf7c4..c768b0bb01 100644--- a/backend/src/services/secret-folder/secret-folder-service.ts+++ b/backend/src/services/secret-folder/secret-folder-service.ts@@ -21,7 +21,6 @@ import { OrderByDirection, OrgServiceActor } from "@app/lib/types";import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";import { ActorType } from "@app/services/auth/auth-type";import { TKmsServiceFactory } from "@app/services/kms/kms-service";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TSecretQueueFactory } from "@app/services/secret/secret-queue";import { SecretsOrderBy } from "@app/services/secret/secret-types";import {@@ -101,7 +100,6 @@ type TSecretFolderServiceFactoryDep = {| "invalidateSecretCacheByProjectId">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;secretVersionDAL: Pick<TSecretVersionV2DALFactory, "insertMany" | "findLatestVersionMany">;secretTagDAL: Pick<TSecretTagDALFactory, "saveTagsToSecretV2" | "deleteTagsToSecretV2" | "find">;secretVersionTagDAL: Pick<TSecretVersionV2TagDALFactory, "insertMany">;@@ -136,7 +134,6 @@ export const secretFolderServiceFactory = ({secretApprovalPolicyService,secretV2BridgeDAL,kmsService,- orgDAL,secretVersionDAL,secretTagDAL,secretVersionTagDAL,@@ -1983,7 +1980,6 @@ export const secretFolderServiceFactory = ({tx,permissionService,kmsService,- orgDAL,folderDAL,secretDAL: secretV2BridgeDAL,secretVersionDAL,diff --git a/backend/src/services/secret-sync/secret-sync-queue.ts b/backend/src/services/secret-sync/secret-sync-queue.tsindex 3c7b182044..ded81b5d6b 100644--- a/backend/src/services/secret-sync/secret-sync-queue.ts+++ b/backend/src/services/secret-sync/secret-sync-queue.ts@@ -136,7 +136,7 @@ type TSecretSyncQueueFactoryDep = {microsoftTeamsService: Pick<TMicrosoftTeamsServiceFactory, "sendNotification">;telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;projectFolderGrantDAL: Pick<TProjectFolderGrantDALFactory, "find">;- orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgById">;};type SecretSyncActionJob = Job<@@ -218,7 +218,6 @@ export const secretSyncQueueFactory = ({secretVersionTagDAL,folderDAL,kmsService,- orgDAL,secretVersionV2BridgeDAL,secretV2BridgeDAL,secretVersionTagV2BridgeDAL,@@ -236,7 +235,6 @@ export const secretSyncQueueFactory = ({secretVersionTagDAL,folderDAL,kmsService,- orgDAL,secretVersionV2BridgeDAL,secretV2BridgeDAL,secretVersionTagV2BridgeDAL,diff --git a/backend/src/services/secret-v2-bridge/secret-blind-index-fns.test.ts b/backend/src/services/secret-v2-bridge/secret-blind-index-fns.test.tsindex d7e7c1f7ae..b8bd963c51 100644--- a/backend/src/services/secret-v2-bridge/secret-blind-index-fns.test.ts+++ b/backend/src/services/secret-v2-bridge/secret-blind-index-fns.test.ts@@ -14,111 +14,69 @@ const makeKmsService = () => ({}))});-const makeOrgDAL = (secretValueOrgBlindIndexEnabled: boolean) => ({- findById: vi.fn(async () => ({ id: ORG_ID, secretValueOrgBlindIndexEnabled }))-});+const makeIndexer = (kmsService = makeKmsService()) =>+ createSecretBlindIndexer({ projectId: PROJECT_ID, orgId: ORG_ID, kmsService: kmsService as never });describe("createSecretBlindIndexer", () => {- it("returns both digests when the org has the index enabled", async () => {- const indexer = await createSecretBlindIndexer({- projectId: PROJECT_ID,- orgId: ORG_ID,- kmsService: makeKmsService() as never,- orgDAL: makeOrgDAL(true) as never- });+ it("derives the project index from the project data key and the org index from the org data key", async () => {+ const indexer = await makeIndexer();- await expect(indexer.generate(Buffer.from("hunter2"))).resolves.toEqual({+ await expect(indexer.generateBlindIndexes(Buffer.from("hunter2"))).resolves.toEqual({secretValueBlindIndex: "project:hunter2",secretValueOrgBlindIndex: "org:hunter2"});});- it("returns a null org digest when the org has opted out", async () => {- const indexer = await createSecretBlindIndexer({- projectId: PROJECT_ID,- orgId: ORG_ID,- kmsService: makeKmsService() as never,- orgDAL: makeOrgDAL(false) as never- });+ it("gives the same value a different digest at each scope", async () => {+ const indexer = await makeIndexer();- await expect(indexer.generate(Buffer.from("hunter2"))).resolves.toEqual({- secretValueBlindIndex: "project:hunter2",- secretValueOrgBlindIndex: null- });+ const projectIndex = await indexer.generateProjectLevelBlindIndex(Buffer.from("hunter2"));+ const orgIndex = await indexer.generateOrgLevelBlindIndex(Buffer.from("hunter2"));++ expect(projectIndex).not.toBe(orgIndex);});- it("does not resolve the org data key at all when the org has opted out", async () => {- const kmsService = makeKmsService();+ it("gives the same value the same digest every time, so two secrets sharing a value match", async () => {+ const indexer = await makeIndexer();- await createSecretBlindIndexer({- projectId: PROJECT_ID,- orgId: ORG_ID,- kmsService: kmsService as never,- orgDAL: makeOrgDAL(false) as never- });+ const first = await indexer.generateOrgLevelBlindIndex(Buffer.from("shared"));+ const second = await indexer.generateOrgLevelBlindIndex(Buffer.from("shared"));- expect(kmsService.createCipherPairWithDataKey).toHaveBeenCalledTimes(1);- expect(kmsService.createCipherPairWithDataKey).not.toHaveBeenCalledWith(- expect.objectContaining({ type: KmsDataKey.Organization }),- expect.anything()- );+ expect(first).toBe(second);});- it("builds each cipher pair once no matter how many values it indexes", async () => {- const kmsService = makeKmsService();- const indexer = await createSecretBlindIndexer({- projectId: PROJECT_ID,- orgId: ORG_ID,- kmsService: kmsService as never,- orgDAL: makeOrgDAL(true) as never- });+ it("gives different values different digests", async () => {+ const indexer = await makeIndexer();- await Promise.all(["a", "b", "c", "d"].map((value) => indexer.generate(Buffer.from(value))));+ const first = await indexer.generateOrgLevelBlindIndex(Buffer.from("one"));+ const second = await indexer.generateOrgLevelBlindIndex(Buffer.from("two"));- expect(kmsService.createCipherPairWithDataKey).toHaveBeenCalledTimes(2);+ expect(first).not.toBe(second);});- it("returns null for a secret with no value rather than hashing an empty buffer", async () => {- const indexer = await createSecretBlindIndexer({- projectId: PROJECT_ID,- orgId: ORG_ID,- kmsService: makeKmsService() as never,- orgDAL: makeOrgDAL(true) as never- });-- await expect(indexer.generateOptional(undefined)).resolves.toBeNull();- await expect(indexer.generateOptional(null)).resolves.toBeNull();- });+ // A bulk write can carry thousands of values, and each data key resolution can be a round trip to an+ // external KMS, so the pairs are built once for the request rather than once per value.+ it("resolves each data key once no matter how many values it indexes", async () => {+ const kmsService = makeKmsService();+ const indexer = await makeIndexer(kmsService);- // The call sites this replaced all gated on truthiness (`el.secretValue ? generate(...) : null`),- // and encryptedValue is still gated that way, so an empty value must produce no digest. Hashing it- // would collide every empty secret in the org on one digest and leave a row with a digest but no- // encrypted value.- it("treats an empty value as no value", async () => {- const indexer = await createSecretBlindIndexer({- projectId: PROJECT_ID,- orgId: ORG_ID,- kmsService: makeKmsService() as never,- orgDAL: makeOrgDAL(true) as never- });+ await Promise.all(["a", "b", "c", "d"].map((value) => indexer.generateBlindIndexes(Buffer.from(value))));- await expect(indexer.generateOptional("")).resolves.toBeNull();+ expect(kmsService.createCipherPairWithDataKey).toHaveBeenCalledTimes(2);});- it("threads the transaction into both the org lookup and the key resolution", async () => {+ it("threads the transaction into both key resolutions", async () => {const kmsService = makeKmsService();- const orgDAL = makeOrgDAL(true);const tx = { marker: "tx" };await createSecretBlindIndexer({projectId: PROJECT_ID,orgId: ORG_ID,kmsService: kmsService as never,- orgDAL: orgDAL as never,tx: tx as never});- expect(orgDAL.findById).toHaveBeenCalledWith(ORG_ID, tx);expect(kmsService.createCipherPairWithDataKey).toHaveBeenCalledWith(expect.anything(), tx);+ expect(kmsService.createCipherPairWithDataKey).toHaveBeenCalledTimes(2);});});diff --git a/backend/src/services/secret-v2-bridge/secret-blind-index-fns.ts b/backend/src/services/secret-v2-bridge/secret-blind-index-fns.tsindex e734a5ae7f..9b08429e49 100644--- a/backend/src/services/secret-v2-bridge/secret-blind-index-fns.ts+++ b/backend/src/services/secret-v2-bridge/secret-blind-index-fns.ts@@ -1,25 +1,23 @@import { Knex } from "knex";-import { NotFoundError } from "@app/lib/errors";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";-import { TOrgDALFactory } from "@app/services/org/org-dal";export type TSecretValueBlindIndexes = {secretValueBlindIndex: string;- secretValueOrgBlindIndex: string | null;+ secretValueOrgBlindIndex: string;};export type TSecretBlindIndexer = {- generate: (secretValue: Buffer) => Promise<TSecretValueBlindIndexes>;- generateOptional: (secretValue?: string | null) => Promise<TSecretValueBlindIndexes | null>;+ generateProjectLevelBlindIndex: (secretValue: Buffer) => Promise<string>;+ generateOrgLevelBlindIndex: (secretValue: Buffer) => Promise<string>;+ generateBlindIndexes: (secretValue: Buffer) => Promise<TSecretValueBlindIndexes>;};export type TCreateSecretBlindIndexerDTO = {projectId: string;orgId: string;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;tx?: Knex;};@@ -30,33 +28,26 @@ export const createSecretBlindIndexer = async ({projectId,orgId,kmsService,- orgDAL,tx}: TCreateSecretBlindIndexerDTO): Promise<TSecretBlindIndexer> => {- const [projectCipher, org] = await Promise.all([+ const [projectCipher, orgCipher] = await Promise.all([kmsService.createCipherPairWithDataKey({ type: KmsDataKey.SecretManager, projectId }, tx),- orgDAL.findById(orgId, tx)+ kmsService.createCipherPairWithDataKey({ type: KmsDataKey.Organization, orgId }, tx)]);- if (!org) throw new NotFoundError({ message: `Organization with ID '${orgId}' not found` });-- const orgCipher = org.secretValueOrgBlindIndexEnabled- ? await kmsService.createCipherPairWithDataKey({ type: KmsDataKey.Organization, orgId }, tx)- : null;-- const generate = async (secretValue: Buffer): Promise<TSecretValueBlindIndexes> => {- const [secretValueBlindIndex, secretValueOrgBlindIndex] = await Promise.all([- projectCipher.generateSecretBlindIndex(secretValue),- orgCipher ? orgCipher.generateSecretBlindIndex(secretValue) : Promise.resolve(null)- ]);-- return { secretValueBlindIndex, secretValueOrgBlindIndex };- };+ const generateProjectLevelBlindIndex = (secretValue: Buffer) => projectCipher.generateSecretBlindIndex(secretValue);+ const generateOrgLevelBlindIndex = (secretValue: Buffer) => orgCipher.generateSecretBlindIndex(secretValue);return {- generate,- // Falsy rather than nullish on purpose: encryptedValue is gated the same way at every call site,- // so an empty value must not get a digest the encrypted column has no counterpart for.- generateOptional: async (secretValue?: string | null) => (secretValue ? generate(Buffer.from(secretValue)) : null)+ generateProjectLevelBlindIndex,+ generateOrgLevelBlindIndex,+ generateBlindIndexes: async (secretValue: Buffer) => {+ const [secretValueBlindIndex, secretValueOrgBlindIndex] = await Promise.all([+ generateProjectLevelBlindIndex(secretValue),+ generateOrgLevelBlindIndex(secretValue)+ ]);++ return { secretValueBlindIndex, secretValueOrgBlindIndex };+ }};};diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.tsindex 2e7a2f40cb..de11bc1564 100644--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts@@ -1500,6 +1500,33 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {}};+ // Finds every secret in the org whose value hashes to the given org-scoped digest. The caller is+ // responsible for dropping the projects the actor cannot read before returning anything.+ const findSecretsByOrgBlindIndex = async (orgId: string, secretValueOrgBlindIndex: string, tx?: Knex) => {+ try {+ return await (tx || db.replicaNode())(TableName.SecretV2)+ .join(TableName.SecretFolder, `${TableName.SecretV2}.folderId`, `${TableName.SecretFolder}.id`)+ .join(TableName.Environment, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)+ .join(TableName.Project, `${TableName.Environment}.projectId`, `${TableName.Project}.id`)+ .where(`${TableName.Project}.orgId`, orgId)+ .where(`${TableName.SecretV2}.secretValueOrgBlindIndex`, secretValueOrgBlindIndex)+ .whereNull(`${TableName.Environment}.deleteAfter`)+ .whereNull(`${TableName.Project}.deleteAfter`)+ .whereNull(`${TableName.SecretV2}.userId`)+ .select(+ db.ref("id").withSchema(TableName.SecretV2),+ db.ref("key").withSchema(TableName.SecretV2),+ db.ref("folderId").withSchema(TableName.SecretV2),+ db.ref("slug").withSchema(TableName.Environment).as("environment"),+ db.ref("name").withSchema(TableName.Environment).as("environmentName"),+ db.ref("id").withSchema(TableName.Project).as("projectId"),+ db.ref("name").withSchema(TableName.Project).as("projectName")+ );+ } catch (error) {+ throw new DatabaseError({ error, name: "findSecretsByOrgBlindIndex" });+ }+ };+const findDuplicatedSecretValues = async (projectId: string, tx?: Knex) => {try {const duplicateBlindIndexes = (tx || db.replicaNode())(TableName.SecretV2)@@ -1699,6 +1726,7 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {countByProject,findValueValidationCandidatesByProject,findDuplicatedSecretValues,+ findSecretsByOrgBlindIndex,findExistingSecretsByBlindIndexes,findOne,find,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 c2ea6fd3a9..c6a9905af5 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@@ -811,7 +811,7 @@ export const fnUpdateSecretLinkedReferences = async ({if (newValue !== originalValue) {const newValueBuffer = Buffer.from(newValue);const newEncryptedValue = encryptor({ plainText: newValueBuffer }).cipherTextBlob;- const newBlindIndexes = await blindIndexer.generate(newValueBuffer);+ const newBlindIndexes = await blindIndexer.generateBlindIndexes(newValueBuffer);// Update secret with version incrementconst updatedSecret = await secretDAL.updateById(@@ -1010,7 +1010,7 @@ export const fnUpdateMovedSecretReferences = async ({if (newValue !== originalValue) {const newValueBuffer = Buffer.from(newValue);const newEncryptedValue = encryptor({ plainText: newValueBuffer }).cipherTextBlob;- const newBlindIndexes = await blindIndexer.generate(newValueBuffer);+ const newBlindIndexes = await blindIndexer.generateBlindIndexes(newValueBuffer);// Update secret with version increment - use $incr to properly increment versionconst updatedSecret = await secretDAL.updateById(@@ -1078,7 +1078,7 @@ export const fnUpdateMovedSecretReferences = async ({if (newValue !== originalValue) {const newValueBuffer = Buffer.from(newValue);const newEncryptedValue = encryptor({ plainText: newValueBuffer }).cipherTextBlob;- const newBlindIndexes = await blindIndexer.generate(newValueBuffer);+ const newBlindIndexes = await blindIndexer.generateBlindIndexes(newValueBuffer);// Update secret with version incrementconst updatedSecret = await secretDAL.updateById(@@ -1132,7 +1132,7 @@ export const fnUpdateMovedSecretReferences = async ({if (newValue !== originalValue) {const newValueBuffer = Buffer.from(newValue);const newEncryptedValue = encryptor({ plainText: newValueBuffer }).cipherTextBlob;- const newBlindIndexes = await blindIndexer.generate(newValueBuffer);+ const newBlindIndexes = await blindIndexer.generateBlindIndexes(newValueBuffer);// Update secret with version incrementconst updatedSecret = await secretDAL.updateById(@@ -1213,7 +1213,7 @@ export const fnUpdateMovedSecretReferences = async ({if (valueChanged) {const newValueBuffer = Buffer.from(updatedValue);const newEncryptedValue = encryptor({ plainText: newValueBuffer }).cipherTextBlob;- const newBlindIndexes = await blindIndexer.generate(newValueBuffer);+ const newBlindIndexes = await blindIndexer.generateBlindIndexes(newValueBuffer);// Update secret with version incrementconst updatedSecret = await secretDAL.updateById(@@ -1523,7 +1523,6 @@ export const fnSecretMove = async (dto: TFnSecretMove): Promise<TFnSecretMoveRespermission,tx,kmsService,- orgDAL,folderDAL,secretDAL,secretVersionDAL,@@ -1620,7 +1619,7 @@ export const fnSecretMove = async (dto: TFnSecretMove): Promise<TFnSecretMoveRestype: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService, orgDAL, tx });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService, tx });const decryptedSourceSecrets = sourceSecrets.map((secret) => ({...secret,value: secret.encryptedValue@@ -1813,7 +1812,7 @@ export const fnSecretMove = async (dto: TFnSecretMove): Promise<TFnSecretMoveRes})) as { key: string; value?: string; encryptedValue?: Buffer }[] | undefined,references: doc.value ? getAllSecretReferences(doc.value).nestedReferences : [],tagIds: doc.tags.map((tag) => tag.id),- blindIndexes: await blindIndexer.generateOptional(doc.value)+ blindIndexes: await (doc.value ? blindIndexer.generateBlindIndexes(Buffer.from(doc.value)) : null)})));@@ -1856,7 +1855,7 @@ export const fnSecretMove = async (dto: TFnSecretMove): Promise<TFnSecretMoveRes? {encryptedValue: doc.encryptedValue,references: doc.value ? getAllSecretReferences(doc.value).nestedReferences : [],- blindIndexes: await blindIndexer.generateOptional(doc.value)+ blindIndexes: await (doc.value ? blindIndexer.generateBlindIndexes(Buffer.from(doc.value)) : null)}: {encryptedValue: undefined,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 a2d18e9ee0..f54fb39298 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@@ -188,7 +188,7 @@ type TSecretV2BridgeServiceFactoryDep = {reminderDAL: Pick<TReminderDALFactory, "findSecretReminders" | "delete">;secretValidationRuleService: Pick<TSecretValidationRuleServiceFactory, "validateSecrets">;projectFolderGrantDAL: Pick<TProjectFolderGrantDALFactory, "find">;- orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgById">;};export type TSecretV2BridgeServiceFactory = ReturnType<typeof secretV2BridgeServiceFactory>;@@ -474,8 +474,10 @@ export const secretV2BridgeServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService, orgDAL });- const blindIndexes = await blindIndexer.generateOptional(inputSecretData.secretValue);+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService });+ const blindIndexes = await (inputSecretData.secretValue+ ? blindIndexer.generateBlindIndexes(Buffer.from(inputSecretData.secretValue))+ : null);const secret = await secretDAL.transaction(async (tx) => {const [createdSecret] = await fnSecretBulkInsert({folderId,@@ -767,13 +769,13 @@ export const secretV2BridgeServiceFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService, orgDAL });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: actorOrgId, kmsService });const encryptedValue =typeof secretValue === "string"? {encryptedValue: secretManagerEncryptor({ plainText: Buffer.from(secretValue) }).cipherTextBlob,references: getAllSecretReferences(secretValue).nestedReferences,- blindIndexes: await blindIndexer.generate(Buffer.from(secretValue))+ blindIndexes: await blindIndexer.generateBlindIndexes(Buffer.from(secretValue))}: {};@@ -2301,7 +2303,6 @@ export const secretV2BridgeServiceFactory = ({projectId,orgId: actorOrgId,kmsService,- orgDAL,tx: providedTx});@@ -2309,7 +2310,9 @@ export const secretV2BridgeServiceFactory = ({const inputSecretsWithBlindIndex = await Promise.all(deduplicatedSecrets.map(async (el) => {const references = secretReferencesGroupByInputSecretKey[el.secretKey]?.nestedReferences;- const blindIndexes = await blindIndexer.generateOptional(el.secretValue);+ const blindIndexes = await (el.secretValue+ ? blindIndexer.generateBlindIndexes(Buffer.from(el.secretValue))+ : null);return {version: 1,@@ -2467,7 +2470,6 @@ export const secretV2BridgeServiceFactory = ({projectId,orgId: actorOrgId,kmsService,- orgDAL,tx: providedTx});@@ -2710,7 +2712,7 @@ export const secretV2BridgeServiceFactory = ({? {encryptedValue: secretManagerEncryptor({ plainText: Buffer.from(el.secretValue) }).cipherTextBlob,references: secretReferencesGroupByInputSecretKey[el.secretKey]?.nestedReferences,- blindIndexes: await blindIndexer.generate(Buffer.from(el.secretValue))+ blindIndexes: await blindIndexer.generateBlindIndexes(Buffer.from(el.secretValue))}: {};@@ -2790,7 +2792,9 @@ export const secretV2BridgeServiceFactory = ({const inputSecretsForCreate = await Promise.all(secretsToCreate.map(async (el) => {const references = secretReferencesGroupByInputSecretKey[el.secretKey]?.nestedReferences;- const blindIndexes = await blindIndexer.generateOptional(el.secretValue);+ const blindIndexes = await (el.secretValue+ ? blindIndexer.generateBlindIndexes(Buffer.from(el.secretValue))+ : null);return {version: 1,@@ -3267,7 +3271,6 @@ export const secretV2BridgeServiceFactory = ({tx,permissionService,kmsService,- orgDAL,folderDAL,secretDAL,secretVersionDAL,diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.tsindex cbf68a240e..cd9ac20369 100644--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts@@ -10,7 +10,6 @@ import { TSecretApprovalRequestSecretDALFactory } from "@app/ee/services/secret-import { OrderByDirection, TProjectPermission } from "@app/lib/types";import { ActorAuthMethod, ActorType } from "@app/services/auth/auth-type";import { TKmsServiceFactory } from "@app/services/kms/kms-service";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";import { TSecretQueueFactory } from "@app/services/secret/secret-queue";import {@@ -286,7 +285,6 @@ export type TFnSecretMove = {permission: MongoAbility<ProjectPermissionSet>;tx: Knex;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;folderDAL: Pick<TSecretFolderDALFactory, "findBySecretPath" | "findSecretPathByFolderIds">;secretDAL: Pick<TSecretV2BridgeDALFactory,diff --git a/backend/src/services/secret/secret-fns.ts b/backend/src/services/secret/secret-fns.tsindex 08db6aa6c2..580d52a060 100644--- a/backend/src/services/secret/secret-fns.ts+++ b/backend/src/services/secret/secret-fns.ts@@ -788,7 +788,6 @@ export const createManySecretsRawFnFactory = ({secretVersionTagV2BridgeDAL,folderCommitService,kmsService,- orgDAL,resourceMetadataDAL}: TCreateManySecretsRawFnFactory) => {const getBotKeyFn = getBotKeyFnFactory(projectBotDAL, projectDAL);@@ -812,12 +811,7 @@ export const createManySecretsRawFnFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({- projectId,- orgId: project.orgId,- kmsService,- orgDAL- });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: project.orgId, kmsService });const secretsStoredInDB = await secretV2BridgeDAL.findBySecretKeys(folderId,@@ -832,7 +826,7 @@ export const createManySecretsRawFnFactory = ({});const blindIndexes = await Promise.all(- secrets.map((secret) => blindIndexer.generate(Buffer.from(secret.secretValue)))+ secrets.map((secret) => blindIndexer.generateBlindIndexes(Buffer.from(secret.secretValue))));const inputSecrets = secrets.map((secret, idx) => {@@ -984,8 +978,7 @@ export const updateManySecretsRawFnFactory = ({secretV2BridgeDAL,resourceMetadataDAL,folderCommitService,- kmsService,- orgDAL+ kmsService}: TUpdateManySecretsRawFnFactory) => {const getBotKeyFn = getBotKeyFnFactory(projectBotDAL, projectDAL);const updateManySecretsRawFn = async ({@@ -1009,12 +1002,7 @@ export const updateManySecretsRawFnFactory = ({type: KmsDataKey.SecretManager,projectId});- const blindIndexer = await createSecretBlindIndexer({- projectId,- orgId: project.orgId,- kmsService,- orgDAL- });+ const blindIndexer = await createSecretBlindIndexer({ projectId, orgId: project.orgId, kmsService });const secretsToUpdate = await secretV2BridgeDAL.findBySecretKeys(folderId,@@ -1046,7 +1034,7 @@ export const updateManySecretsRawFnFactory = ({const secretsToUpdateInDBGroupedByKey = groupBy(secretsToUpdate, (i) => i.key);const blindIndexes = await Promise.all(- secrets.map((secret) => blindIndexer.generate(Buffer.from(secret.secretValue)))+ secrets.map((secret) => blindIndexer.generateBlindIndexes(Buffer.from(secret.secretValue))));const inputSecrets = secrets.map((secret, idx) => {diff --git a/backend/src/services/secret/secret-queue.ts b/backend/src/services/secret/secret-queue.tsindex 9c85c91d65..6d896cdd7c 100644--- a/backend/src/services/secret/secret-queue.ts+++ b/backend/src/services/secret/secret-queue.ts@@ -129,7 +129,7 @@ type TSecretQueueFactoryDep = {licenseService: Pick<TLicenseServiceFactory, "getPlan">;telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;projectFolderGrantDAL: Pick<TProjectFolderGrantDALFactory, "find">;- orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgById">;};export type TGetSecrets = {@@ -348,7 +348,6 @@ export const secretQueueFactory = ({secretVersionTagDAL,folderDAL,kmsService,- orgDAL,secretVersionV2BridgeDAL,secretV2BridgeDAL,secretVersionTagV2BridgeDAL,@@ -366,7 +365,6 @@ export const secretQueueFactory = ({secretVersionTagDAL,folderDAL,kmsService,- orgDAL,secretVersionV2BridgeDAL,secretV2BridgeDAL,secretVersionTagV2BridgeDAL,diff --git a/backend/src/services/secret/secret-types.ts b/backend/src/services/secret/secret-types.tsindex 2a8d30a888..0ecf5b57a2 100644--- a/backend/src/services/secret/secret-types.ts+++ b/backend/src/services/secret/secret-types.ts@@ -11,7 +11,6 @@ import {} from "@app/db/schemas";import { ProjectPermissionSecretActions } from "@app/ee/services/permission/project-permission";import { OrderByDirection, TProjectPermission } from "@app/lib/types";-import { TOrgDALFactory } from "@app/services/org/org-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";import { TSecretDALFactory } from "@app/services/secret/secret-dal";@@ -474,7 +473,6 @@ export type TCreateManySecretsRawFnFactory = {secretVersionTagDAL: TSecretVersionTagDALFactory;folderDAL: TSecretFolderDALFactory;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory,"insertMany" | "upsertSecretReferences" | "findBySecretKeys" | "bulkUpdate" | "deleteMany" | "find"@@ -513,7 +511,6 @@ export type TUpdateManySecretsRawFnFactory = {secretVersionTagDAL: TSecretVersionTagDALFactory;folderDAL: TSecretFolderDALFactory;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;- orgDAL: Pick<TOrgDALFactory, "findById">;secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory,"insertMany" | "upsertSecretReferences" | "findBySecretKeys" | "bulkUpdate" | "deleteMany" | "find"