security/hakurei
6
3
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

treewide: migrate to hakurei.app
All checks were successful
Test / Create distribution (push) Successful in 24s
Details
Test / Sandbox (push) Successful in 46s
Details
Test / Hakurei (push) Successful in 2m9s
Details
Test / Sandbox (race detector) (push) Successful in 3m14s
Details
Test / Planterette (push) Successful in 3m41s
Details
Test / Hakurei (race detector) (push) Successful in 3m40s
Details
Test / Flake checks (push) Successful in 1m18s
Details

Browse Source 
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-07-03 03:30:39 +09:00
parent 1b5ecd9eaf
commit d2f9a9b83b
89 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/hakurei/command.go
View File

@@ -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 {

2
cmd/hakurei/command_test.go
View File

@@ -6,7 +6,7 @@ import (
"flag"
"testing"
"git.gensokyo.uk/security/hakurei/command"
"hakurei.app/command"
)
func TestHelp(t *testing.T) {

2
cmd/hakurei/internal/app/app.go
View File

@@ -5,7 +5,7 @@ import (
"syscall"
"time"
"git.gensokyo.uk/security/hakurei/hst"
"hakurei.app/hst"
)
type App interface {

2
cmd/hakurei/internal/app/id_test.go
View File

@@ -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) {

10
cmd/hakurei/internal/app/instance/common/container.go
View File

@@ -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;

4
cmd/hakurei/internal/app/instance/errors.go
View File

@@ -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) {

6
cmd/hakurei/internal/app/instance/new.go
View File

@@ -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 (

2
cmd/hakurei/internal/app/instance/shim.go
View File

@@ -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() }

8
cmd/hakurei/internal/app/internal/setuid/app.go
View File

@@ -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) {

14
cmd/hakurei/internal/app/internal/setuid/app_nixos_test.go
View File

@@ -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{

14
cmd/hakurei/internal/app/internal/setuid/app_pd_test.go
View File

@@ -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{

2
cmd/hakurei/internal/app/internal/setuid/app_stub_test.go
View File

@@ -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

12
cmd/hakurei/internal/app/internal/setuid/app_test.go
View File

@@ -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 {

4
cmd/hakurei/internal/app/internal/setuid/errors.go
View File

@@ -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) {

8
cmd/hakurei/internal/app/internal/setuid/export_test.go
View File

@@ -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 {

12
cmd/hakurei/internal/app/internal/setuid/process.go
View File

@@ -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

22
cmd/hakurei/internal/app/internal/setuid/seal.go
View File

@@ -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 (

8
cmd/hakurei/internal/app/internal/setuid/shim.go
View File

@@ -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"
)
/*

2
cmd/hakurei/internal/app/internal/setuid/strings.go
View File

@@ -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)} }

6
cmd/hakurei/internal/state/multi.go
View File

@@ -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

2
cmd/hakurei/internal/state/multi_test.go
View File

@@ -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())) }

4
cmd/hakurei/internal/state/state.go
View File

@@ -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")

6
cmd/hakurei/internal/state/state_test.go
View File

@@ -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) {

8
cmd/hakurei/main.go
View File

@@ -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 (

6
cmd/hakurei/parse.go
View File

@@ -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) {

8
cmd/hakurei/print.go
View File

@@ -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) {

8
cmd/hakurei/print_test.go
View File

@@ -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 (

8
cmd/planterette/app.go
View File

@@ -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 {

8
cmd/planterette/main.go
View File

@@ -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"

4
cmd/planterette/paths.go
View File

@@ -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 (

6
cmd/planterette/proc.go
View File

@@ -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()

6
cmd/planterette/with.go
View File

@@ -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(