diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/outcome/run_test.go | 8 | ||||
| -rw-r--r-- | internal/outcome/shim_test.go | 4 | ||||
| -rw-r--r-- | internal/outcome/spaccount.go | 23 | ||||
| -rw-r--r-- | internal/outcome/spaccount_test.go | 5 |
4 files changed, 16 insertions, 24 deletions
diff --git a/internal/outcome/run_test.go b/internal/outcome/run_test.go index faa322ec..2a412d8b 100644 --- a/internal/outcome/run_test.go +++ b/internal/outcome/run_test.go @@ -143,10 +143,6 @@ func TestOutcomeRun(t *testing.T) { // spTmpdirOp Bind(m("/tmp/hakurei.0/tmpdir/9"), fhs.AbsTmp, std.BindWritable). - // spAccountOp - Place(m("/etc/passwd"), []byte("chronos:x:1971:100:Hakurei:/data/data/org.chromium.Chromium:/run/current-system/sw/bin/zsh\n")). - Place(m("/etc/group"), []byte("hakurei:x:100:\n")). - // spWaylandOp Bind(m("/tmp/hakurei.0/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/wayland"), m("/run/user/1971/wayland-0"), 0). @@ -453,7 +449,7 @@ func TestOutcomeRun(t *testing.T) { Path: m("/nix/store/yqivzpzzn7z5x0lq9hmbzygh45d8rhqd-chromium-start"), - Flags: hst.FUserns | hst.FHostNet | hst.FMapRealUID | hst.FShareRuntime | hst.FShareTmpdir, + Flags: hst.FUserns | hst.FHostNet | hst.FMapRealUID | hst.FNoPlace | hst.FShareRuntime | hst.FShareTmpdir, }, SystemBus: &hst.BusConfig{ Talk: []string{"org.bluez", "org.freedesktop.Avahi", "org.freedesktop.UPower"}, @@ -548,8 +544,6 @@ func TestOutcomeRun(t *testing.T) { Tmpfs(m("/run/user/"), xdgRuntimeDirSize, 0755). Bind(m("/tmp/hakurei.0/runtime/1"), m("/run/user/1971"), std.BindWritable). Bind(m("/tmp/hakurei.0/tmpdir/1"), m("/tmp/"), std.BindWritable). - Place(m("/etc/passwd"), []byte("u0_a1:x:1971:100:Hakurei:/var/lib/persist/module/hakurei/0/1:/run/current-system/sw/bin/zsh\n")). - Place(m("/etc/group"), []byte("hakurei:x:100:\n")). Bind(m("/run/user/1971/wayland-0"), m("/run/user/1971/wayland-0"), 0). Bind(m("/tmp/hakurei.0/8e2c76b066dabe574cf073bdb46eb5c1/pipewire"), m("/run/user/1971/pipewire-0"), 0). Bind(m("/tmp/hakurei.0/8e2c76b066dabe574cf073bdb46eb5c1/bus"), m("/run/user/1971/bus"), 0). diff --git a/internal/outcome/shim_test.go b/internal/outcome/shim_test.go index 2dc7a4cd..5d7dab76 100644 --- a/internal/outcome/shim_test.go +++ b/internal/outcome/shim_test.go @@ -78,10 +78,6 @@ func TestShimEntrypoint(t *testing.T) { // spTmpdirOp Bind(m("/tmp/hakurei.10/tmpdir/9999"), fhs.AbsTmp, std.BindWritable). - // spAccountOp - Place(m("/etc/passwd"), []byte("chronos:x:1000:100:Hakurei:/data/data/org.chromium.Chromium:/run/current-system/sw/bin/zsh\n")). - Place(m("/etc/group"), []byte("hakurei:x:100:\n")). - // spWaylandOp Bind(m("/tmp/hakurei.10/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/wayland"), m("/run/user/1000/wayland-0"), 0). diff --git a/internal/outcome/spaccount.go b/internal/outcome/spaccount.go index 1a849cb5..ccc64479 100644 --- a/internal/outcome/spaccount.go +++ b/internal/outcome/spaccount.go @@ -6,6 +6,7 @@ import ( "syscall" "hakurei.app/fhs" + "hakurei.app/hst" "hakurei.app/internal/validate" ) @@ -41,16 +42,18 @@ func (s spAccountOp) toContainer(state *outcomeStateParams) error { state.env["USER"] = username state.env["SHELL"] = state.Container.Shell.String() - state.params. - Place(fhs.AbsEtc.Append("passwd"), - []byte(username+":x:"+ - state.mapuid.String()+":"+ - state.mapgid.String()+ - ":Hakurei:"+ - state.Container.Home.String()+":"+ - state.Container.Shell.String()+"\n")). - Place(fhs.AbsEtc.Append("group"), - []byte("hakurei:x:"+state.mapgid.String()+":\n")) + if state.Container.Flags&hst.FNoPlace == 0 { + state.params. + Place(fhs.AbsEtc.Append("passwd"), + []byte(username+":x:"+ + state.mapuid.String()+":"+ + state.mapgid.String()+ + ":Hakurei:"+ + state.Container.Home.String()+":"+ + state.Container.Shell.String()+"\n")). + Place(fhs.AbsEtc.Append("group"), + []byte("hakurei:x:"+state.mapgid.String()+":\n")) + } return nil } diff --git a/internal/outcome/spaccount_test.go b/internal/outcome/spaccount_test.go index f94e4591..fb20d8df 100644 --- a/internal/outcome/spaccount_test.go +++ b/internal/outcome/spaccount_test.go @@ -38,6 +38,7 @@ func TestSpAccountOp(t *testing.T) { {"success fallback username", func(bool, bool) outcomeOp { return spAccountOp{} }, func() *hst.Config { c := hst.Template() c.Container.Username = "" + c.Container.Flags = hst.FMapRealUID return c }, nil, []stub.Call{ // this op performs basic validation and does not make calls during toSystem @@ -60,9 +61,7 @@ func TestSpAccountOp(t *testing.T) { // this op configures the container state and does not make calls during toContainer }, &container.Params{ Dir: config.Container.Home, - Ops: new(container.Ops). - Place(m("/etc/passwd"), []byte("chronos:x:1000:100:Hakurei:/data/data/org.chromium.Chromium:/run/current-system/sw/bin/zsh\n")). - Place(m("/etc/group"), []byte("hakurei:x:100:\n")), + Ops: new(container.Ops), }, paramsWantEnv(config, map[string]string{ "HOME": config.Container.Home.String(), "USER": config.Container.Username, |