security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

internal/pkg: remove typeflag promotion loop
All checks were successful
Test / Create distribution (push) Successful in 47s
Details
Test / Sandbox (push) Successful in 2m49s
Details
Test / ShareFS (push) Successful in 4m54s
Details
Test / Sandbox (race detector) (push) Successful in 5m21s
Details
Test / Hpkg (push) Successful in 5m26s
Details
Test / Hakurei (race detector) (push) Successful in 7m48s
Details
Test / Hakurei (push) Successful in 4m11s
Details
Test / Flake checks (push) Successful in 1m46s
Details

Browse Source 
Expanding this enables sharing of code common between types.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-01-13 00:23:14 +09:00
parent 5fe166a4a7
commit 156dd767ef
1 changed files with 57 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/pkg/tar.go
View File

@@ -11,7 +11,6 @@ import (
"io/fs"
"net/http"
"os"
"path"
"hakurei.app/container/check"
)
@@ -142,25 +141,26 @@ func (a *tarArtifact) Cure(t *TContext) (err error) {
r := tar.NewReader(tr)
for header, err = r.Next(); err == nil; header, err = r.Next() {
typeflag := header.Typeflag
for {
switch typeflag {
case 0:
if typeflag == 0 {
if len(header.Name) > 0 && header.Name[len(header.Name)-1] == '/' {
typeflag = tar.TypeDir
} else {
typeflag = tar.TypeReg
}
continue
case tar.TypeReg:
p := temp.Append(header.Name).String()
if err = os.MkdirAll(path.Dir(p), 0700); err != nil {
return
}
pathname := temp.Append(header.Name)
if typeflag >= '0' && typeflag <= '9' && typeflag != tar.TypeDir {
if err = os.MkdirAll(pathname.Dir().String(), 0700); err != nil {
return
}
}
switch typeflag {
case tar.TypeReg:
var f *os.File
if f, err = os.OpenFile(
p,
pathname.String(),
os.O_CREATE|os.O_EXCL|os.O_WRONLY,
header.FileInfo().Mode()&0500,
); err != nil {
@@ -175,49 +175,33 @@ func (a *tarArtifact) Cure(t *TContext) (err error) {
break
case tar.TypeLink:
p := temp.Append(header.Name).String()
if err = os.MkdirAll(path.Dir(p), 0700); err != nil {
return
}
if err = os.Link(header.Linkname, p); err != nil {
if err = os.Link(header.Linkname, pathname.String()); err != nil {
return
}
break
case tar.TypeSymlink:
p := temp.Append(header.Name).String()
if err = os.MkdirAll(path.Dir(p), 0700); err != nil {
return
}
if err = os.Symlink(header.Linkname, p); err != nil {
if err = os.Symlink(header.Linkname, pathname.String()); err != nil {
return
}
break
case tar.TypeDir:
pathname := temp.Append(header.Name)
madeDirectories = append(madeDirectories, dirTargetPerm{
path: pathname,
mode: header.FileInfo().Mode(),
})
if err = os.MkdirAll(
pathname.String(),
0700,
); err != nil {
if err = os.MkdirAll(pathname.String(), 0700); err != nil {
return
}
break
case tar.TypeXGlobalHeader:
// ignore
break
continue // ignore
default:
return DisallowedTypeflagError(typeflag)
}
break
}
}
if errors.Is(err, io.EOF) {
err = nil