mirror of
https://github.com/clearlinux/rkt.git
synced 2026-11-22 03:53:23 +00:00
Merge pull request #252 from sgotti/fixarchivevalidation
actool: fix archive layout validation
This commit is contained in:
@@ -97,20 +97,22 @@ Tar:
|
||||
default:
|
||||
return err
|
||||
}
|
||||
switch hdr.Name {
|
||||
name := filepath.Clean(hdr.Name)
|
||||
switch name {
|
||||
case ".":
|
||||
case "app":
|
||||
_, err := io.Copy(&im, tr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
imOK = true
|
||||
case "rootfs/":
|
||||
case "rootfs":
|
||||
if !hdr.FileInfo().IsDir() {
|
||||
return fmt.Errorf("rootfs is not a directory")
|
||||
}
|
||||
rfsOK = true
|
||||
default:
|
||||
flist = append(flist, hdr.Name)
|
||||
flist = append(flist, name)
|
||||
}
|
||||
}
|
||||
return validate(imOK, &im, rfsOK, flist)
|
||||
|
||||
Reference in New Issue
Block a user