security
/
fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

helper/bwrap: allow pushing generic arguments to the end of argument stream 

Bwrap argument order determines the order their corresponding actions are performed. This allows generic arguments like tmpfs to the end of the stream to override bind mounts.

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
This commit is contained in:
Ophestra Umiker 2024-10-13 02:26:01 +09:00
parent 655020eb5d
commit aee96b0fdf
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
helper/bwrap/config.go
View File

@ -46,6 +46,9 @@ func (c *Config) Args() (args []string) {
} }
for i, arg := range g { for i, arg := range g {
for _, v := range arg { for _, v := range arg {
if v.Later() {
continue
}
args = append(args, v.Value(interfaceArgs[i])...) args = append(args, v.Value(interfaceArgs[i])...)
} }
} }
@ -59,6 +62,14 @@ func (c *Config) Args() (args []string) {
args = append(args, pairArgs[i], v[0], v[1]) args = append(args, pairArgs[i], v[0], v[1])
} }
} }
for i, arg := range g {
for _, v := range arg {
if !v.Later() {
continue
}
args = append(args, v.Value(interfaceArgs[i])...)
}
}
return return
} }
@ -217,6 +228,7 @@ type TmpfsConfig struct {
type argOf interface { type argOf interface {
Value(arg string) (args []string) Value(arg string) (args []string)
Later() bool
} }
func copyToArgOfSlice[T [2]string | string | TmpfsConfig](src []PermConfig[T]) (dst []argOf) { func copyToArgOfSlice[T [2]string | string | TmpfsConfig](src []PermConfig[T]) (dst []argOf) {
@ -228,6 +240,9 @@ func copyToArgOfSlice[T [2]string | string | TmpfsConfig](src []PermConfig[T]) (
} }
type PermConfig[T [2]string | string | TmpfsConfig] struct { type PermConfig[T [2]string | string | TmpfsConfig] struct {
// append this at the end of the argument stream
Last bool
// set permissions of next argument // set permissions of next argument
// (--perms OCTAL) // (--perms OCTAL)
Mode *os.FileMode `json:"mode,omitempty"` Mode *os.FileMode `json:"mode,omitempty"`
@ -236,6 +251,10 @@ type PermConfig[T [2]string | string | TmpfsConfig] struct {
Path T Path T
} }
func (p PermConfig[T]) Later() bool {
return p.Last
}
func (p PermConfig[T]) Value(arg string) (args []string) { func (p PermConfig[T]) Value(arg string) (args []string) {
// max possible size // max possible size
if p.Mode != nil { if p.Mode != nil {