diff options
| -rw-r--r-- | cmd/hakurei/internal/app/instance/common/container.go | 2 | ||||
| -rw-r--r-- | cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go | 2 | ||||
| -rw-r--r-- | cmd/hakurei/internal/app/internal/setuid/app_pd_test.go | 2 | ||||
| -rw-r--r-- | cmd/hakurei/internal/app/internal/setuid/shim.go | 2 | ||||
| -rw-r--r-- | cmd/planterette/app.go | 2 | ||||
| -rw-r--r-- | cmd/planterette/with.go | 2 | ||||
| -rw-r--r-- | container.go | 2 | ||||
| -rw-r--r-- | container_test.go | 4 | ||||
| -rw-r--r-- | dbus/proc.go | 2 | ||||
| -rw-r--r-- | hst/container.go | 2 | ||||
| -rw-r--r-- | hst/template.go | 2 | ||||
| -rw-r--r-- | init.go | 2 | ||||
| -rw-r--r-- | ldd/exec.go | 2 | ||||
| -rw-r--r-- | mount.go | 2 | ||||
| -rw-r--r-- | path.go | 2 | ||||
| -rw-r--r-- | seccomp/libseccomp-helper.c (renamed from sandbox/seccomp/libseccomp-helper.c) | 0 | ||||
| -rw-r--r-- | seccomp/libseccomp-helper.h (renamed from sandbox/seccomp/libseccomp-helper.h) | 0 | ||||
| -rw-r--r-- | seccomp/libseccomp.go (renamed from sandbox/seccomp/libseccomp.go) | 0 | ||||
| -rw-r--r-- | seccomp/libseccomp_test.go (renamed from sandbox/seccomp/libseccomp_test.go) | 2 | ||||
| -rwxr-xr-x | seccomp/mksysnum_linux.pl (renamed from sandbox/seccomp/mksysnum_linux.pl) | 0 | ||||
| -rw-r--r-- | seccomp/presets.go (renamed from sandbox/seccomp/presets.go) | 0 | ||||
| -rw-r--r-- | seccomp/presets_clone_backwards2.go (renamed from sandbox/seccomp/presets_clone_backwards2.go) | 0 | ||||
| -rw-r--r-- | seccomp/presets_clone_generic.go (renamed from sandbox/seccomp/presets_clone_generic.go) | 0 | ||||
| -rw-r--r-- | seccomp/proc.go (renamed from sandbox/seccomp/proc.go) | 0 | ||||
| -rw-r--r-- | seccomp/seccomp.go (renamed from sandbox/seccomp/seccomp.go) | 0 | ||||
| -rw-r--r-- | seccomp/seccomp_test.go (renamed from sandbox/seccomp/seccomp_test.go) | 2 | ||||
| -rw-r--r-- | seccomp/syscall.go (renamed from sandbox/seccomp/syscall.go) | 0 | ||||
| -rw-r--r-- | seccomp/syscall_extra_linux_amd64.go (renamed from sandbox/seccomp/syscall_extra_linux_amd64.go) | 0 | ||||
| -rw-r--r-- | seccomp/syscall_linux_amd64.go (renamed from sandbox/seccomp/syscall_linux_amd64.go) | 0 | ||||
| -rw-r--r-- | seccomp/syscall_test.go (renamed from sandbox/seccomp/syscall_test.go) | 0 | ||||
| -rw-r--r-- | vfs/mangle.go (renamed from sandbox/vfs/mangle.go) | 0 | ||||
| -rw-r--r-- | vfs/mangle_test.go (renamed from sandbox/vfs/mangle_test.go) | 2 | ||||
| -rw-r--r-- | vfs/mountinfo.go (renamed from sandbox/vfs/mountinfo.go) | 0 | ||||
| -rw-r--r-- | vfs/mountinfo_test.go (renamed from sandbox/vfs/mountinfo_test.go) | 2 | ||||
| -rw-r--r-- | vfs/unfold.go (renamed from sandbox/vfs/unfold.go) | 0 | ||||
| -rw-r--r-- | vfs/unfold_test.go (renamed from sandbox/vfs/unfold_test.go) | 2 |
36 files changed, 21 insertions, 21 deletions
diff --git a/cmd/hakurei/internal/app/instance/common/container.go b/cmd/hakurei/internal/app/instance/common/container.go index e423e1c0..5164d264 100644 --- a/cmd/hakurei/internal/app/instance/common/container.go +++ b/cmd/hakurei/internal/app/instance/common/container.go @@ -12,7 +12,7 @@ import ( "git.gensokyo.uk/security/hakurei/dbus" "git.gensokyo.uk/security/hakurei/hst" "git.gensokyo.uk/security/hakurei/internal/sys" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) // in practice there should be less than 30 entries added by the runtime; diff --git a/cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go b/cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go index 0b7243ea..3fe96783 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go @@ -6,7 +6,7 @@ import ( "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" "git.gensokyo.uk/security/hakurei/dbus" "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" "git.gensokyo.uk/security/hakurei/system" ) diff --git a/cmd/hakurei/internal/app/internal/setuid/app_pd_test.go b/cmd/hakurei/internal/app/internal/setuid/app_pd_test.go index 15fd3e56..c839d5ba 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app_pd_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/app_pd_test.go @@ -8,7 +8,7 @@ import ( "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" "git.gensokyo.uk/security/hakurei/dbus" "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" "git.gensokyo.uk/security/hakurei/system" ) diff --git a/cmd/hakurei/internal/app/internal/setuid/shim.go b/cmd/hakurei/internal/app/internal/setuid/shim.go index 19566be8..0281f804 100644 --- a/cmd/hakurei/internal/app/internal/setuid/shim.go +++ b/cmd/hakurei/internal/app/internal/setuid/shim.go @@ -13,7 +13,7 @@ import ( "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/internal" "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) /* diff --git a/cmd/planterette/app.go b/cmd/planterette/app.go index 6d0993f4..1bc23379 100644 --- a/cmd/planterette/app.go +++ b/cmd/planterette/app.go @@ -8,7 +8,7 @@ import ( "git.gensokyo.uk/security/hakurei/dbus" "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" "git.gensokyo.uk/security/hakurei/system" ) diff --git a/cmd/planterette/with.go b/cmd/planterette/with.go index f2f4541d..a2eb02e3 100644 --- a/cmd/planterette/with.go +++ b/cmd/planterette/with.go @@ -7,7 +7,7 @@ import ( "git.gensokyo.uk/security/hakurei/hst" "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) func withNixDaemon( diff --git a/container.go b/container.go index 57e3c6fd..5bbc5d3c 100644 --- a/container.go +++ b/container.go @@ -14,7 +14,7 @@ import ( . "syscall" "time" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) type ( diff --git a/container_test.go b/container_test.go index aa1ed0af..4604d025 100644 --- a/container_test.go +++ b/container_test.go @@ -17,8 +17,8 @@ import ( "git.gensokyo.uk/security/hakurei/internal" "git.gensokyo.uk/security/hakurei/internal/hlog" "git.gensokyo.uk/security/hakurei/ldd" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" - "git.gensokyo.uk/security/hakurei/sandbox/vfs" + "git.gensokyo.uk/security/hakurei/seccomp" + "git.gensokyo.uk/security/hakurei/vfs" ) const ( diff --git a/dbus/proc.go b/dbus/proc.go index bbb72f92..e8cccd5f 100644 --- a/dbus/proc.go +++ b/dbus/proc.go @@ -14,7 +14,7 @@ import ( "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/helper" "git.gensokyo.uk/security/hakurei/ldd" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) // Start starts and configures a D-Bus proxy process. diff --git a/hst/container.go b/hst/container.go index bc36bef8..1a5c4ebd 100644 --- a/hst/container.go +++ b/hst/container.go @@ -1,7 +1,7 @@ package hst import ( - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) type ( diff --git a/hst/template.go b/hst/template.go index bcf14ac4..4c0930ec 100644 --- a/hst/template.go +++ b/hst/template.go @@ -2,7 +2,7 @@ package hst import ( "git.gensokyo.uk/security/hakurei/dbus" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" "git.gensokyo.uk/security/hakurei/system" ) @@ -13,7 +13,7 @@ import ( . "syscall" "time" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) const ( diff --git a/ldd/exec.go b/ldd/exec.go index ec38f681..9922ba1e 100644 --- a/ldd/exec.go +++ b/ldd/exec.go @@ -9,7 +9,7 @@ import ( "time" "git.gensokyo.uk/security/hakurei" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) const lddTimeout = 2 * time.Second @@ -7,7 +7,7 @@ import ( "path/filepath" . "syscall" - "git.gensokyo.uk/security/hakurei/sandbox/vfs" + "git.gensokyo.uk/security/hakurei/vfs" ) func (p *procPaths) bindMount(source, target string, flags uintptr, eq bool) error { @@ -10,7 +10,7 @@ import ( "strings" "syscall" - "git.gensokyo.uk/security/hakurei/sandbox/vfs" + "git.gensokyo.uk/security/hakurei/vfs" ) const ( diff --git a/sandbox/seccomp/libseccomp-helper.c b/seccomp/libseccomp-helper.c index b09c3eb2..b09c3eb2 100644 --- a/sandbox/seccomp/libseccomp-helper.c +++ b/seccomp/libseccomp-helper.c diff --git a/sandbox/seccomp/libseccomp-helper.h b/seccomp/libseccomp-helper.h index 330fc99b..330fc99b 100644 --- a/sandbox/seccomp/libseccomp-helper.h +++ b/seccomp/libseccomp-helper.h diff --git a/sandbox/seccomp/libseccomp.go b/seccomp/libseccomp.go index a43b8f23..a43b8f23 100644 --- a/sandbox/seccomp/libseccomp.go +++ b/seccomp/libseccomp.go diff --git a/sandbox/seccomp/libseccomp_test.go b/seccomp/libseccomp_test.go index f5c0105a..441245b6 100644 --- a/sandbox/seccomp/libseccomp_test.go +++ b/seccomp/libseccomp_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - . "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + . "git.gensokyo.uk/security/hakurei/seccomp" ) func TestExport(t *testing.T) { diff --git a/sandbox/seccomp/mksysnum_linux.pl b/seccomp/mksysnum_linux.pl index 50b88b62..50b88b62 100755 --- a/sandbox/seccomp/mksysnum_linux.pl +++ b/seccomp/mksysnum_linux.pl diff --git a/sandbox/seccomp/presets.go b/seccomp/presets.go index 4a01d2b0..4a01d2b0 100644 --- a/sandbox/seccomp/presets.go +++ b/seccomp/presets.go diff --git a/sandbox/seccomp/presets_clone_backwards2.go b/seccomp/presets_clone_backwards2.go index 6a7a636e..6a7a636e 100644 --- a/sandbox/seccomp/presets_clone_backwards2.go +++ b/seccomp/presets_clone_backwards2.go diff --git a/sandbox/seccomp/presets_clone_generic.go b/seccomp/presets_clone_generic.go index 9d20890e..9d20890e 100644 --- a/sandbox/seccomp/presets_clone_generic.go +++ b/seccomp/presets_clone_generic.go diff --git a/sandbox/seccomp/proc.go b/seccomp/proc.go index e4ce1853..e4ce1853 100644 --- a/sandbox/seccomp/proc.go +++ b/seccomp/proc.go diff --git a/sandbox/seccomp/seccomp.go b/seccomp/seccomp.go index 664b31c6..664b31c6 100644 --- a/sandbox/seccomp/seccomp.go +++ b/seccomp/seccomp.go diff --git a/sandbox/seccomp/seccomp_test.go b/seccomp/seccomp_test.go index 21198bfd..9b43f461 100644 --- a/sandbox/seccomp/seccomp_test.go +++ b/seccomp/seccomp_test.go @@ -6,7 +6,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/sandbox/seccomp" + "git.gensokyo.uk/security/hakurei/seccomp" ) func TestLibraryError(t *testing.T) { diff --git a/sandbox/seccomp/syscall.go b/seccomp/syscall.go index 36a988aa..36a988aa 100644 --- a/sandbox/seccomp/syscall.go +++ b/seccomp/syscall.go diff --git a/sandbox/seccomp/syscall_extra_linux_amd64.go b/seccomp/syscall_extra_linux_amd64.go index 4b83a876..4b83a876 100644 --- a/sandbox/seccomp/syscall_extra_linux_amd64.go +++ b/seccomp/syscall_extra_linux_amd64.go diff --git a/sandbox/seccomp/syscall_linux_amd64.go b/seccomp/syscall_linux_amd64.go index 28dbcb47..28dbcb47 100644 --- a/sandbox/seccomp/syscall_linux_amd64.go +++ b/seccomp/syscall_linux_amd64.go diff --git a/sandbox/seccomp/syscall_test.go b/seccomp/syscall_test.go index 933f060b..933f060b 100644 --- a/sandbox/seccomp/syscall_test.go +++ b/seccomp/syscall_test.go diff --git a/sandbox/vfs/mangle.go b/vfs/mangle.go index 83aba589..83aba589 100644 --- a/sandbox/vfs/mangle.go +++ b/vfs/mangle.go diff --git a/sandbox/vfs/mangle_test.go b/vfs/mangle_test.go index 101d87e0..54af8fbf 100644 --- a/sandbox/vfs/mangle_test.go +++ b/vfs/mangle_test.go @@ -3,7 +3,7 @@ package vfs_test import ( "testing" - "git.gensokyo.uk/security/hakurei/sandbox/vfs" + "git.gensokyo.uk/security/hakurei/vfs" ) func TestUnmangle(t *testing.T) { diff --git a/sandbox/vfs/mountinfo.go b/vfs/mountinfo.go index bcb3063f..bcb3063f 100644 --- a/sandbox/vfs/mountinfo.go +++ b/vfs/mountinfo.go diff --git a/sandbox/vfs/mountinfo_test.go b/vfs/mountinfo_test.go index 4e1fa3c9..255f1c9c 100644 --- a/sandbox/vfs/mountinfo_test.go +++ b/vfs/mountinfo_test.go @@ -12,7 +12,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/sandbox/vfs" + "git.gensokyo.uk/security/hakurei/vfs" ) func TestMountInfo(t *testing.T) { diff --git a/sandbox/vfs/unfold.go b/vfs/unfold.go index ca0e37b7..ca0e37b7 100644 --- a/sandbox/vfs/unfold.go +++ b/vfs/unfold.go diff --git a/sandbox/vfs/unfold_test.go b/vfs/unfold_test.go index e20fc006..59e52041 100644 --- a/sandbox/vfs/unfold_test.go +++ b/vfs/unfold_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/sandbox/vfs" + "git.gensokyo.uk/security/hakurei/vfs" ) func TestUnfold(t *testing.T) { |
