sandbox: move out of internal

Signed-off-by: Ophestra <cat@gensokyo.uk>

37 files changed, 24 insertions, 24 deletions

diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go
index 63a3f77d..e23ce500 100644
--- a/cmd/fpkg/main.go
+++ b/cmd/fpkg/main.go
@@ -17,8 +17,8 @@ import (
 	"git.gensokyo.uk/security/fortify/internal/app/init0"
 	"git.gensokyo.uk/security/fortify/internal/app/shim"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
 	"git.gensokyo.uk/security/fortify/internal/sys"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 const shellPath = "/run/current-system/sw/bin/bash"
diff --git a/dbus/dbus_test.go b/dbus/dbus_test.go
index bba06f6c..740ab522 100644
--- a/dbus/dbus_test.go
+++ b/dbus/dbus_test.go
@@ -15,7 +15,7 @@ import (
 	"git.gensokyo.uk/security/fortify/helper"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 func TestNew(t *testing.T) {
diff --git a/dbus/proc.go b/dbus/proc.go
index 446ca90e..07e8b782 100644
--- a/dbus/proc.go
+++ b/dbus/proc.go
@@ -14,9 +14,9 @@ import (
 	"syscall"
 
 	"git.gensokyo.uk/security/fortify/helper"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
 	"git.gensokyo.uk/security/fortify/ldd"
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 // Start launches the D-Bus proxy.
diff --git a/helper/bwrap/config_test.go b/helper/bwrap/config_test.go
index 7e78c8fb..720ef404 100644
--- a/helper/bwrap/config_test.go
+++ b/helper/bwrap/config_test.go
@@ -7,7 +7,7 @@ import (
 
 	"git.gensokyo.uk/security/fortify/helper/bwrap"
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 func TestConfig_Args(t *testing.T) {
diff --git a/helper/bwrap/seccomp.go b/helper/bwrap/seccomp.go
index f5132be3..22532038 100644
--- a/helper/bwrap/seccomp.go
+++ b/helper/bwrap/seccomp.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 type SyscallPolicy struct {
diff --git a/helper/container.go b/helper/container.go
index 4eb57c3b..33ab1e3a 100644
--- a/helper/container.go
+++ b/helper/container.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 // New initialises a Helper instance with wt as the null-terminated argument writer.
diff --git a/helper/container_test.go b/helper/container_test.go
index cb145bf8..886cbf47 100644
--- a/helper/container_test.go
+++ b/helper/container_test.go
@@ -10,7 +10,7 @@ import (
 	"git.gensokyo.uk/security/fortify/helper"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 func TestContainer(t *testing.T) {
diff --git a/internal/app/init0/main.go b/internal/app/init0/main.go
index 46ce4490..7b8d27c6 100644
--- a/internal/app/init0/main.go
+++ b/internal/app/init0/main.go
@@ -11,7 +11,7 @@ import (
 
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 const (
diff --git a/internal/app/shim/main.go b/internal/app/shim/main.go
index 94501497..5634be4c 100644
--- a/internal/app/shim/main.go
+++ b/internal/app/shim/main.go
@@ -16,7 +16,7 @@ import (
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/app/init0"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 // everything beyond this point runs as unconstrained target user
diff --git a/internal/app/shim/manager.go b/internal/app/shim/manager.go
index 4b5432b8..4ed75e53 100644
--- a/internal/app/shim/manager.go
+++ b/internal/app/shim/manager.go
@@ -13,7 +13,7 @@ import (
 	"git.gensokyo.uk/security/fortify/helper/proc"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 // used by the parent process
diff --git a/internal/output.go b/internal/output.go
index c85f1b51..7b1de30a 100644
--- a/internal/output.go
+++ b/internal/output.go
@@ -2,8 +2,8 @@ package internal
 
 import (
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 	"git.gensokyo.uk/security/fortify/system"
 )
 
diff --git a/internal/sys/std.go b/internal/sys/std.go
index 0145eb23..132f4c13 100644
--- a/internal/sys/std.go
+++ b/internal/sys/std.go
@@ -15,7 +15,7 @@ import (
 	"git.gensokyo.uk/security/fortify/fst"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 // Std implements System using the standard library.
diff --git a/ldd/exec.go b/ldd/exec.go
index 55d16cf7..cb1ecec3 100644
--- a/ldd/exec.go
+++ b/ldd/exec.go
@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"time"
 
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 const lddTimeout = 2 * time.Second
diff --git a/main.go b/main.go
index 7a650d65..0505e593 100644
--- a/main.go
+++ b/main.go
@@ -23,9 +23,9 @@ import (
 	"git.gensokyo.uk/security/fortify/internal/app/init0"
 	"git.gensokyo.uk/security/fortify/internal/app/shim"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
 	"git.gensokyo.uk/security/fortify/internal/state"
 	"git.gensokyo.uk/security/fortify/internal/sys"
+	"git.gensokyo.uk/security/fortify/sandbox"
 	"git.gensokyo.uk/security/fortify/system"
 )
 
diff --git a/internal/sandbox/const.go b/sandbox/const.go
index afced969..afced969 100644
--- a/internal/sandbox/const.go
+++ b/sandbox/const.go
diff --git a/internal/sandbox/container.go b/sandbox/container.go
index afbcc4fd..3c8063ce 100644
--- a/internal/sandbox/container.go
+++ b/sandbox/container.go
@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"time"
 
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 type HardeningFlags uintptr
diff --git a/internal/sandbox/container_test.go b/sandbox/container_test.go
index 55df60b2..0cca3eac 100644
--- a/internal/sandbox/container_test.go
+++ b/sandbox/container_test.go
@@ -14,9 +14,9 @@ import (
 	"git.gensokyo.uk/security/fortify/fst"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
 	"git.gensokyo.uk/security/fortify/ldd"
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 	check "git.gensokyo.uk/security/fortify/test/sandbox"
 )
 
diff --git a/internal/sandbox/executable.go b/sandbox/executable.go
index 5f73d238..5f73d238 100644
--- a/internal/sandbox/executable.go
+++ b/sandbox/executable.go
diff --git a/internal/sandbox/executable_test.go b/sandbox/executable_test.go
index b11908c5..3f8e0285 100644
--- a/internal/sandbox/executable_test.go
+++ b/sandbox/executable_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"git.gensokyo.uk/security/fortify/internal/sandbox"
+	"git.gensokyo.uk/security/fortify/sandbox"
 )
 
 func TestExecutable(t *testing.T) {
diff --git a/internal/sandbox/init.go b/sandbox/init.go
index a6fac1a3..4fbb173f 100644
--- a/internal/sandbox/init.go
+++ b/sandbox/init.go
@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"time"
 
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 const (
diff --git a/internal/sandbox/mount.go b/sandbox/mount.go
index e47e7f5d..e47e7f5d 100644
--- a/internal/sandbox/mount.go
+++ b/sandbox/mount.go
diff --git a/internal/sandbox/msg.go b/sandbox/msg.go
index 5ee18509..5ee18509 100644
--- a/internal/sandbox/msg.go
+++ b/sandbox/msg.go
diff --git a/internal/sandbox/output.go b/sandbox/output.go
index de4a104a..de4a104a 100644
--- a/internal/sandbox/output.go
+++ b/sandbox/output.go
diff --git a/internal/sandbox/overflow.go b/sandbox/overflow.go
index ebaad704..ebaad704 100644
--- a/internal/sandbox/overflow.go
+++ b/sandbox/overflow.go
diff --git a/internal/sandbox/params.go b/sandbox/params.go
index 5b698747..5b698747 100644
--- a/internal/sandbox/params.go
+++ b/sandbox/params.go
diff --git a/internal/sandbox/path.go b/sandbox/path.go
index 6c5a6e2c..6c5a6e2c 100644
--- a/internal/sandbox/path.go
+++ b/sandbox/path.go
diff --git a/seccomp/api.go b/sandbox/seccomp/api.go
index 697b09f3..697b09f3 100644
--- a/seccomp/api.go
+++ b/sandbox/seccomp/api.go
diff --git a/seccomp/export.go b/sandbox/seccomp/export.go
index 95684235..95684235 100644
--- a/seccomp/export.go
+++ b/sandbox/seccomp/export.go
diff --git a/seccomp/export_test.go b/sandbox/seccomp/export_test.go
index 34bb306b..8dc88cbb 100644
--- a/seccomp/export_test.go
+++ b/sandbox/seccomp/export_test.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"testing"
 
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 func TestExport(t *testing.T) {
diff --git a/seccomp/output.go b/sandbox/seccomp/output.go
index d583c9ee..d583c9ee 100644
--- a/seccomp/output.go
+++ b/sandbox/seccomp/output.go
diff --git a/seccomp/seccomp-build.c b/sandbox/seccomp/seccomp-build.c
index 4b2114f4..4b2114f4 100644
--- a/seccomp/seccomp-build.c
+++ b/sandbox/seccomp/seccomp-build.c
diff --git a/seccomp/seccomp-build.h b/sandbox/seccomp/seccomp-build.h
index 7f1be761..7f1be761 100644
--- a/seccomp/seccomp-build.h
+++ b/sandbox/seccomp/seccomp-build.h
diff --git a/seccomp/seccomp.go b/sandbox/seccomp/seccomp.go
index 2e730479..2e730479 100644
--- a/seccomp/seccomp.go
+++ b/sandbox/seccomp/seccomp.go
diff --git a/seccomp/seccomp_test.go b/sandbox/seccomp/seccomp_test.go
index f2949ef8..3c7f5339 100644
--- a/seccomp/seccomp_test.go
+++ b/sandbox/seccomp/seccomp_test.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"testing"
 
-	"git.gensokyo.uk/security/fortify/seccomp"
+	"git.gensokyo.uk/security/fortify/sandbox/seccomp"
 )
 
 func TestLibraryError(t *testing.T) {
diff --git a/internal/sandbox/sequential.go b/sandbox/sequential.go
index aa4bb18e..aa4bb18e 100644
--- a/internal/sandbox/sequential.go
+++ b/sandbox/sequential.go
diff --git a/internal/sandbox/syscall.go b/sandbox/syscall.go
index a17928f7..a17928f7 100644
--- a/internal/sandbox/syscall.go
+++ b/sandbox/syscall.go
diff --git a/system/output.go b/system/output.go
index daf43864..8dab60ff 100644
--- a/system/output.go
+++ b/system/output.go
@@ -1,6 +1,6 @@
 package system
 
-import "git.gensokyo.uk/security/fortify/internal/sandbox"
+import "git.gensokyo.uk/security/fortify/sandbox"
 
 var msg sandbox.Msg = new(sandbox.DefaultMsg)