Commit 7b4ef9e

author

Akos Kitta

committed

fix: disallow anything but underscore when converting any string to a valid sketch folder name

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

1 parent 4d45515 commit 7b4ef9eCopy full SHA for 7b4ef9e

File tree

2 files changed

+12

-12

lines changed

arduino-ide-extension/src
- common/protocol
  - sketches-service.ts
- test/common
  - sketches-service.test.ts

2 files changed

+12

-12

lines changed

`‎arduino-ide-extension/src/common/protocol/sketches-service.ts‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ export namespace Sketch {`
`205`	`205`	`const validName = candidate`
`206`	`206`	`? candidate`
`207`	`207`	`.replace(/^[^0-9a-zA-Z]{1}/g, defaultFallbackFirstChar)`
`208`		`- .replace(/[^0-9a-zA-Z_\.-]/g, defaultFallbackChar)`
	`208`	`+ .replace(/[^0-9a-zA-Z_]/g, defaultFallbackChar)`
`209`	`209`	`.slice(0, 63)`
`210`	`210`	`: defaultSketchFolderName;`
`211`	`211`	`if (appendTimestampSuffix) {`
`@@ -233,7 +233,7 @@ export namespace Sketch {`
`233`	`233`	`return candidate`
`234`	`234`	`? candidate`
`235`	`235`	`.replace(/^[^0-9a-zA-Z]{1}/g, defaultFallbackFirstChar)`
`236`		`- .replace(/[^0-9a-zA-Z_\.-]/g, defaultFallbackChar)`
	`236`	`+ .replace(/[^0-9a-zA-Z_]/g, defaultFallbackChar)`
`237`	`237`	`.slice(0, 36)`
`238`	`238`	`: defaultSketchFolderName;`
`239`	`239`	`}`

`‎arduino-ide-extension/src/test/common/sketches-service.test.ts‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,9 @@ describe('sketch', () => {`
`107`	`107`	`['foo bar', 'foo_bar' + epochSuffix],`
`108`	`108`	`['.foobar', '0foobar' + epochSuffix],`
`109`	`109`	`['-fooBar', '0fooBar' + epochSuffix],`
	`110`	`+ ['foobar.', 'foobar_' + epochSuffix],`
	`111`	`+ ['fooBar-', 'fooBar_' + epochSuffix],`
	`112`	`+ ['fooBar+', 'fooBar_' + epochSuffix],`
`110`	`113`	`['vAlid', 'vAlid' + epochSuffix],`
`111`	`114`	`].map(([input, expected]) =>`
`112`	`115`	`toMapIt(input, expected, (input: string) =>`
`@@ -118,23 +121,20 @@ describe('sketch', () => {`
`118`	`121`	`describe('toValidCloudSketchFolderName', () => {`
`119`	`122`	`[`
`120`	`123`	`['sketch', 'sketch'],`
`121`		`- [`
`122`		`- 'slash-and-dot-is-ok+but+no+plus.ino',`
`123`		`- 'slash-and-dot-is-ok_but_no_plus.ino',`
`124`		`- ],`
	`124`	`+ ['only_underscore-is+ok.ino', 'only_underscore_is_ok_ino'],`
`125`	`125`	`['regex++', 'regex__'],`
`126`		`- ['dots...', 'dots...'],`
`127`		`- ['.dots...', '0dots...'],`
`128`		`- ['-dashes---', '0dashes---'],`
	`126`	`+ ['dots...', 'dots___'],`
	`127`	`+ ['.dots...', '0dots___'],`
	`128`	`+ ['-dashes---', '0dashes___'],`
`129`	`129`	`['_underscore___', '0underscore___'],`
`130`	`130`	`['No Spaces', 'No_Spaces'],`
`131`	`131`	`['_startsWithUnderscore', '0startsWithUnderscore'],`
`132`		`- ['Invalid+Char.ino', 'Invalid_Char.ino'],`
	`132`	`+ ['Invalid+Char.ino', 'Invalid_Char_ino'],`
`133`	`133`	`['', 'sketch'],`
`134`	`134`	`['/', '0'],`
`135`	`135`	`[`
`136`		`- '//////////////////////////////////////-/',`
`137`		`- '0___________________________________',`
	`136`	`+ '/-1////////////////////+//////////////-/',`
	`137`	`+ '0_1_________________________________',`
`138`	`138`	`],`
`139`	`139`	`['//trash/', '0_trash_'],`
`140`	`140`	`[`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 7b4ef9e

File tree

2 files changed

2 files changed

`‎arduino-ide-extension/src/common/protocol/sketches-service.ts‎`

`‎arduino-ide-extension/src/test/common/sketches-service.test.ts‎`

0 commit comments