bugfix: handling invalid import environment names (usebruno#2197)

busy-panda · May 1, 2024 · bbb03d0 · bbb03d0
1 parent 392cc80
commit bbb03d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/bruno-electron/src/ipc/collection.js b/packages/bruno-electron/src/ipc/collection.js
@@ -13,7 +13,8 @@ const {
   browseFiles,
   createDirectory,
   searchForBruFiles,
-  sanitizeDirectoryName
+  sanitizeDirectoryName,
+  sanitizeFileName
 } = require('../utils/filesystem');
 const { openCollectionDialog } = require('../app/collections');
 const { generateUidBasedOnHash, stringifyJson, safeParseJSON, safeStringifyJSON } = require('../utils/common');
@@ -218,13 +219,13 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         await createDirectory(envDirPath);
       }
 
-      const envFilePath = path.join(envDirPath, `${name}.bru`);
+      const envFilePath = path.join(envDirPath, `${sanitizeFileName(name)}.bru`);
       if (fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} already exists`);
       }
 
       const environment = {
-        name: name,
+        name: sanitizeFileName(name),
         variables: variables || []
       };
 

diff --git a/packages/bruno-electron/src/utils/filesystem.js b/packages/bruno-electron/src/utils/filesystem.js
@@ -146,6 +146,9 @@ const searchForBruFiles = (dir) => {
 const sanitizeDirectoryName = (name) => {
   return name.replace(/[<>:"/\\|?*\x00-\x1F]+/g, '-');
 };
+const sanitizeFileName = (name) => {
+  return sanitizeDirectoryName(name);
+};
 
 module.exports = {
   isValidPathname,
@@ -164,5 +167,6 @@ module.exports = {
   chooseFileToSave,
   searchForFiles,
   searchForBruFiles,
-  sanitizeDirectoryName
+  sanitizeDirectoryName,
+  sanitizeFileName
 };