From d5fb789cfadaa0a7b1918733340ce646438641e0 Mon Sep 17 00:00:00 2001
From: Qxisylolo <qianxisy@amazon.com>
Date: Thu, 28 Nov 2024 10:41:21 +0800
Subject: [PATCH] add try catch

Signed-off-by: Qxisylolo <qianxisy@amazon.com>
---
 .../workspace_saved_objects_client_wrapper.ts | 63 ++++++++++++-------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
index 14b3bd68e728..917eb065890c 100644
--- a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
+++ b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
@@ -505,12 +505,36 @@ export class WorkspaceSavedObjectsClientWrapper {
       let flag = true;
       const processedObjects = await Promise.all(
         objectToBulkGet.saved_objects.map(async (object) => {
-          if (validateIsWorkspaceDataSourceAndConnectionObjectType(object.type)) {
-            const hasPermission = this.validateDataSourcePermissions(
-              object,
-              wrapperOptions.request
-            );
-            if (!hasPermission) {
+          try {
+            if (validateIsWorkspaceDataSourceAndConnectionObjectType(object.type)) {
+              const hasPermission = this.validateDataSourcePermissions(
+                object,
+                wrapperOptions.request
+              );
+              if (!hasPermission) {
+                flag = false;
+                ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
+                return {
+                  ...object,
+                  workspaces: [],
+                  attributes: {} as T,
+                  error: {
+                    ...generateDataSourcePermissionError().output.payload,
+                    statusCode: 403,
+                  },
+                };
+              }
+            }
+
+            if (
+              !(await this.validateWorkspacesAndSavedObjectsPermissions(
+                object,
+                wrapperOptions.request,
+                [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.LibraryWrite],
+                [WorkspacePermissionMode.Write, WorkspacePermissionMode.Read],
+                false
+              ))
+            ) {
               flag = false;
               ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
               return {
@@ -518,35 +542,28 @@ export class WorkspaceSavedObjectsClientWrapper {
                 workspaces: [],
                 attributes: {} as T,
                 error: {
-                  ...generateDataSourcePermissionError().output.payload,
+                  ...generateSavedObjectsPermissionError().output.payload,
                   statusCode: 403,
                 },
               };
             }
-          }
-
-          if (
-            !(await this.validateWorkspacesAndSavedObjectsPermissions(
-              object,
-              wrapperOptions.request,
-              [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.LibraryWrite],
-              [WorkspacePermissionMode.Write, WorkspacePermissionMode.Read],
-              false
-            ))
-          ) {
+            return object;
+          } catch (error) {
             flag = false;
             ACLAuditor?.increment(ACLAuditorStateKey.VALIDATE_FAILURE, 1);
+
+            const formattedError = {
+              message: error?.message || 'unexpected error',
+              error: error?.error,
+              statusCode: error.statusCode,
+            };
             return {
               ...object,
               workspaces: [],
               attributes: {} as T,
-              error: {
-                ...generateSavedObjectsPermissionError().output.payload,
-                statusCode: 403,
-              },
+              error: formattedError,
             };
           }
-          return object;
         })
       );