jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-11 13:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: escaped regex chars in pattern

Browse Source 
Closes #1600

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Akos Kitta 2022-11-03 17:31:05 +01:00 committed by Akos Kitta
parent cc2d557706
commit f6d112e1f6
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arduino-ide-extension/package.json
View File

@ -45,7 +45,6 @@
"@types/deepmerge": "^2.2.0", "@types/deepmerge": "^2.2.0",
"@types/glob": "^7.2.0", "@types/glob": "^7.2.0",
"@types/google-protobuf": "^3.7.2", "@types/google-protobuf": "^3.7.2",
"@types/is-valid-path": "^0.1.0",
"@types/js-yaml": "^3.12.2", "@types/js-yaml": "^3.12.2",
"@types/keytar": "^4.4.0", "@types/keytar": "^4.4.0",
"@types/lodash.debounce": "^4.0.6", "@types/lodash.debounce": "^4.0.6",

4
arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
View File

@ -27,7 +27,6 @@ import {
CLOSE_PLOTTER_WINDOW, CLOSE_PLOTTER_WINDOW,
SHOW_PLOTTER_WINDOW, SHOW_PLOTTER_WINDOW,
} from '../../common/ipc-communication'; } from '../../common/ipc-communication';
import isValidPath = require('is-valid-path');
import { ErrnoException } from '../../node/utils/errors'; import { ErrnoException } from '../../node/utils/errors';
app.commandLine.appendSwitch('disable-http-cache'); app.commandLine.appendSwitch('disable-http-cache');
@ -206,9 +205,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
maybePath: string, maybePath: string,
cwd: string cwd: string
): Promise<string | undefined> { ): Promise<string | undefined> {
if (!isValidPath(maybePath)) {
return undefined;
}
if (isAbsolute(maybePath)) { if (isAbsolute(maybePath)) {
return maybePath; return maybePath;
} }

13
arduino-ide-extension/src/node/sketches-service-impl.ts
View File

@ -26,6 +26,7 @@ import {
LoadSketchRequest, LoadSketchRequest,
} from './cli-protocol/cc/arduino/cli/commands/v1/commands_pb'; } from './cli-protocol/cc/arduino/cli/commands/v1/commands_pb';
import { Deferred } from '@theia/core/lib/common/promise-util'; import { Deferred } from '@theia/core/lib/common/promise-util';
import { escapeRegExpCharacters } from '@theia/core/lib/common/strings';
import { ServiceError } from './service-error'; import { ServiceError } from './service-error';
import { import {
IsTempSketch, IsTempSketch,
@ -158,7 +159,7 @@ export class SketchesServiceImpl
const sketchName = segments[segments.length - 2]; const sketchName = segments[segments.length - 2];
const sketchFilename = segments[segments.length - 1]; const sketchFilename = segments[segments.length - 1];
const sketchFileExtension = segments[segments.length - 1].replace( const sketchFileExtension = segments[segments.length - 1].replace(
new RegExp(sketchName), new RegExp(escapeRegExpCharacters(sketchName)),
'' ''
); );
if (sketchFileExtension !== '.ino' && sketchFileExtension !== '.pde') { if (sketchFileExtension !== '.ino' && sketchFileExtension !== '.pde') {
@ -746,10 +747,12 @@ async function isInvalidSketchNameError(
if (ino) { if (ino) {
const sketchFolderPath = path.dirname(requestSketchPath); const sketchFolderPath = path.dirname(requestSketchPath);
const sketchName = path.basename(sketchFolderPath); const sketchName = path.basename(sketchFolderPath);
const pattern = `${invalidSketchNameErrorRegExpPrefix}${path.join( const pattern = escapeRegExpCharacters(
sketchFolderPath, `${invalidSketchNameErrorRegExpPrefix}${path.join(
`${sketchName}.ino` sketchFolderPath,
)}`.replace(/\\/g, '\\\\'); // make windows path separator with \\ to have a valid regexp. `${sketchName}.ino`
)}`
);
if (new RegExp(pattern, 'i').test(cliErr.details)) { if (new RegExp(pattern, 'i').test(cliErr.details)) {
try { try {
await fs.access(requestSketchPath); await fs.access(requestSketchPath);

5
yarn.lock
View File

@ -3118,11 +3118,6 @@
resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
"@types/is-valid-path@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@types/is-valid-path/-/is-valid-path-0.1.0.tgz#d5c6e96801303112c9626d44268c6fabc72d272f"
integrity sha512-2ontWtpN8O2nf5S7EjDDJ0DwrRa2t7wmS3Wmo322yWYG6yFBYC1QCaLhz4Iz+mzJy8Kf4zP5yVyEd1ANPDmOFQ==
"@types/js-yaml@^3.12.2": "@types/js-yaml@^3.12.2":
version "3.12.7" version "3.12.7"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.7.tgz#330c5d97a3500e9c903210d6e49f02964af04a0e" resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.7.tgz#330c5d97a3500e9c903210d6e49f02964af04a0e"