Merge pull request #2050 from RedisInsight/bugfix/feature/RI-4352-upload_data_win_error

#RI-4466 fix file was not found on win

Author: vlad-dargel

redisinsight/api/src/modules/bulk-actions/bulk-import.service.spec.ts

@@ -260,14 +260,19 @@ describe('BulkImportService', () => {
       expect(mockedFs.readFile).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, 'danger'));
     });
 
-    it('should normalize path before importing and not search for file outside home folder (relative)', async () => {
+    it('should normalize path before importing and throw an error when search for file outside home folder (relative)', async () => {
       mockedFs.pathExists.mockImplementationOnce(async () => true);
 
-      await service.uploadFromTutorial(mockClientMetadata, {
-        path: '../../../danger',
-      });
+      try {
+        await service.uploadFromTutorial(mockClientMetadata, {
+          path: '../../../danger',
+        });
 
-      expect(mockedFs.readFile).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, 'danger'));
+        fail();
+      } catch (e) {
+        expect(e).toBeInstanceOf(BadRequestException);
+        expect(e.message).toEqual('Data file was not found');
+      }
     });
 
     it('should throw BadRequest when no file found', async () => {
@@ -289,9 +294,8 @@ describe('BulkImportService', () => {
       mockedFs.stat.mockImplementationOnce(async () => ({ size: 100 * 1024 * 1024 + 1 } as fs.Stats));
 
       try {
-        await service.uploadFromTutorial(mockClientMetadata, {
-          path: '../../../danger',
-        });
+        await service.uploadFromTutorial(mockClientMetadata, mockUploadImportFileByPathDto);
+
         fail();
       } catch (e) {
         expect(e).toBeInstanceOf(BadRequestException);

redisinsight/api/src/modules/bulk-actions/bulk-import.service.ts

@@ -155,21 +155,18 @@ export class BulkImportService {
     dto: UploadImportFileByPathDto,
   ): Promise<IBulkActionOverview> {
     try {
+      const filePath = join(dto.path);
+
       const staticPath = join(SERVER_CONFIG.base, SERVER_CONFIG.staticUri);
 
-      let trimmedPath = dto.path;
-      if (dto.path.indexOf(staticPath) === 0) {
-        trimmedPath = dto.path.slice(staticPath.length);
+      let trimmedPath = filePath;
+      if (filePath.indexOf(staticPath) === 0) {
+        trimmedPath = filePath.slice(staticPath.length);
       }
 
-      const resolvedPath = resolve(
-        '/',
-        trimmedPath,
-      );
-
-      const path = join(PATH_CONFIG.homedir, resolvedPath);
+      const path = join(PATH_CONFIG.homedir, trimmedPath);
 
-      if (!await fs.pathExists(path)) {
+      if (!path.startsWith(PATH_CONFIG.homedir) || !await fs.pathExists(path)) {
         throw new BadRequestException('Data file was not found');
       }