aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/app
diff options
context:
space:
mode:
Diffstat (limited to 'internal/app')
-rw-r--r--internal/app/env.go59
-rw-r--r--internal/app/env_test.go137
-rw-r--r--internal/app/outcome.go7
-rw-r--r--internal/app/outcome_test.go9
-rw-r--r--internal/app/shim_test.go3
5 files changed, 11 insertions, 204 deletions
diff --git a/internal/app/env.go b/internal/app/env.go
deleted file mode 100644
index e6d137fc..00000000
--- a/internal/app/env.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package app
-
-import (
- "strconv"
-
- "hakurei.app/container/check"
- "hakurei.app/hst"
-)
-
-// EnvPaths holds paths copied from the environment and is used to create [hst.Paths].
-type EnvPaths struct {
- // TempDir is returned by [os.TempDir].
- TempDir *check.Absolute
- // RuntimePath is copied from $XDG_RUNTIME_DIR.
- RuntimePath *check.Absolute
-}
-
-// Copy expands [EnvPaths] into [hst.Paths].
-func (env *EnvPaths) Copy(v *hst.Paths, userid int) {
- if env == nil || env.TempDir == nil || v == nil {
- panic("attempting to use an invalid EnvPaths")
- }
-
- v.TempDir = env.TempDir
- v.SharePath = env.TempDir.Append("hakurei." + strconv.Itoa(userid))
-
- if env.RuntimePath == nil {
- // fall back to path in share since hakurei has no hard XDG dependency
- v.RunDirPath = v.SharePath.Append("run")
- v.RuntimePath = v.RunDirPath.Append("compat")
- } else {
- v.RuntimePath = env.RuntimePath
- v.RunDirPath = env.RuntimePath.Append("hakurei")
- }
-}
-
-// CopyPaths returns a populated [EnvPaths].
-func CopyPaths() *EnvPaths { return copyPaths(direct{}) }
-
-// copyPaths returns a populated [EnvPaths].
-func copyPaths(k syscallDispatcher) *EnvPaths {
- const xdgRuntimeDir = "XDG_RUNTIME_DIR"
-
- var env EnvPaths
-
- if tempDir, err := check.NewAbs(k.tempdir()); err != nil {
- k.fatalf("invalid TMPDIR: %v", err)
- panic("unreachable")
- } else {
- env.TempDir = tempDir
- }
-
- r, _ := k.lookupEnv(xdgRuntimeDir)
- if a, err := check.NewAbs(r); err == nil {
- env.RuntimePath = a
- }
-
- return &env
-}
diff --git a/internal/app/env_test.go b/internal/app/env_test.go
deleted file mode 100644
index 9e2c959e..00000000
--- a/internal/app/env_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package app
-
-import (
- "fmt"
- "reflect"
- "testing"
-
- "hakurei.app/container"
- "hakurei.app/container/check"
- "hakurei.app/container/fhs"
- "hakurei.app/container/stub"
- "hakurei.app/hst"
-)
-
-func TestEnvPaths(t *testing.T) {
- t.Parallel()
-
- testCases := []struct {
- name string
- env *EnvPaths
- want hst.Paths
-
- wantPanic string
- }{
- {"nil", nil, hst.Paths{}, "attempting to use an invalid EnvPaths"},
- {"zero", new(EnvPaths), hst.Paths{}, "attempting to use an invalid EnvPaths"},
-
- {"nil tempdir", &EnvPaths{
- RuntimePath: fhs.AbsTmp,
- }, hst.Paths{}, "attempting to use an invalid EnvPaths"},
-
- {"nil runtime", &EnvPaths{
- TempDir: fhs.AbsTmp,
- }, hst.Paths{
- TempDir: fhs.AbsTmp,
- SharePath: fhs.AbsTmp.Append("hakurei.3735928559"),
- RuntimePath: fhs.AbsTmp.Append("hakurei.3735928559/run/compat"),
- RunDirPath: fhs.AbsTmp.Append("hakurei.3735928559/run"),
- }, ""},
-
- {"full", &EnvPaths{
- TempDir: fhs.AbsTmp,
- RuntimePath: fhs.AbsRunUser.Append("1000"),
- }, hst.Paths{
- TempDir: fhs.AbsTmp,
- SharePath: fhs.AbsTmp.Append("hakurei.3735928559"),
- RuntimePath: fhs.AbsRunUser.Append("1000"),
- RunDirPath: fhs.AbsRunUser.Append("1000/hakurei"),
- }, ""},
- }
- for _, tc := range testCases {
- t.Run(tc.name, func(t *testing.T) {
- t.Parallel()
- if tc.wantPanic != "" {
- defer func() {
- if r := recover(); r != tc.wantPanic {
- t.Errorf("Copy: panic = %#v, want %q", r, tc.wantPanic)
- }
- }()
- }
-
- var sc hst.Paths
- tc.env.Copy(&sc, 0xdeadbeef)
- if !reflect.DeepEqual(&sc, &tc.want) {
- t.Errorf("Copy: %#v, want %#v", sc, tc.want)
- }
- })
- }
-}
-
-func TestCopyPaths(t *testing.T) {
- t.Parallel()
-
- testCases := []struct {
- name string
- env map[string]string
- tmp string
- fatal string
- want EnvPaths
- }{
- {"invalid tempdir", nil, "\x00",
- "invalid TMPDIR: path \"\\x00\" is not absolute", EnvPaths{}},
- {"empty environment", make(map[string]string), container.Nonexistent,
- "", EnvPaths{TempDir: check.MustAbs(container.Nonexistent)}},
- {"invalid XDG_RUNTIME_DIR", map[string]string{"XDG_RUNTIME_DIR": "\x00"}, container.Nonexistent,
- "", EnvPaths{TempDir: check.MustAbs(container.Nonexistent)}},
- {"full", map[string]string{"XDG_RUNTIME_DIR": "/\x00"}, container.Nonexistent,
- "", EnvPaths{TempDir: check.MustAbs(container.Nonexistent), RuntimePath: check.MustAbs("/\x00")}},
- }
- for _, tc := range testCases {
- t.Run(tc.name, func(t *testing.T) {
- t.Parallel()
- if tc.fatal != "" {
- defer stub.HandleExit(t)
- }
-
- k := copyPathsDispatcher{t: t, env: tc.env, tmp: tc.tmp, expectsFatal: tc.fatal}
- got := copyPaths(k)
-
- if tc.fatal != "" {
- t.Fatalf("copyPaths: expected fatal %q", tc.fatal)
- }
-
- if !reflect.DeepEqual(got, &tc.want) {
- t.Errorf("copyPaths: %#v, want %#v", got, &tc.want)
- }
- })
- }
-}
-
-// copyPathsDispatcher implements enough of syscallDispatcher for all copyPaths code paths.
-type copyPathsDispatcher struct {
- env map[string]string
- tmp string
-
- // must be checked at the conclusion of the test
- expectsFatal string
-
- t *testing.T
- panicDispatcher
-}
-
-func (k copyPathsDispatcher) tempdir() string { return k.tmp }
-func (k copyPathsDispatcher) lookupEnv(key string) (value string, ok bool) {
- value, ok = k.env[key]
- return
-}
-func (k copyPathsDispatcher) fatalf(format string, v ...any) {
- if k.expectsFatal == "" {
- k.t.Fatalf("unexpected call to fatalf: format = %q, v = %#v", format, v)
- }
-
- if got := fmt.Sprintf(format, v...); got != k.expectsFatal {
- k.t.Fatalf("fatalf: %q, want %q", got, k.expectsFatal)
- }
- panic(stub.PanicExit)
-}
diff --git a/internal/app/outcome.go b/internal/app/outcome.go
index 237095af..59cdfbd8 100644
--- a/internal/app/outcome.go
+++ b/internal/app/outcome.go
@@ -8,6 +8,7 @@ import (
"hakurei.app/container"
"hakurei.app/container/check"
"hakurei.app/hst"
+ "hakurei.app/internal/env"
"hakurei.app/message"
"hakurei.app/system"
"hakurei.app/system/acl"
@@ -58,7 +59,7 @@ type outcomeState struct {
// Copied from [EnvPaths] per-process.
sc hst.Paths
- *EnvPaths
+ *env.Paths
// Copied via populateLocal.
k syscallDispatcher
@@ -72,7 +73,7 @@ func (s *outcomeState) valid() bool {
s.Shim.valid() &&
s.ID != nil &&
s.Container != nil &&
- s.EnvPaths != nil
+ s.Paths != nil
}
// newOutcomeState returns the address of a new outcomeState with its exported fields populated via syscallDispatcher.
@@ -82,7 +83,7 @@ func newOutcomeState(k syscallDispatcher, msg message.Msg, id *hst.ID, config *h
ID: id,
Identity: config.Identity,
UserID: hsu.MustID(msg),
- EnvPaths: copyPaths(k),
+ Paths: env.CopyPathsFunc(k.fatalf, k.tempdir, func(key string) string { v, _ := k.lookupEnv(key); return v }),
Container: config.Container,
}
diff --git a/internal/app/outcome_test.go b/internal/app/outcome_test.go
index 740e7db5..5ea3ff99 100644
--- a/internal/app/outcome_test.go
+++ b/internal/app/outcome_test.go
@@ -4,6 +4,7 @@ import (
"testing"
"hakurei.app/hst"
+ "hakurei.app/internal/env"
)
func TestOutcomeStateValid(t *testing.T) {
@@ -16,11 +17,11 @@ func TestOutcomeStateValid(t *testing.T) {
}{
{"nil", nil, false},
{"zero", new(outcomeState), false},
- {"shim", &outcomeState{Shim: &shimParams{PrivPID: -1, Ops: []outcomeOp{}}, Container: new(hst.ContainerConfig), EnvPaths: new(EnvPaths)}, false},
- {"id", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, Container: new(hst.ContainerConfig), EnvPaths: new(EnvPaths)}, false},
- {"container", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, ID: new(hst.ID), EnvPaths: new(EnvPaths)}, false},
+ {"shim", &outcomeState{Shim: &shimParams{PrivPID: -1, Ops: []outcomeOp{}}, Container: new(hst.ContainerConfig), Paths: new(env.Paths)}, false},
+ {"id", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, Container: new(hst.ContainerConfig), Paths: new(env.Paths)}, false},
+ {"container", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, ID: new(hst.ID), Paths: new(env.Paths)}, false},
{"envpaths", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, ID: new(hst.ID), Container: new(hst.ContainerConfig)}, false},
- {"valid", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, ID: new(hst.ID), Container: new(hst.ContainerConfig), EnvPaths: new(EnvPaths)}, true},
+ {"valid", &outcomeState{Shim: &shimParams{PrivPID: 1, Ops: []outcomeOp{}}, ID: new(hst.ID), Container: new(hst.ContainerConfig), Paths: new(env.Paths)}, true},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
diff --git a/internal/app/shim_test.go b/internal/app/shim_test.go
index e207dfda..19dedd6f 100644
--- a/internal/app/shim_test.go
+++ b/internal/app/shim_test.go
@@ -14,6 +14,7 @@ import (
"hakurei.app/container/seccomp"
"hakurei.app/container/stub"
"hakurei.app/hst"
+ "hakurei.app/internal/env"
)
func TestShimEntrypoint(t *testing.T) {
@@ -128,7 +129,7 @@ func TestShimEntrypoint(t *testing.T) {
Container: hst.Template().Container,
Mapuid: 1000,
Mapgid: 100,
- EnvPaths: &EnvPaths{TempDir: fhs.AbsTmp, RuntimePath: fhs.AbsRunUser.Append("1000")},
+ Paths: &env.Paths{TempDir: fhs.AbsTmp, RuntimePath: fhs.AbsRunUser.Append("1000")},
}, nil}, nil, nil),
call("swapVerbose", stub.ExpectArgs{true}, false, nil),
call("verbosef", stub.ExpectArgs{"process share directory at %q, runtime directory at %q", []any{m("/tmp/hakurei.10"), m("/run/user/1000/hakurei")}}, nil, nil),
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-30 11:56:04 +0000