awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 17:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Infisical/infisical

Browse Source
This commit is contained in:
Vladyslav Matsiiako
2023-07-26 14:03:47 -07:00
parent 00b4d6bd45 f5a6270d2a
commit c2c8cf90b7
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/v3/secretsController.ts
+15 -19
View File
@@ -27,27 +27,23 @@ export const getSecretsRaw = async (req: Request, res: Response) => {
// if the service token has single scope, it will get all secrets for that scope by default // if the service token has single scope, it will get all secrets for that scope by default
const serviceTokenDetails: IServiceTokenData = req?.serviceTokenData; const serviceTokenDetails: IServiceTokenData = req?.serviceTokenData;
if (serviceTokenDetails) { if (serviceTokenDetails && serviceTokenDetails.scopes.length == 1 && !containsGlobPatterns(serviceTokenDetails.scopes[0].secretPath)) {
if ( const scope = serviceTokenDetails.scopes[0];
serviceTokenDetails.scopes.length == 1 && secretPath = scope.secretPath;
!containsGlobPatterns(serviceTokenDetails.scopes[0].secretPath) environment = scope.environment;
) { workspaceId = serviceTokenDetails.workspace.toString();
const scope = serviceTokenDetails.scopes[0]; } else {
secretPath = scope.secretPath; requireWorkspaceAuth({
environment = scope.environment; acceptedRoles: [ADMIN, MEMBER],
workspaceId = serviceTokenDetails.workspace.toString(); locationWorkspaceId: "query",
} else { locationEnvironment: "query",
requireWorkspaceAuth({ requiredPermissions: [PERMISSION_READ_SECRETS],
acceptedRoles: [ADMIN, MEMBER], requireBlindIndicesEnabled: true,
locationWorkspaceId: "query", requireE2EEOff: true
locationEnvironment: "query", });
requiredPermissions: [PERMISSION_READ_SECRETS],
requireBlindIndicesEnabled: true,
requireE2EEOff: true
});
}
} }
const secrets = await SecretService.getSecrets({ const secrets = await SecretService.getSecrets({
workspaceId: new Types.ObjectId(workspaceId), workspaceId: new Types.ObjectId(workspaceId),
environment, environment,