security/hakurei
security/hakurei
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

container/op: unexport bind resolved source field
All checks were successful
Test / Create distribution (push) Successful in 33s
Details
Test / Sandbox (push) Successful in 2m5s
Details
Test / Hakurei (push) Successful in 2m57s
Details
Test / Hpkg (push) Successful in 3m55s
Details
Test / Sandbox (race detector) (push) Successful in 3m59s
Details
Test / Hakurei (race detector) (push) Successful in 4m34s
Details
Test / Flake checks (push) Successful in 1m21s
Details

Browse Source 
This is used for symlink resolution and is only used internally.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-08-03 17:57:37 +09:00
parent ff66296378
commit 6a3886e9db
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
container/ops.go
View File

@ -68,7 +68,7 @@ func (f *Ops) Bind(source, target string, flags int) *Ops {
} }
type BindMountOp struct { type BindMountOp struct {
Source, SourceFinal, Target string Source, sourceFinal, Target string
Flags int Flags int
} }
@ -89,18 +89,18 @@ func (b *BindMountOp) early(*Params) error {
if v, err := filepath.EvalSymlinks(b.Source); err != nil { if v, err := filepath.EvalSymlinks(b.Source); err != nil {
if os.IsNotExist(err) && b.Flags&BindOptional != 0 { if os.IsNotExist(err) && b.Flags&BindOptional != 0 {
b.SourceFinal = "\x00" b.sourceFinal = "\x00"
return nil return nil
} }
return wrapErrSelf(err) return wrapErrSelf(err)
} else { } else {
b.SourceFinal = v b.sourceFinal = v
return nil return nil
} }
} }
func (b *BindMountOp) apply(*Params) error { func (b *BindMountOp) apply(*Params) error {
if b.SourceFinal == "\x00" { if b.sourceFinal == "\x00" {
if b.Flags&BindOptional == 0 { if b.Flags&BindOptional == 0 {
// unreachable // unreachable
return EBADE return EBADE
@ -108,11 +108,11 @@ func (b *BindMountOp) apply(*Params) error {
return nil return nil
} }
if !path.IsAbs(b.SourceFinal) || !path.IsAbs(b.Target) { if !path.IsAbs(b.sourceFinal) || !path.IsAbs(b.Target) {
return msg.WrapErr(EBADE, "path is not absolute") return msg.WrapErr(EBADE, "path is not absolute")
} }
source := toHost(b.SourceFinal) source := toHost(b.sourceFinal)
target := toSysroot(b.Target) target := toSysroot(b.Target)
// this perm value emulates bwrap behaviour as it clears bits from 0755 based on // this perm value emulates bwrap behaviour as it clears bits from 0755 based on
@ -135,7 +135,7 @@ func (b *BindMountOp) apply(*Params) error {
flags |= MS_NODEV flags |= MS_NODEV
} }
return hostProc.bindMount(source, target, flags, b.SourceFinal == b.Target) return hostProc.bindMount(source, target, flags, b.sourceFinal == b.Target)
} }
func (b *BindMountOp) Is(op Op) bool { vb, ok := op.(*BindMountOp); return ok && *b == *vb } func (b *BindMountOp) Is(op Op) bool { vb, ok := op.(*BindMountOp); return ok && *b == *vb }