kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-19 09:43:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take count of os separator in extraction

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-10-23 23:03:18 +02:00
parent a0e7e9ba08
commit 454a560f4c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/api/core/image/extract.go
View File

@@ -146,26 +146,27 @@ func ExtractFiles(
return func(h *tar.Header) (bool, error) { return func(h *tar.Header) (bool, error) {
fileName := filepath.Join(string(os.PathSeparator), h.Name)
switch { switch {
case len(includes) == 0 && len(excludes) != 0: case len(includes) == 0 && len(excludes) != 0:
for _, i := range excludeRegexp { for _, i := range excludeRegexp {
if i.MatchString(filepath.Join(prefixPath, h.Name)) { if i.MatchString(filepath.Join(prefixPath, fileName)) {
return false, nil return false, nil
} }
} }
if prefixPath != "" { if prefixPath != "" {
return strings.HasPrefix(h.Name, prefixPath), nil return strings.HasPrefix(fileName, prefixPath), nil
} }
ctx.Debug("Adding name", h.Name) ctx.Debug("Adding name", fileName)
return true, nil return true, nil
case len(includes) > 0 && len(excludes) == 0: case len(includes) > 0 && len(excludes) == 0:
for _, i := range includeRegexp { for _, i := range includeRegexp {
if i.MatchString(filepath.Join(prefixPath, h.Name)) { if i.MatchString(filepath.Join(prefixPath, fileName)) {
if prefixPath != "" { if prefixPath != "" {
return strings.HasPrefix(h.Name, prefixPath), nil return strings.HasPrefix(h.Name, prefixPath), nil
} }
ctx.Debug("Adding name", h.Name) ctx.Debug("Adding name", fileName)
return true, nil return true, nil
} }
@@ -173,16 +174,16 @@ func ExtractFiles(
return false, nil return false, nil
case len(includes) != 0 && len(excludes) != 0: case len(includes) != 0 && len(excludes) != 0:
for _, i := range includeRegexp { for _, i := range includeRegexp {
if i.MatchString(filepath.Join(prefixPath, h.Name)) { if i.MatchString(filepath.Join(prefixPath, fileName)) {
for _, e := range excludeRegexp { for _, e := range excludeRegexp {
if e.MatchString(filepath.Join(prefixPath, h.Name)) { if e.MatchString(filepath.Join(prefixPath, fileName)) {
return false, nil return false, nil
} }
} }
if prefixPath != "" { if prefixPath != "" {
return strings.HasPrefix(h.Name, prefixPath), nil return strings.HasPrefix(fileName, prefixPath), nil
} }
ctx.Debug("Adding name", h.Name) ctx.Debug("Adding name", fileName)
return true, nil return true, nil
} }
@@ -190,7 +191,7 @@ func ExtractFiles(
return false, nil return false, nil
default: default:
if prefixPath != "" { if prefixPath != "" {
return strings.HasPrefix(h.Name, prefixPath), nil return strings.HasPrefix(fileName, prefixPath), nil
} }
return true, nil return true, nil