diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-07-02 21:23:55 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-07-02 21:23:55 +0900 |
| commit | a1d98823f8d17b49b432508d071b62ccd426f1ce (patch) | |
| tree | cacbe2d42f9ff3fd49b455e849770840e34d076a /dbus | |
| parent | 255b77d91dc40736b7bbd7d96b22500076b098e5 (diff) | |
hakurei: move container toplevel
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus_test.go | 8 | ||||
| -rw-r--r-- | dbus/proc.go | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dbus/dbus_test.go b/dbus/dbus_test.go index 8965e0f4..caf70980 100644 --- a/dbus/dbus_test.go +++ b/dbus/dbus_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" + "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/dbus" "git.gensokyo.uk/security/hakurei/helper" "git.gensokyo.uk/security/hakurei/internal" "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/sandbox" ) func TestFinalise(t *testing.T) { @@ -134,7 +134,7 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) { } p.CmdF = func(v any) { if useSandbox { - container := v.(*sandbox.Container) + container := v.(*hakurei.Container) if container.Args[0] != dbus.ProxyName { panic(fmt.Sprintf("unexpected argv0 %q", os.Args[0])) } @@ -208,6 +208,6 @@ func TestHelperInit(t *testing.T) { if len(os.Args) != 5 || os.Args[4] != "init" { return } - sandbox.SetOutput(hlog.Output{}) - sandbox.Init(hlog.Prepare, internal.InstallOutput) + hakurei.SetOutput(hlog.Output{}) + hakurei.Init(hlog.Prepare, internal.InstallOutput) } diff --git a/dbus/proc.go b/dbus/proc.go index 283f31c5..bbb72f92 100644 --- a/dbus/proc.go +++ b/dbus/proc.go @@ -11,9 +11,9 @@ import ( "strconv" "syscall" + "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/helper" "git.gensokyo.uk/security/hakurei/ldd" - "git.gensokyo.uk/security/hakurei/sandbox" "git.gensokyo.uk/security/hakurei/sandbox/seccomp" ) @@ -65,7 +65,7 @@ func (p *Proxy) Start() error { p.helper = helper.New( ctx, toolPath, p.final, true, - argF, func(container *sandbox.Container) { + argF, func(container *hakurei.Container) { container.SeccompFlags |= seccomp.AllowMultiarch container.SeccompPresets |= seccomp.PresetStrict container.Hostname = "hakurei-dbus" @@ -115,7 +115,7 @@ func (p *Proxy) Start() error { slices.Sort(sockDirPaths) sockDirPaths = slices.Compact(sockDirPaths) for _, name := range sockDirPaths { - container.Bind(name, name, sandbox.BindWritable) + container.Bind(name, name, hakurei.BindWritable) } // xdg-dbus-proxy bin path |