diff --git a/README.md b/README.md index 86a59f8..fa0ed01 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@

- Go Reference - Go Report Card + Go Reference + Go Report Card

Hakurei is a tool for running sandboxed graphical applications as dedicated subordinate users on the Linux kernel. diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go index 8b379c8..130329e 100644 --- a/cmd/hakurei/command.go +++ b/cmd/hakurei/command.go @@ -13,15 +13,15 @@ import ( "syscall" "time" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app/instance" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" - "git.gensokyo.uk/security/hakurei/command" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/app/instance" + "hakurei.app/cmd/hakurei/internal/state" + "hakurei.app/command" + "hakurei.app/hst" + "hakurei.app/internal" + "hakurei.app/internal/hlog" + "hakurei.app/system" + "hakurei.app/system/dbus" ) func buildCommand(out io.Writer) command.Command { diff --git a/cmd/hakurei/command_test.go b/cmd/hakurei/command_test.go index 7e2b792..dbbcea9 100644 --- a/cmd/hakurei/command_test.go +++ b/cmd/hakurei/command_test.go @@ -6,7 +6,7 @@ import ( "flag" "testing" - "git.gensokyo.uk/security/hakurei/command" + "hakurei.app/command" ) func TestHelp(t *testing.T) { diff --git a/cmd/hakurei/internal/app/app.go b/cmd/hakurei/internal/app/app.go index 94b4907..b76773b 100644 --- a/cmd/hakurei/internal/app/app.go +++ b/cmd/hakurei/internal/app/app.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - "git.gensokyo.uk/security/hakurei/hst" + "hakurei.app/hst" ) type App interface { diff --git a/cmd/hakurei/internal/app/id_test.go b/cmd/hakurei/internal/app/id_test.go index 232421d..1fe18fd 100644 --- a/cmd/hakurei/internal/app/id_test.go +++ b/cmd/hakurei/internal/app/id_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" + . "hakurei.app/cmd/hakurei/internal/app" ) func TestParseAppID(t *testing.T) { diff --git a/cmd/hakurei/internal/app/instance/common/container.go b/cmd/hakurei/internal/app/instance/common/container.go index 3e4740d..5ef9012 100644 --- a/cmd/hakurei/internal/app/instance/common/container.go +++ b/cmd/hakurei/internal/app/instance/common/container.go @@ -8,11 +8,11 @@ import ( "path" "syscall" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/sys" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/container" + "hakurei.app/container/seccomp" + "hakurei.app/hst" + "hakurei.app/internal/sys" + "hakurei.app/system/dbus" ) // in practice there should be less than 30 entries added by the runtime; diff --git a/cmd/hakurei/internal/app/instance/errors.go b/cmd/hakurei/internal/app/instance/errors.go index 9e67208..a5a8113 100644 --- a/cmd/hakurei/internal/app/instance/errors.go +++ b/cmd/hakurei/internal/app/instance/errors.go @@ -3,8 +3,8 @@ package instance import ( "syscall" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app/internal/setuid" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/app/internal/setuid" ) func PrintRunStateErr(whence int, rs *app.RunState, runErr error) (code int) { diff --git a/cmd/hakurei/internal/app/instance/new.go b/cmd/hakurei/internal/app/instance/new.go index 4c4a9c6..7e22f9e 100644 --- a/cmd/hakurei/internal/app/instance/new.go +++ b/cmd/hakurei/internal/app/instance/new.go @@ -6,9 +6,9 @@ import ( "log" "syscall" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app/internal/setuid" - "git.gensokyo.uk/security/hakurei/internal/sys" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/app/internal/setuid" + "hakurei.app/internal/sys" ) const ( diff --git a/cmd/hakurei/internal/app/instance/shim.go b/cmd/hakurei/internal/app/instance/shim.go index b10fae1..f10b282 100644 --- a/cmd/hakurei/internal/app/instance/shim.go +++ b/cmd/hakurei/internal/app/instance/shim.go @@ -1,6 +1,6 @@ package instance -import "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app/internal/setuid" +import "hakurei.app/cmd/hakurei/internal/app/internal/setuid" // ShimMain is the main function of the shim process and runs as the unconstrained target user. func ShimMain() { setuid.ShimMain() } diff --git a/cmd/hakurei/internal/app/internal/setuid/app.go b/cmd/hakurei/internal/app/internal/setuid/app.go index b06c3b0..a8e350f 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app.go +++ b/cmd/hakurei/internal/app/internal/setuid/app.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/internal/sys" + . "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/hst" + "hakurei.app/internal/hlog" + "hakurei.app/internal/sys" ) func New(ctx context.Context, os sys.State) (App, error) { 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 df955af..c4bcaf8 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go @@ -1,13 +1,13 @@ package setuid_test import ( - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/acl" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/container" + "hakurei.app/container/seccomp" + "hakurei.app/hst" + "hakurei.app/system" + "hakurei.app/system/acl" + "hakurei.app/system/dbus" ) var testCasesNixos = []sealTestCase{ 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 ee1eceb..8985465 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app_pd_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/app_pd_test.go @@ -3,13 +3,13 @@ package setuid_test import ( "os" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/acl" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/container" + "hakurei.app/container/seccomp" + "hakurei.app/hst" + "hakurei.app/system" + "hakurei.app/system/acl" + "hakurei.app/system/dbus" ) var testCasesPd = []sealTestCase{ diff --git a/cmd/hakurei/internal/app/internal/setuid/app_stub_test.go b/cmd/hakurei/internal/app/internal/setuid/app_stub_test.go index f3b851d..93a8c3f 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app_stub_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/app_stub_test.go @@ -7,7 +7,7 @@ import ( "os/user" "strconv" - "git.gensokyo.uk/security/hakurei/hst" + "hakurei.app/hst" ) // fs methods are not implemented using a real FS diff --git a/cmd/hakurei/internal/app/internal/setuid/app_test.go b/cmd/hakurei/internal/app/internal/setuid/app_test.go index f95f371..a07f6ac 100644 --- a/cmd/hakurei/internal/app/internal/setuid/app_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/app_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app/internal/setuid" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/sys" - "git.gensokyo.uk/security/hakurei/system" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/app/internal/setuid" + "hakurei.app/container" + "hakurei.app/hst" + "hakurei.app/internal/sys" + "hakurei.app/system" ) type sealTestCase struct { diff --git a/cmd/hakurei/internal/app/internal/setuid/errors.go b/cmd/hakurei/internal/app/internal/setuid/errors.go index bb7dd89..58f88a2 100644 --- a/cmd/hakurei/internal/app/internal/setuid/errors.go +++ b/cmd/hakurei/internal/app/internal/setuid/errors.go @@ -4,8 +4,8 @@ import ( "errors" "log" - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/internal/hlog" + . "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/internal/hlog" ) func PrintRunStateErr(rs *RunState, runErr error) (code int) { diff --git a/cmd/hakurei/internal/app/internal/setuid/export_test.go b/cmd/hakurei/internal/app/internal/setuid/export_test.go index 812215e..5c7dd06 100644 --- a/cmd/hakurei/internal/app/internal/setuid/export_test.go +++ b/cmd/hakurei/internal/app/internal/setuid/export_test.go @@ -1,10 +1,10 @@ package setuid import ( - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/internal/sys" - "git.gensokyo.uk/security/hakurei/system" + . "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/container" + "hakurei.app/internal/sys" + "hakurei.app/system" ) func NewWithID(id ID, os sys.State) App { diff --git a/cmd/hakurei/internal/app/internal/setuid/process.go b/cmd/hakurei/internal/app/internal/setuid/process.go index 28b4211..8bc36e2 100644 --- a/cmd/hakurei/internal/app/internal/setuid/process.go +++ b/cmd/hakurei/internal/app/internal/setuid/process.go @@ -12,12 +12,12 @@ import ( "syscall" "time" - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/system" + . "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/state" + "hakurei.app/container" + "hakurei.app/internal" + "hakurei.app/internal/hlog" + "hakurei.app/system" ) const shimWaitTimeout = 5 * time.Second diff --git a/cmd/hakurei/internal/app/internal/setuid/seal.go b/cmd/hakurei/internal/app/internal/setuid/seal.go index 6c301ff..8e39deb 100644 --- a/cmd/hakurei/internal/app/internal/setuid/seal.go +++ b/cmd/hakurei/internal/app/internal/setuid/seal.go @@ -16,17 +16,17 @@ import ( "sync/atomic" "syscall" - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app/instance/common" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/internal/sys" - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/acl" - "git.gensokyo.uk/security/hakurei/system/dbus" - "git.gensokyo.uk/security/hakurei/system/wayland" + . "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/app/instance/common" + "hakurei.app/container" + "hakurei.app/hst" + "hakurei.app/internal" + "hakurei.app/internal/hlog" + "hakurei.app/internal/sys" + "hakurei.app/system" + "hakurei.app/system/acl" + "hakurei.app/system/dbus" + "hakurei.app/system/wayland" ) const ( diff --git a/cmd/hakurei/internal/app/internal/setuid/shim.go b/cmd/hakurei/internal/app/internal/setuid/shim.go index 264ee0a..3751e87 100644 --- a/cmd/hakurei/internal/app/internal/setuid/shim.go +++ b/cmd/hakurei/internal/app/internal/setuid/shim.go @@ -10,10 +10,10 @@ import ( "syscall" "time" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/container" + "hakurei.app/container/seccomp" + "hakurei.app/internal" + "hakurei.app/internal/hlog" ) /* diff --git a/cmd/hakurei/internal/app/internal/setuid/strings.go b/cmd/hakurei/internal/app/internal/setuid/strings.go index 6521def..274dcc4 100644 --- a/cmd/hakurei/internal/app/internal/setuid/strings.go +++ b/cmd/hakurei/internal/app/internal/setuid/strings.go @@ -3,7 +3,7 @@ package setuid import ( "strconv" - . "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" + . "hakurei.app/cmd/hakurei/internal/app" ) func newInt(v int) *stringPair[int] { return &stringPair[int]{v, strconv.Itoa(v)} } diff --git a/cmd/hakurei/internal/state/multi.go b/cmd/hakurei/internal/state/multi.go index cd66c8c..1b26c88 100644 --- a/cmd/hakurei/internal/state/multi.go +++ b/cmd/hakurei/internal/state/multi.go @@ -13,9 +13,9 @@ import ( "sync" "syscall" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/hst" + "hakurei.app/internal/hlog" ) // fine-grained locking and access diff --git a/cmd/hakurei/internal/state/multi_test.go b/cmd/hakurei/internal/state/multi_test.go index 6097b0a..396c660 100644 --- a/cmd/hakurei/internal/state/multi_test.go +++ b/cmd/hakurei/internal/state/multi_test.go @@ -3,7 +3,7 @@ package state_test import ( "testing" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" + "hakurei.app/cmd/hakurei/internal/state" ) func TestMulti(t *testing.T) { testStore(t, state.NewMulti(t.TempDir())) } diff --git a/cmd/hakurei/internal/state/state.go b/cmd/hakurei/internal/state/state.go index ad92ff0..787396a 100644 --- a/cmd/hakurei/internal/state/state.go +++ b/cmd/hakurei/internal/state/state.go @@ -5,8 +5,8 @@ import ( "io" "time" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/hst" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/hst" ) var ErrNoConfig = errors.New("state does not contain config") diff --git a/cmd/hakurei/internal/state/state_test.go b/cmd/hakurei/internal/state/state_test.go index 6c49fc4..dce7e44 100644 --- a/cmd/hakurei/internal/state/state_test.go +++ b/cmd/hakurei/internal/state/state_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" - "git.gensokyo.uk/security/hakurei/hst" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/state" + "hakurei.app/hst" ) func testStore(t *testing.T, s state.Store) { diff --git a/cmd/hakurei/main.go b/cmd/hakurei/main.go index 11259a0..7e223cd 100644 --- a/cmd/hakurei/main.go +++ b/cmd/hakurei/main.go @@ -9,10 +9,10 @@ import ( "log" "os" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/internal/sys" + "hakurei.app/container" + "hakurei.app/internal" + "hakurei.app/internal/hlog" + "hakurei.app/internal/sys" ) var ( diff --git a/cmd/hakurei/parse.go b/cmd/hakurei/parse.go index aee71c2..16ece2f 100644 --- a/cmd/hakurei/parse.go +++ b/cmd/hakurei/parse.go @@ -10,9 +10,9 @@ import ( "strings" "syscall" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/cmd/hakurei/internal/state" + "hakurei.app/hst" + "hakurei.app/internal/hlog" ) func tryPath(name string) (config *hst.Config) { diff --git a/cmd/hakurei/print.go b/cmd/hakurei/print.go index e054492..477ae3e 100644 --- a/cmd/hakurei/print.go +++ b/cmd/hakurei/print.go @@ -12,10 +12,10 @@ import ( "text/tabwriter" "time" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/cmd/hakurei/internal/state" + "hakurei.app/hst" + "hakurei.app/internal/hlog" + "hakurei.app/system/dbus" ) func printShowSystem(output io.Writer, short, flagJSON bool) { diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index 1525fdf..4e047bb 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/app" - "git.gensokyo.uk/security/hakurei/cmd/hakurei/internal/state" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/cmd/hakurei/internal/app" + "hakurei.app/cmd/hakurei/internal/state" + "hakurei.app/hst" + "hakurei.app/system/dbus" ) var ( diff --git a/cmd/planterette/app.go b/cmd/planterette/app.go index 41e1e02..082bc28 100644 --- a/cmd/planterette/app.go +++ b/cmd/planterette/app.go @@ -6,10 +6,10 @@ import ( "os" "path" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/container/seccomp" + "hakurei.app/hst" + "hakurei.app/system" + "hakurei.app/system/dbus" ) type appInfo struct { diff --git a/cmd/planterette/main.go b/cmd/planterette/main.go index a9f45d8..75983a4 100644 --- a/cmd/planterette/main.go +++ b/cmd/planterette/main.go @@ -10,10 +10,10 @@ import ( "path" "syscall" - "git.gensokyo.uk/security/hakurei/command" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/command" + "hakurei.app/hst" + "hakurei.app/internal" + "hakurei.app/internal/hlog" ) const shellPath = "/run/current-system/sw/bin/bash" diff --git a/cmd/planterette/paths.go b/cmd/planterette/paths.go index aa581c9..11715fb 100644 --- a/cmd/planterette/paths.go +++ b/cmd/planterette/paths.go @@ -8,8 +8,8 @@ import ( "strconv" "sync/atomic" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/hst" + "hakurei.app/internal/hlog" ) var ( diff --git a/cmd/planterette/proc.go b/cmd/planterette/proc.go index 78677fa..d374e13 100644 --- a/cmd/planterette/proc.go +++ b/cmd/planterette/proc.go @@ -9,9 +9,9 @@ import ( "os" "os/exec" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/hst" + "hakurei.app/internal" + "hakurei.app/internal/hlog" ) var hakureiPath = internal.MustHakureiPath() diff --git a/cmd/planterette/with.go b/cmd/planterette/with.go index 76e0861..7d9fc7b 100644 --- a/cmd/planterette/with.go +++ b/cmd/planterette/with.go @@ -5,9 +5,9 @@ import ( "path" "strings" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" + "hakurei.app/container/seccomp" + "hakurei.app/hst" + "hakurei.app/internal" ) func withNixDaemon( diff --git a/command/builder_test.go b/command/builder_test.go index f7a7a8f..9523184 100644 --- a/command/builder_test.go +++ b/command/builder_test.go @@ -3,7 +3,7 @@ package command_test import ( "testing" - "git.gensokyo.uk/security/hakurei/command" + "hakurei.app/command" ) func TestBuild(t *testing.T) { diff --git a/command/parse_test.go b/command/parse_test.go index b9150a3..ce013f2 100644 --- a/command/parse_test.go +++ b/command/parse_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "git.gensokyo.uk/security/hakurei/command" + "hakurei.app/command" ) func TestParse(t *testing.T) { diff --git a/container/container.go b/container/container.go index 62aa16d..8001673 100644 --- a/container/container.go +++ b/container/container.go @@ -14,7 +14,7 @@ import ( . "syscall" "time" - "git.gensokyo.uk/security/hakurei/container/seccomp" + "hakurei.app/container/seccomp" ) type ( diff --git a/container/container_test.go b/container/container_test.go index 95f5361..4ded1fb 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/container/vfs" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/ldd" + "hakurei.app/container" + "hakurei.app/container/seccomp" + "hakurei.app/container/vfs" + "hakurei.app/hst" + "hakurei.app/internal" + "hakurei.app/internal/hlog" + "hakurei.app/ldd" ) const ( diff --git a/container/executable_test.go b/container/executable_test.go index 00e67b7..2a44017 100644 --- a/container/executable_test.go +++ b/container/executable_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "git.gensokyo.uk/security/hakurei/container" + "hakurei.app/container" ) func TestExecutable(t *testing.T) { diff --git a/container/init.go b/container/init.go index 18d38c3..8fc8e22 100644 --- a/container/init.go +++ b/container/init.go @@ -13,7 +13,7 @@ import ( . "syscall" "time" - "git.gensokyo.uk/security/hakurei/container/seccomp" + "hakurei.app/container/seccomp" ) const ( diff --git a/container/mount.go b/container/mount.go index eddec2f..52563d7 100644 --- a/container/mount.go +++ b/container/mount.go @@ -7,7 +7,7 @@ import ( "path/filepath" . "syscall" - "git.gensokyo.uk/security/hakurei/container/vfs" + "hakurei.app/container/vfs" ) func (p *procPaths) bindMount(source, target string, flags uintptr, eq bool) error { diff --git a/container/path.go b/container/path.go index a3938ff..632892a 100644 --- a/container/path.go +++ b/container/path.go @@ -10,7 +10,7 @@ import ( "strings" "syscall" - "git.gensokyo.uk/security/hakurei/container/vfs" + "hakurei.app/container/vfs" ) const ( diff --git a/container/seccomp/libseccomp_test.go b/container/seccomp/libseccomp_test.go index a8bfcbf..4e18934 100644 --- a/container/seccomp/libseccomp_test.go +++ b/container/seccomp/libseccomp_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - . "git.gensokyo.uk/security/hakurei/container/seccomp" + . "hakurei.app/container/seccomp" ) func TestExport(t *testing.T) { diff --git a/container/seccomp/proc.go b/container/seccomp/proc.go index e4ce185..76773b2 100644 --- a/container/seccomp/proc.go +++ b/container/seccomp/proc.go @@ -5,7 +5,7 @@ import ( "errors" "syscall" - "git.gensokyo.uk/security/hakurei/helper/proc" + "hakurei.app/helper/proc" ) const ( diff --git a/container/seccomp/seccomp_test.go b/container/seccomp/seccomp_test.go index 2b59c9b..a3dcad5 100644 --- a/container/seccomp/seccomp_test.go +++ b/container/seccomp/seccomp_test.go @@ -6,7 +6,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/container/seccomp" + "hakurei.app/container/seccomp" ) func TestLibraryError(t *testing.T) { diff --git a/container/vfs/mangle_test.go b/container/vfs/mangle_test.go index d9444a8..2cc65be 100644 --- a/container/vfs/mangle_test.go +++ b/container/vfs/mangle_test.go @@ -3,7 +3,7 @@ package vfs_test import ( "testing" - "git.gensokyo.uk/security/hakurei/container/vfs" + "hakurei.app/container/vfs" ) func TestUnmangle(t *testing.T) { diff --git a/container/vfs/mountinfo_test.go b/container/vfs/mountinfo_test.go index cec7dcd..fa75b3c 100644 --- a/container/vfs/mountinfo_test.go +++ b/container/vfs/mountinfo_test.go @@ -12,7 +12,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/container/vfs" + "hakurei.app/container/vfs" ) func TestMountInfo(t *testing.T) { diff --git a/container/vfs/unfold_test.go b/container/vfs/unfold_test.go index c464e0f..cd6ace1 100644 --- a/container/vfs/unfold_test.go +++ b/container/vfs/unfold_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/container/vfs" + "hakurei.app/container/vfs" ) func TestUnfold(t *testing.T) { diff --git a/dist/release.sh b/dist/release.sh index 3330e6f..f547de0 100755 --- a/dist/release.sh +++ b/dist/release.sh @@ -10,11 +10,11 @@ cp -rv "dist/comp" "${out}" go generate ./... go build -trimpath -v -o "${out}/bin/" -ldflags "-s -w -buildid= -extldflags '-static' - -X git.gensokyo.uk/security/hakurei/internal.version=${VERSION} - -X git.gensokyo.uk/security/hakurei/internal.hmain=/usr/bin/hakurei - -X git.gensokyo.uk/security/hakurei/internal.hsu=/usr/bin/hsu + -X hakurei.app/internal.version=${VERSION} + -X hakurei.app/internal.hmain=/usr/bin/hakurei + -X hakurei.app/internal.hsu=/usr/bin/hsu -X main.hmain=/usr/bin/hakurei" ./... rm -f "./${out}.tar.gz" && tar -C dist -czf "${out}.tar.gz" "${pname}" rm -rf "./${out}" -(cd dist && sha512sum "${pname}.tar.gz" > "${pname}.tar.gz.sha512") \ No newline at end of file +(cd dist && sha512sum "${pname}.tar.gz" > "${pname}.tar.gz.sha512") diff --git a/go.mod b/go.mod index 79b18f0..fd5a95e 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module git.gensokyo.uk/security/hakurei +module hakurei.app go 1.24 diff --git a/helper/args_test.go b/helper/args_test.go index 8547f4c..e22842e 100644 --- a/helper/args_test.go +++ b/helper/args_test.go @@ -7,7 +7,7 @@ import ( "syscall" "testing" - "git.gensokyo.uk/security/hakurei/helper" + "hakurei.app/helper" ) func TestArgsString(t *testing.T) { diff --git a/helper/cmd.go b/helper/cmd.go index 55fd52e..9a5bc3a 100644 --- a/helper/cmd.go +++ b/helper/cmd.go @@ -10,7 +10,7 @@ import ( "sync" "syscall" - "git.gensokyo.uk/security/hakurei/helper/proc" + "hakurei.app/helper/proc" ) // NewDirect initialises a new direct Helper instance with wt as the null-terminated argument writer. diff --git a/helper/cmd_test.go b/helper/cmd_test.go index 555e246..00342e6 100644 --- a/helper/cmd_test.go +++ b/helper/cmd_test.go @@ -8,7 +8,7 @@ import ( "os/exec" "testing" - "git.gensokyo.uk/security/hakurei/helper" + "hakurei.app/helper" ) func TestCmd(t *testing.T) { diff --git a/helper/container.go b/helper/container.go index dbff368..14afde8 100644 --- a/helper/container.go +++ b/helper/container.go @@ -9,8 +9,8 @@ import ( "slices" "sync" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/helper/proc" + "hakurei.app/container" + "hakurei.app/helper/proc" ) // 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 574b24b..a65e87f 100644 --- a/helper/container_test.go +++ b/helper/container_test.go @@ -7,10 +7,10 @@ import ( "os/exec" "testing" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/helper" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/container" + "hakurei.app/helper" + "hakurei.app/internal" + "hakurei.app/internal/hlog" ) func TestContainer(t *testing.T) { diff --git a/helper/helper.go b/helper/helper.go index fe0b164..60bd761 100644 --- a/helper/helper.go +++ b/helper/helper.go @@ -8,7 +8,7 @@ import ( "os" "time" - "git.gensokyo.uk/security/hakurei/helper/proc" + "hakurei.app/helper/proc" ) var WaitDelay = 2 * time.Second diff --git a/helper/helper_test.go b/helper/helper_test.go index f2ae5c2..cc6f892 100644 --- a/helper/helper_test.go +++ b/helper/helper_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei/helper" + "hakurei.app/helper" ) var ( diff --git a/helper/stub_test.go b/helper/stub_test.go index 52973f6..e496f14 100644 --- a/helper/stub_test.go +++ b/helper/stub_test.go @@ -3,7 +3,7 @@ package helper_test import ( "testing" - "git.gensokyo.uk/security/hakurei/helper" + "hakurei.app/helper" ) func TestHelperStub(t *testing.T) { helper.InternalHelperStub() } diff --git a/hst/config.go b/hst/config.go index 48ce230..8c883c9 100644 --- a/hst/config.go +++ b/hst/config.go @@ -2,8 +2,8 @@ package hst import ( - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/system" + "hakurei.app/system/dbus" ) const Tmp = "/.hakurei" diff --git a/hst/container.go b/hst/container.go index f0e2dec..00f7479 100644 --- a/hst/container.go +++ b/hst/container.go @@ -1,7 +1,7 @@ package hst import ( - "git.gensokyo.uk/security/hakurei/container/seccomp" + "hakurei.app/container/seccomp" ) type ( diff --git a/hst/template.go b/hst/template.go index 5e1e8cc..3f0101e 100644 --- a/hst/template.go +++ b/hst/template.go @@ -1,9 +1,9 @@ package hst import ( - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/system" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/container/seccomp" + "hakurei.app/system" + "hakurei.app/system/dbus" ) // Template returns a fully populated instance of Config. diff --git a/hst/template_test.go b/hst/template_test.go index ad56331..2baf991 100644 --- a/hst/template_test.go +++ b/hst/template_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "git.gensokyo.uk/security/hakurei/hst" + "hakurei.app/hst" ) func TestTemplate(t *testing.T) { diff --git a/internal/exit.go b/internal/exit.go index 0e8242e..fe2a7ce 100644 --- a/internal/exit.go +++ b/internal/exit.go @@ -3,7 +3,7 @@ package internal import ( "os" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/internal/hlog" ) func Exit(code int) { hlog.BeforeExit(); os.Exit(code) } diff --git a/internal/output.go b/internal/output.go index 4e14868..1d2b0d8 100644 --- a/internal/output.go +++ b/internal/output.go @@ -1,9 +1,9 @@ package internal import ( - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/system" + "hakurei.app/container" + "hakurei.app/internal/hlog" + "hakurei.app/system" ) func InstallOutput(verbose bool) { diff --git a/internal/path.go b/internal/path.go index e910287..81af5a2 100644 --- a/internal/path.go +++ b/internal/path.go @@ -4,7 +4,7 @@ import ( "log" "path" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/internal/hlog" ) var ( diff --git a/internal/sys/interface.go b/internal/sys/interface.go index 06cb450..04bfe13 100644 --- a/internal/sys/interface.go +++ b/internal/sys/interface.go @@ -7,8 +7,8 @@ import ( "path" "strconv" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/hst" + "hakurei.app/internal/hlog" ) // State provides safe interaction with operating system state. diff --git a/internal/sys/std.go b/internal/sys/std.go index af46117..60baac1 100644 --- a/internal/sys/std.go +++ b/internal/sys/std.go @@ -12,10 +12,10 @@ import ( "sync" "syscall" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/hst" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" + "hakurei.app/container" + "hakurei.app/hst" + "hakurei.app/internal" + "hakurei.app/internal/hlog" ) // Std implements System using the standard library. diff --git a/ldd/exec.go b/ldd/exec.go index 2fa2ec4..2544050 100644 --- a/ldd/exec.go +++ b/ldd/exec.go @@ -8,8 +8,8 @@ import ( "os/exec" "time" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" + "hakurei.app/container" + "hakurei.app/container/seccomp" ) const lddTimeout = 2 * time.Second diff --git a/ldd/ldd_test.go b/ldd/ldd_test.go index 35615fa..707154a 100644 --- a/ldd/ldd_test.go +++ b/ldd/ldd_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "git.gensokyo.uk/security/hakurei/ldd" + "hakurei.app/ldd" ) func TestParseError(t *testing.T) { diff --git a/package.nix b/package.nix index 129921c..e2cce4c 100644 --- a/package.nix +++ b/package.nix @@ -65,7 +65,7 @@ buildGoModule rec { lib.attrsets.foldlAttrs ( ldflags: name: value: - ldflags ++ [ "-X git.gensokyo.uk/security/hakurei/internal.${name}=${value}" ] + ldflags ++ [ "-X hakurei.app/internal.${name}=${value}" ] ) ( [ "-s -w" ] diff --git a/system/acl.go b/system/acl.go index 2efd725..5d48c6c 100644 --- a/system/acl.go +++ b/system/acl.go @@ -6,7 +6,7 @@ import ( "os" "slices" - "git.gensokyo.uk/security/hakurei/system/acl" + "hakurei.app/system/acl" ) // UpdatePerm appends an ephemeral acl update Op. diff --git a/system/acl/acl_test.go b/system/acl/acl_test.go index bfb355e..250dcd2 100644 --- a/system/acl/acl_test.go +++ b/system/acl/acl_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "git.gensokyo.uk/security/hakurei/system/acl" + "hakurei.app/system/acl" ) const testFileName = "acl.test" diff --git a/system/acl_test.go b/system/acl_test.go index f8f2832..a66207e 100644 --- a/system/acl_test.go +++ b/system/acl_test.go @@ -3,7 +3,7 @@ package system import ( "testing" - "git.gensokyo.uk/security/hakurei/system/acl" + "hakurei.app/system/acl" ) func TestUpdatePerm(t *testing.T) { diff --git a/system/dbus.go b/system/dbus.go index 8ca20e7..f6f4a2a 100644 --- a/system/dbus.go +++ b/system/dbus.go @@ -9,7 +9,7 @@ import ( "sync" "syscall" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/system/dbus" ) var ( diff --git a/system/dbus/address_test.go b/system/dbus/address_test.go index 148bb09..6bd0627 100644 --- a/system/dbus/address_test.go +++ b/system/dbus/address_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/system/dbus" ) func TestParse(t *testing.T) { diff --git a/system/dbus/config_test.go b/system/dbus/config_test.go index f79c4c5..0fe9330 100644 --- a/system/dbus/config_test.go +++ b/system/dbus/config_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/system/dbus" ) func TestConfig_Args(t *testing.T) { diff --git a/system/dbus/dbus_test.go b/system/dbus/dbus_test.go index 6fd2367..919e13a 100644 --- a/system/dbus/dbus_test.go +++ b/system/dbus/dbus_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/helper" - "git.gensokyo.uk/security/hakurei/internal" - "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/container" + "hakurei.app/helper" + "hakurei.app/internal" + "hakurei.app/internal/hlog" + "hakurei.app/system/dbus" ) func TestFinalise(t *testing.T) { diff --git a/system/dbus/proc.go b/system/dbus/proc.go index cb041d0..879bc77 100644 --- a/system/dbus/proc.go +++ b/system/dbus/proc.go @@ -11,10 +11,10 @@ import ( "strconv" "syscall" - "git.gensokyo.uk/security/hakurei/container" - "git.gensokyo.uk/security/hakurei/container/seccomp" - "git.gensokyo.uk/security/hakurei/helper" - "git.gensokyo.uk/security/hakurei/ldd" + "hakurei.app/container" + "hakurei.app/container/seccomp" + "hakurei.app/helper" + "hakurei.app/ldd" ) // Start starts and configures a D-Bus proxy process. diff --git a/system/dbus/proxy.go b/system/dbus/proxy.go index cc0af1e..8fed8f2 100644 --- a/system/dbus/proxy.go +++ b/system/dbus/proxy.go @@ -8,7 +8,7 @@ import ( "sync" "syscall" - "git.gensokyo.uk/security/hakurei/helper" + "hakurei.app/helper" ) // ProxyName is the file name or path to the proxy program. diff --git a/system/dbus/samples_test.go b/system/dbus/samples_test.go index a5c6f27..43dda76 100644 --- a/system/dbus/samples_test.go +++ b/system/dbus/samples_test.go @@ -3,7 +3,7 @@ package dbus_test import ( "sync" - "git.gensokyo.uk/security/hakurei/system/dbus" + "hakurei.app/system/dbus" ) const ( diff --git a/system/dbus/stub_test.go b/system/dbus/stub_test.go index b05efd6..7972539 100644 --- a/system/dbus/stub_test.go +++ b/system/dbus/stub_test.go @@ -3,7 +3,7 @@ package dbus_test import ( "testing" - "git.gensokyo.uk/security/hakurei/helper" + "hakurei.app/helper" ) func TestHelperStub(t *testing.T) { helper.InternalHelperStub() } diff --git a/system/enablement_test.go b/system/enablement_test.go index 69d16f7..ba81656 100644 --- a/system/enablement_test.go +++ b/system/enablement_test.go @@ -3,7 +3,7 @@ package system_test import ( "testing" - "git.gensokyo.uk/security/hakurei/system" + "hakurei.app/system" ) func TestEnablementString(t *testing.T) { diff --git a/system/op_test.go b/system/op_test.go index b5baf14..d11bcfa 100644 --- a/system/op_test.go +++ b/system/op_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "git.gensokyo.uk/security/hakurei/system" + "hakurei.app/system" ) func TestNew(t *testing.T) { diff --git a/system/output.go b/system/output.go index d431310..303f749 100644 --- a/system/output.go +++ b/system/output.go @@ -1,7 +1,7 @@ package system import ( - "git.gensokyo.uk/security/hakurei/container" + "hakurei.app/container" ) var msg container.Msg = new(container.DefaultMsg) diff --git a/system/wayland.go b/system/wayland.go index a485b3f..4705acb 100644 --- a/system/wayland.go +++ b/system/wayland.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "git.gensokyo.uk/security/hakurei/system/acl" - "git.gensokyo.uk/security/hakurei/system/wayland" + "hakurei.app/system/acl" + "hakurei.app/system/wayland" ) // Wayland sets up a wayland socket with a security context attached. diff --git a/system/xhost.go b/system/xhost.go index dcb2eff..7bbc372 100644 --- a/system/xhost.go +++ b/system/xhost.go @@ -3,7 +3,7 @@ package system import ( "fmt" - "git.gensokyo.uk/security/hakurei/system/internal/xcb" + "hakurei.app/system/internal/xcb" ) // ChangeHosts appends an X11 ChangeHosts command Op. diff --git a/test/sandbox/fs_test.go b/test/sandbox/fs_test.go index e7253af..4486872 100644 --- a/test/sandbox/fs_test.go +++ b/test/sandbox/fs_test.go @@ -8,7 +8,7 @@ import ( "testing" "testing/fstest" - "git.gensokyo.uk/security/hakurei/test/sandbox" + "hakurei.app/test/sandbox" ) var ( diff --git a/test/sandbox/mount_test.go b/test/sandbox/mount_test.go index 6a8fc7a..43970b2 100644 --- a/test/sandbox/mount_test.go +++ b/test/sandbox/mount_test.go @@ -5,7 +5,7 @@ import ( "path" "testing" - "git.gensokyo.uk/security/hakurei/test/sandbox" + "hakurei.app/test/sandbox" ) func TestMountinfo(t *testing.T) { diff --git a/test/sandbox/tool/main.go b/test/sandbox/tool/main.go index a9a9ee0..7731074 100644 --- a/test/sandbox/tool/main.go +++ b/test/sandbox/tool/main.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "git.gensokyo.uk/security/hakurei/test/sandbox" + "hakurei.app/test/sandbox" ) func main() { diff --git a/test/sandbox/tool/package.nix b/test/sandbox/tool/package.nix index d003cfa..43e21ca 100644 --- a/test/sandbox/tool/package.nix +++ b/test/sandbox/tool/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; preBuild = '' - go mod init git.gensokyo.uk/security/hakurei/test/sandbox >& /dev/null + go mod init hakurei.app/test/sandbox >& /dev/null ''; postInstall = ''