Skip to content

fix #4837 Update glob due to vulnerability in dep #4970

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

Merged
merged 8 commits into from
Mar 30, 2023
Merged

fix #4837 Update glob due to vulnerability in dep #4970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbb5669
Update glob due to vulnerability in dep
jb2311 Mar 8, 2023
e20dc66
Fix issues on windows with glob and minimatch. Also switch references…
jb2311 Mar 14, 2023
1e94e73
Remove eslint-plugin-n
jb2311 Mar 15, 2023
7312250
clean install
jb2311 Mar 15, 2023
4e381e0
Whitespace cleanup
jb2311 Mar 22, 2023
5f2c4a9
Add new line
jb2311 Mar 27, 2023
294ba83
whitespace cleanup
jb2311 Mar 27, 2023
626e19e
fix eof
juergba Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/cli/collect-files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ module.exports = ({
try {
const moreSpecFiles = castArray(lookupFiles(arg, extension, recursive))
.filter(filename =>
ignore.every(pattern => !minimatch(filename, pattern))
ignore.every(
pattern =>
!minimatch(filename, pattern, {windowsPathsNoEscape: true})
)
)
.map(filename => path.resolve(filename));
return [...specFiles, ...moreSpecFiles];
Expand Down
9 changes: 7 additions & 2 deletions lib/cli/lookup-files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module.exports = function lookupFiles(

if (!fs.existsSync(filepath)) {
let pattern;
if (glob.hasMagic(filepath)) {
if (glob.hasMagic(filepath, {windowsPathsNoEscape: true})) {
// Handle glob as is without extensions
pattern = filepath;
} else {
Expand All @@ -86,7 +86,12 @@ module.exports = function lookupFiles(
pattern = `${filepath}+(${strExtensions})`;
debug('looking for files using glob pattern: %s', pattern);
}
files.push(...glob.sync(pattern, {nodir: true}));
files.push(
...glob.sync(pattern, {
nodir: true,
windowsPathsNoEscape: true
})
);
if (!files.length) {
throw createNoFilesMatchPatternError(
`Cannot find any files matching pattern "${filepath}"`,
Expand Down
Loading