kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-08-31 23:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup config protect

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-10-24 13:01:51 +02:00
parent 6ff22d923c
commit 52ad2b5cfa
4 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,16 +47,21 @@ func ExtractDeltaFiles(
excludeRegexp := compileRegexes(excludes)
return func(h *tar.Header) (bool, error) {
fileName := filepath.Join(string(os.PathSeparator), h.Name)
ctx.Debug("Includes", includes)
ctx.Debug("Excludes", excludes)
ctx.Debug("Additions", d.Additions)
switch {
case len(includes) == 0 && len(excludes) != 0:
for _, a := range d.Additions {
if h.Name == a.Name {
for _, i := range excludeRegexp {
if i.MatchString(a.Name) && h.Name == a.Name {
if i.MatchString(filepath.Join(string(os.PathSeparator), a.Name)) &&
fileName == filepath.Join(string(os.PathSeparator), a.Name) {
return false, nil
}
}
ctx.Debug("Adding name", h.Name)
ctx.Debug("Adding name", fileName)
return true, nil
}
@@ -65,8 +70,8 @@ func ExtractDeltaFiles(
case len(includes) > 0 && len(excludes) == 0:
for _, a := range d.Additions {
for _, i := range includeRegexp {
if i.MatchString(a.Name) && h.Name == a.Name {
ctx.Debug("Adding name", h.Name)
if i.MatchString(filepath.Join(string(os.PathSeparator), a.Name)) && fileName == filepath.Join(string(os.PathSeparator), a.Name) {
ctx.Debug("Adding name", fileName)
return true, nil
}
@@ -76,13 +81,13 @@ func ExtractDeltaFiles(
case len(includes) != 0 && len(excludes) != 0:
for _, a := range d.Additions {
for _, i := range includeRegexp {
if i.MatchString(a.Name) && h.Name == a.Name {
if i.MatchString(filepath.Join(string(os.PathSeparator), a.Name)) && fileName == filepath.Join(string(os.PathSeparator), a.Name) {
for _, e := range excludeRegexp {
if e.MatchString(a.Name) {
if e.MatchString(fileName) {
return false, nil
}
}
ctx.Debug("Adding name", h.Name)
ctx.Debug("Adding name", fileName)
return true, nil
}
@@ -91,8 +96,8 @@ func ExtractDeltaFiles(
return false, nil
default:
for _, a := range d.Additions {
if h.Name == a.Name {
ctx.Debug("Adding name", h.Name)
if fileName == filepath.Join(string(os.PathSeparator), a.Name) {
ctx.Debug("Adding name", fileName)
return true, nil
}