actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-20 06:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #2426 from foot/support-dot-prefixed-paths

Browse source 
Add support for Kustomizations with dot-prefixed paths
This commit is contained in:
Stefan Prodan 2022-02-14 12:32:25 +02:00 committed by GitHub
commit 7a306e69ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/flags/safe_relative_path.go
View file

@ -41,7 +41,10 @@ func (p *SafeRelativePath) Set(str string) error {
return fmt.Errorf("invalid relative path '%s': %w", cleanP, err) return fmt.Errorf("invalid relative path '%s': %w", cleanP, err)
} }
// NB: required, as a secure join of "./" will result in "." // NB: required, as a secure join of "./" will result in "."
cleanP = fmt.Sprintf("./%s", strings.TrimPrefix(cleanP, ".")) if cleanP == "." {
cleanP = ""
}
cleanP = fmt.Sprintf("./%s", cleanP)
*p = SafeRelativePath(cleanP) *p = SafeRelativePath(cleanP)
return nil return nil
} }

7
internal/flags/safe_relative_path_test.go
View file

@ -37,6 +37,13 @@ func TestRelativePath_Set(t *testing.T) {
{"traversing absolute path", "/foo/../bar", "./bar", false}, {"traversing absolute path", "/foo/../bar", "./bar", false},
{"traversing overflowing absolute path", "/foo/../../../bar", "./bar", false}, {"traversing overflowing absolute path", "/foo/../../../bar", "./bar", false},
{"empty", "", "./", false}, {"empty", "", "./", false},
{"relative empty path", "./", "./", false},
{"double relative empty path", "././", "./", false},
{"dot path", ".foo", "./.foo", false},
{"relative dot path", "./.foo", "./.foo", false},
{"current directory", ".", "./", false},
{"parent directory", "..", "./", false},
{"parent directory more qualified", "./..", "./", false},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {