Fix regular expressions #1070
Merged
Fix regular expressions #1070
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
axelboc
commented
Sep 28, 2023
| @@ -24,15 +24,15 @@ const validate = (values, props) => { | |||
| // here we update the resolution limits based on the energy the typed in the form, | |||
| // the limits come from a table sent by the client | |||
|
|
|||
| const validFname = /^[\w#[\]{}-\-]+$/u.test(props.filename); | |||
| const validFname = /^[-_#{}[\]\w]+$/u.test(props.filename); | |||
There was a problem hiding this comment.
Initial regex was /^[-\w\-\#\_\{\}\[\]]+$/.
- None of the characters need to be escaped except
]. - The dash was provided unescaped and escaped. I've kept the unescaped one and kept it at the start of the character set (i.e.
[...]) so it is never considered as a range (e.g.a-z).
|
|
||
| const emptyField = 'field is empty'; | ||
|
|
||
| if (!validFname) { | ||
| errors.prefix = INVALID_CHAR_MSG; | ||
| } | ||
|
|
||
| if (props.subdir && !/^[\w/{}-\-]+$/u.test(props.subdir)) { | ||
| if (props.subdir && !/^[-{}\/\w]+$/u.test(props.subdir)) { |
There was a problem hiding this comment.
Initial regex was /^[-\w\-\/\_\{\}]+$/. Same problem with the dash: it has to be at the front and doesn't need to be specified twice.
meguiraun
approved these changes
Sep 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Seems that the regexes modified by ESLint in https://github.com/mxcube/mxcubeweb/pull/1068/files#diff-f10f5ea4f3870e6bbd1c60836649382147f2438b75b4b7eb505f9e8bfed69fd8 were no longer valid.
This tool can help understand the old/new regexes: https://regex101.com/