actions/toolkit
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/actions/toolkit synced 2026-04-02 07:43:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent accidental file matching when glob contains trailing slash (#805)

Browse Source 
* Draft Solution

* Update internal-globber.ts

* Cleanup

* Fix Test

* Cleanup
This commit is contained in:
Luke Tomlinson
2021-05-14 14:12:26 -04:00
committed by GitHub
parent b33912b7cc
commit 98549fbf21
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/glob/src/internal-globber.ts
View File

@@ -66,7 +66,6 @@ export class DefaultGlobber implements Globber {
async *globGenerator(): AsyncGenerator<string, void> {
// Fill in defaults options
const options = globOptionsHelper.getOptions(this.options)
// Implicit descendants?
const patterns: Pattern[] = []
for (const pattern of this.patterns) {
@@ -77,12 +76,13 @@ export class DefaultGlobber implements Globber {
pattern.segments[pattern.segments.length - 1] !== '**')
) {
patterns.push(
new Pattern(pattern.negate, pattern.segments.concat('**'))
new Pattern(pattern.negate, true, pattern.segments.concat('**'))
)
}
}
// Push the search paths
const stack: SearchState[] = []
for (const searchPath of patternHelper.getSearchPaths(patterns)) {
core.debug(`Search path '${searchPath}'`)
@@ -180,6 +180,7 @@ export class DefaultGlobber implements Globber {
}
result.searchPaths.push(...patternHelper.getSearchPaths(result.patterns))
return result
}