Merge pull request #1499 from RedisInsight/be/feature/RI-3898_Without_JSON.DEGUG

#RI-3898 - Do not use JSON.DEBUG MEMORY when it is not allowed

Author: nmammadli

redisinsight/api/src/modules/browser/services/rejson-rl-business/rejson-rl-business.service.spec.ts

@@ -172,23 +172,6 @@ describe('JsonBusinessService', () => {
           expect(err).toBeInstanceOf(BadRequestException);
         }
       });
-      it('should throw Forbidden error when no perms for an action for getJson', async () => {
-        const replyError: ReplyError = {
-          ...mockRedisNoPermError,
-          command: 'JSON.DEBUG',
-        };
-        browserTool.execCommand.mockRejectedValue(replyError);
-
-        try {
-          await service.getJson(mockBrowserClientMetadata, {
-            keyName: testKey,
-            path: testPath,
-          });
-          fail();
-        } catch (err) {
-          expect(err).toBeInstanceOf(ForbiddenException);
-        }
-      });
       it('should throw BadRequest error when module not loaded for getJson', async () => {
         const replyError: ReplyError = {
           name: 'ReplyError',
@@ -414,6 +397,76 @@ describe('JsonBusinessService', () => {
         });
       });
     });
+
+    describe('user has no PERM for JSON.DEBUG', () => {
+      beforeEach(() => {
+        const replyError: ReplyError = {
+          ...mockRedisNoPermError,
+          command: 'JSON.DEBUG',
+        };
+
+        when(browserTool.execCommand)
+          .calledWith(
+            mockBrowserClientMetadata,
+            BrowserToolRejsonRlCommands.JsonDebug,
+            ['MEMORY', testKey, testPath],
+          )
+          .mockRejectedValue(replyError);
+      });
+
+      it('should return data (string)', async () => {
+        const testData = 'some string';
+        when(browserTool.execCommand)
+          .calledWith(mockBrowserClientMetadata, BrowserToolRejsonRlCommands.JsonGet, [
+            testKey,
+            testPath,
+          ], 'utf8')
+          .mockReturnValue(JSON.stringify(testData));
+
+        const result = await service.getJson(mockBrowserClientMetadata, {
+          keyName: testKey,
+          path: testPath,
+        });
+
+        expect(result).toEqual({
+          downloaded: true,
+          path: testPath,
+          data: testData,
+        });
+      });
+
+      it('should return full json value even if size is above the limit', async () => {
+        const testData = {arr:[randomBytes(2000).toString('hex')]};
+        when(browserTool.execCommand)
+          .calledWith(mockBrowserClientMetadata, BrowserToolRejsonRlCommands.JsonGet, [
+            testKey,
+            testPath,
+          ], 'utf8')
+          .mockReturnValue(JSON.stringify(testData));
+
+        when(browserTool.execCommand)
+          .calledWith(
+            mockBrowserClientMetadata,
+            BrowserToolRejsonRlCommands.JsonType, [
+              testKey,
+              testPath,
+            ],
+            'utf8',
+          ).mockReturnValue('object');
+
+        const result = await service.getJson(mockBrowserClientMetadata, {
+          keyName: testKey,
+          path: testPath,
+        });
+
+        expect(result).toEqual({
+          downloaded: true,
+          path: testPath,
+          data: testData,
+        });
+      });
+
+    });
     describe('partial json download', () => {
       beforeEach(() => {
         when(browserTool.execCommand)

redisinsight/api/src/modules/browser/services/rejson-rl-business/rejson-rl-business.service.ts

@@ -61,11 +61,17 @@ export class RejsonRlBusinessService {
     keyName: RedisString,
     path: string,
   ): Promise<number | null> {
-    const size = await this.browserTool.execCommand(
-      clientMetadata,
-      BrowserToolRejsonRlCommands.JsonDebug,
-      ['MEMORY', keyName, path],
-    );
+    let size = 0
+
+    try {
+      size = await this.browserTool.execCommand(
+        clientMetadata,
+        BrowserToolRejsonRlCommands.JsonDebug,
+        ['MEMORY', keyName, path],
+      );
+    } catch (error) {
+      this.logger.error('Failed to estimate size of json.', error);
+    }
 
     if (size === null) {
       throw new BadRequestException(

redisinsight/api/test/api/rejson-rl/POST-databases-id-rejson_rl-get.test.ts

@@ -229,17 +229,34 @@ describe('POST /databases/:instanceId/rejson-rl/get', () => {
           before: () => rte.data.setAclUserRules('~* +@all -json.get')
         },
         {
-          name: 'Should throw error if no permissions for "json.debug" command',
+          name: 'Should return regular item if no permissions for "json.debug" command',
           endpoint: () => endpoint(constants.TEST_INSTANCE_ACL_ID),
           data: {
             keyName: constants.TEST_REJSON_KEY_3,
             path: '.',
             forceRetrieve: false,
           },
-          statusCode: 403,
+          responseSchema,
           responseBody: {
-            statusCode: 403,
-            error: 'Forbidden',
+            downloaded: true,
+            path: '.',
+            data: constants.TEST_REJSON_VALUE_3,
+          },
+          before: () => rte.data.setAclUserRules('~* +@all -json.debug')
+        },
+        {
+          name: 'Should get full json if no permissions for "json.debug" command',
+          endpoint: () => endpoint(constants.TEST_INSTANCE_ACL_ID),
+          data: {
+            keyName: constants.TEST_REJSON_KEY_3,
+            path: '.',
+            forceRetrieve: false,
+          },
+          responseSchema,
+          responseBody: {
+            downloaded: true,
+            path: '.',
+            data: constants.TEST_REJSON_VALUE_3,
           },
           before: () => rte.data.setAclUserRules('~* +@all -json.debug')
         },