Skip to content

Commit

Permalink
feat: add workspace num check
Browse files Browse the repository at this point in the history
Signed-off-by: tygao <tygao@amazon.com>
  • Loading branch information
raintygao committed Aug 18, 2023
1 parent d9275a0 commit 90f04e1
Showing 1 changed file with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ export class WorkspaceSavedObjectsClientWrapper {
request: OpenSearchDashboardsRequest,
permissionMode: WorkspacePermissionMode | WorkspacePermissionMode[]
) {
// for attributes and options passed in this function, the num of workspaces may be 0.This case should not be passed permission check.
if (workspacesIds.length === 0) {
return false;
}
const workspaces = workspacesIds.map((id) => ({ id, type: WORKSPACE_TYPE }));
return await this.validateMultiObjectsPermissions(workspaces, request, permissionMode);
}
Expand All @@ -144,8 +148,9 @@ export class WorkspaceSavedObjectsClientWrapper {
request: OpenSearchDashboardsRequest,
permissionMode: WorkspacePermissionMode | WorkspacePermissionMode[]
) {
if (!workspaces) {
return;
// for attributes and options passed in this function, the num of workspaces attribute may be 0.This case should not be passed permission check.
if (!workspaces || workspaces.length === 0) {
return false;
}
let permitted = false;
for (const workspaceId of workspaces) {
Expand Down Expand Up @@ -185,7 +190,7 @@ export class WorkspaceSavedObjectsClientWrapper {
const workspacePermitted = await this.validateMultiWorkspacesPermissions(
objectToDeleted.workspaces!,
wrapperOptions.request,
WorkspacePermissionMode.Management
[WorkspacePermissionMode.Management, WorkspacePermissionMode.LibraryWrite]
);

if (!workspacePermitted) {
Expand Down Expand Up @@ -289,7 +294,7 @@ export class WorkspaceSavedObjectsClientWrapper {
const workspacePermitted = await this.validateAtLeastOnePermittedWorkspaces(
objectToGet.workspaces,
wrapperOptions.request,
WorkspacePermissionMode.Read
[WorkspacePermissionMode.Read]
);

if (!workspacePermitted) {
Expand Down

0 comments on commit 90f04e1

Please sign in to comment.