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
fix(frontend): fetch reveal all secret values in one bulk request
DimitrisStaratzisf8e70ed2f2ec
diff --git a/frontend/src/hooks/api/dashboard/queries.tsx b/frontend/src/hooks/api/dashboard/queries.tsxindex b8939fc2c1..ec3253b644 100644--- a/frontend/src/hooks/api/dashboard/queries.tsx+++ b/frontend/src/hooks/api/dashboard/queries.tsx@@ -173,21 +173,53 @@ export const fetchProjectSecretsDetails = async ({return data;};+// Keys travel in the querystring and Node rejects a request whose request line and headers exceed+// 16KB, so a long key list is split across requests that each stay well under it. The joined keys+// are encoded here and again by axios, so each key is measured in that double-encoded form.+const SECRETS_BY_KEYS_MAX_ENCODED_LENGTH = 6_000;++const chunkKeysByEncodedLength = (keys: string[]) => {+ const chunks: string[][] = [];+ let chunk: string[] = [];+ let chunkLength = 0;++ keys.forEach((key) => {+ const keyLength = encodeURIComponent(encodeURIComponent(`${key},`)).length;+ if (chunk.length && chunkLength + keyLength > SECRETS_BY_KEYS_MAX_ENCODED_LENGTH) {+ chunks.push(chunk);+ chunk = [];+ chunkLength = 0;+ }+ chunk.push(key);+ chunkLength += keyLength;+ });++ if (chunk.length) chunks.push(chunk);++ return chunks;+};+export const fetchDashboardProjectSecretsByKeys = async ({keys,...params-}: TGetDashboardProjectSecretsByKeys) => {- const { data } = await apiRequest.get<DashboardProjectSecretsByKeys>(- "/api/v1/dashboard/secrets-by-keys",- {- params: {- ...params,- keys: encodeURIComponent(keys.join(","))- }- }+}: TGetDashboardProjectSecretsByKeys): Promise<DashboardProjectSecretsByKeys> => {+ const responses = await Promise.all(+ chunkKeysByEncodedLength(keys).map(async (keyChunk) => {+ const { data } = await apiRequest.get<DashboardProjectSecretsByKeys>(+ "/api/v1/dashboard/secrets-by-keys",+ {+ params: {+ ...params,+ keys: encodeURIComponent(keyChunk.join(","))+ }+ }+ );++ return data;+ }));- return data;+ return { secrets: responses.flatMap(({ secrets }) => secrets) };};const mergePersonalRotationSecrets = (secrets: (SecretV3Raw | null)[]) => {@@ -670,6 +702,12 @@ export const useGetSecretValue = (queryKey: dashboardKeys.getSecretValue(params),queryFn: async () => fetchSecretValue(params),staleTime: 1000 * 60,+ retry: (count, error) => {+ // retrying a throttled request only extends the throttle+ if (error instanceof AxiosError && error.status === 429) return false;++ return count < 1;+ },...options});};diff --git a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsxindex 9246cf4ecb..1f80e76a51 100644--- a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx@@ -35,6 +35,7 @@ import {GroupIcon,InfoIcon,LayersIcon,+ LoaderCircleIcon,LockIcon,TrashIcon,UsersIcon@@ -187,7 +188,11 @@ import {} from "@app/hooks/api";import { useListAvailableAppConnections } from "@app/hooks/api/appConnections";import { AppConnection } from "@app/hooks/api/appConnections/enums";-import { dashboardKeys, useGetProjectSecretsOverview } from "@app/hooks/api/dashboard/queries";+import {+ dashboardKeys,+ fetchDashboardProjectSecretsByKeys,+ useGetProjectSecretsOverview+} from "@app/hooks/api/dashboard/queries";import { DashboardSecretsOrderBy, ProjectSecretsImportedBy } from "@app/hooks/api/dashboard/types";import { TDynamicSecret } from "@app/hooks/api/dynamicSecret/types";import { useGetFolderCommitsCount } from "@app/hooks/api/folderCommits";@@ -440,6 +445,7 @@ const OverviewPageContent = () => {);const [isSingleEnvSecretsVisible, setIsSingleEnvSecretsVisible] = useToggle();+ const [isRevealingAllSecrets, setIsRevealingAllSecrets] = useToggle();// scott: keeping incase we bring it back// const [collapseEnvironments, setCollapseEnvironments] = useToggle(@@ -2420,6 +2426,71 @@ const OverviewPageContent = () => {[getSecretByKey, isBatchModeActive, pendingChanges.secrets]);+ // Rows fetch their own value once visible, so the cache is primed with one request per+ // environment and path before they are shown instead of letting each row call the API.+ const handleRevealAllSecrets = async () => {+ const [{ slug: environment }] = visibleEnvs;+ const groups: Record<string, { environment: string; secretPath: string; keys: string[] }> = {};+ const addKey = (groupEnvironment: string, groupSecretPath: string, key: string) => {+ const groupKey = JSON.stringify([groupEnvironment, groupSecretPath]);+ groups[groupKey] ??= { environment: groupEnvironment, secretPath: groupSecretPath, keys: [] };+ groups[groupKey].keys.push(key);+ };++ mergedSecKeys.forEach((key) => {+ const secret = getSecretByKey(environment, key);+ if (secret) {+ const canRevealShared = !secret.isEmpty && !secret.secretValueHidden;+ const canRevealOverride = Boolean(secret.idOverride) && !secret.isOverrideEmpty;+ if (canRevealShared || canRevealOverride) addKey(environment, secretPath, key);+ return;+ }++ const importedSecret = getImportedSecretByKey(environment, key);+ if (importedSecret?.secret && !importedSecret.secret.isEmpty) {+ addKey(importedSecret.environment, importedSecret.secretPath, importedSecret.secret.key);+ }+ });++ setIsRevealingAllSecrets.on();+ try {+ await Promise.all(+ Object.values(groups).map(async (group) => {+ const { secrets: fetchedSecrets } = await fetchDashboardProjectSecretsByKeys({+ projectId,+ environment: group.environment,+ secretPath: group.secretPath,+ keys: group.keys,+ viewSecretValue: true+ });++ fetchedSecrets.forEach((fetchedSecret) => {+ if (fetchedSecret.secretValueHidden || fetchedSecret.secretValue === undefined) return;++ const isOverride = fetchedSecret.type === SecretType.Personal;+ queryClient.setQueryData(+ dashboardKeys.getSecretValue({+ projectId,+ environment: group.environment,+ secretPath: group.secretPath,+ secretKey: fetchedSecret.secretKey,+ ...(isOverride ? { isOverride: true } : {})+ }),+ isOverride+ ? { value: undefined, valueOverride: fetchedSecret.secretValue }+ : { value: fetchedSecret.secretValue, valueOverride: undefined }+ );+ });+ })+ );+ setIsSingleEnvSecretsVisible.on();+ } catch {+ createNotification({ type: "error", text: "Failed to reveal secret values" });+ } finally {+ setIsRevealingAllSecrets.off();+ }+ };+const mergedFolderNamesAndDescriptions = useMemo(() => {if (!isBatchModeActive)return folderNamesAndDescriptions.map((f) => ({ ...f, pendingAction: undefined }));@@ -3812,13 +3883,18 @@ const OverviewPageContent = () => {<Badge variant="ghost" asChild><buttontype="button"+ disabled={isRevealingAllSecrets}onClick={() => {overviewTelemetry.interaction({action: isSingleEnvSecretsVisible ? "hide" : "reveal",source: "header",resourceType: "secret"});- setIsSingleEnvSecretsVisible.toggle();+ if (isSingleEnvSecretsVisible) {+ setIsSingleEnvSecretsVisible.off();+ } else {+ handleRevealAllSecrets();+ }}}>{isSingleEnvSecretsVisible ? (@@ -3828,7 +3904,11 @@ const OverviewPageContent = () => {</>) : (<>- <EyeIcon />+ {isRevealingAllSecrets ? (+ <LoaderCircleIcon className="animate-spin" />+ ) : (+ <EyeIcon />+ )}Reveal All</>)}