diff options
Diffstat (limited to 'internal/sandbox/container.go')
| -rw-r--r-- | internal/sandbox/container.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/internal/sandbox/container.go b/internal/sandbox/container.go index 97dd0ee0..5ee5a5b4 100644 --- a/internal/sandbox/container.go +++ b/internal/sandbox/container.go @@ -10,6 +10,7 @@ import ( "path" "strconv" "syscall" + "time" "git.gensokyo.uk/security/fortify/helper/proc" "git.gensokyo.uk/security/fortify/internal" @@ -68,6 +69,9 @@ type ( Stdout io.Writer Stderr io.Writer + Cancel func() error + WaitDelay time.Duration + cmd *exec.Cmd ctx context.Context } @@ -130,6 +134,7 @@ func (p *Container) Start() error { p.cmd = p.CommandContext(c) p.cmd.Stdin, p.cmd.Stdout, p.cmd.Stderr = p.Stdin, p.Stdout, p.Stderr + p.cmd.Cancel, p.cmd.WaitDelay = p.Cancel, p.WaitDelay p.cmd.Dir = "/" p.cmd.SysProcAttr = &syscall.SysProcAttr{ Setsid: p.Flags&FAllowTTY == 0, @@ -208,6 +213,11 @@ func (p *Container) Serve() error { func (p *Container) Wait() error { defer p.cancel(); return p.cmd.Wait() } +func (p *Container) String() string { + return fmt.Sprintf("argv: %q, flags: %#x, seccomp: %#x", + p.Args, p.Flags, int(p.Flags.seccomp(p.Seccomp))) +} + func New(ctx context.Context, name string, args ...string) *Container { return &Container{name: name, ctx: ctx, InitParams: InitParams{Args: append([]string{name}, args...), Dir: "/", Ops: new(Ops)}, |