Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/bruno-electron/src/ipc/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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 || []
};

Expand Down
6 changes: 5 additions & 1 deletion packages/bruno-electron/src/utils/filesystem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -164,5 +167,6 @@ module.exports = {
chooseFileToSave,
searchForFiles,
searchForBruFiles,
sanitizeDirectoryName
sanitizeDirectoryName,
sanitizeFileName
};