From 33a4ab11c226c736c0d8b2644fbbe27a5ca045e9 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 16 Feb 2025 16:28:46 +0900 Subject: [PATCH] internal: move shim and init into app This structure makes more sense, as both processes are part of an app's lifecycle. Signed-off-by: Ophestra --- internal/app/app.go | 2 +- internal/{priv => app}/init/early.go | 0 internal/{priv => app}/init/main.go | 0 internal/{priv => app}/init/payload.go | 0 internal/{priv => app}/shim/main.go | 2 +- internal/{priv => app}/shim/manager.go | 0 internal/{priv => app}/shim/payload.go | 0 internal/app/start.go | 2 +- main.go | 4 ++-- 9 files changed, 5 insertions(+), 5 deletions(-) rename internal/{priv => app}/init/early.go (100%) rename internal/{priv => app}/init/main.go (100%) rename internal/{priv => app}/init/payload.go (100%) rename internal/{priv => app}/shim/main.go (98%) rename internal/{priv => app}/shim/manager.go (100%) rename internal/{priv => app}/shim/payload.go (100%) diff --git a/internal/app/app.go b/internal/app/app.go index 34b59bf..20966b7 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -5,8 +5,8 @@ import ( "sync" "git.gensokyo.uk/security/fortify/fst" + "git.gensokyo.uk/security/fortify/internal/app/shim" "git.gensokyo.uk/security/fortify/internal/linux" - "git.gensokyo.uk/security/fortify/internal/priv/shim" ) type App interface { diff --git a/internal/priv/init/early.go b/internal/app/init/early.go similarity index 100% rename from internal/priv/init/early.go rename to internal/app/init/early.go diff --git a/internal/priv/init/main.go b/internal/app/init/main.go similarity index 100% rename from internal/priv/init/main.go rename to internal/app/init/main.go diff --git a/internal/priv/init/payload.go b/internal/app/init/payload.go similarity index 100% rename from internal/priv/init/payload.go rename to internal/app/init/payload.go diff --git a/internal/priv/shim/main.go b/internal/app/shim/main.go similarity index 98% rename from internal/priv/shim/main.go rename to internal/app/shim/main.go index 7baf533..39b7d4f 100644 --- a/internal/priv/shim/main.go +++ b/internal/app/shim/main.go @@ -15,8 +15,8 @@ import ( "git.gensokyo.uk/security/fortify/helper/proc" "git.gensokyo.uk/security/fortify/helper/seccomp" "git.gensokyo.uk/security/fortify/internal" + init0 "git.gensokyo.uk/security/fortify/internal/app/init" "git.gensokyo.uk/security/fortify/internal/fmsg" - init0 "git.gensokyo.uk/security/fortify/internal/priv/init" ) // everything beyond this point runs as unconstrained target user diff --git a/internal/priv/shim/manager.go b/internal/app/shim/manager.go similarity index 100% rename from internal/priv/shim/manager.go rename to internal/app/shim/manager.go diff --git a/internal/priv/shim/payload.go b/internal/app/shim/payload.go similarity index 100% rename from internal/priv/shim/payload.go rename to internal/app/shim/payload.go diff --git a/internal/app/start.go b/internal/app/start.go index 837ab22..171e707 100644 --- a/internal/app/start.go +++ b/internal/app/start.go @@ -10,8 +10,8 @@ import ( "time" "git.gensokyo.uk/security/fortify/helper" + "git.gensokyo.uk/security/fortify/internal/app/shim" "git.gensokyo.uk/security/fortify/internal/fmsg" - "git.gensokyo.uk/security/fortify/internal/priv/shim" "git.gensokyo.uk/security/fortify/internal/state" "git.gensokyo.uk/security/fortify/internal/system" ) diff --git a/main.go b/main.go index ea68dff..d925e56 100644 --- a/main.go +++ b/main.go @@ -20,10 +20,10 @@ import ( "git.gensokyo.uk/security/fortify/helper/seccomp" "git.gensokyo.uk/security/fortify/internal" "git.gensokyo.uk/security/fortify/internal/app" + init0 "git.gensokyo.uk/security/fortify/internal/app/init" + "git.gensokyo.uk/security/fortify/internal/app/shim" "git.gensokyo.uk/security/fortify/internal/fmsg" "git.gensokyo.uk/security/fortify/internal/linux" - init0 "git.gensokyo.uk/security/fortify/internal/priv/init" - "git.gensokyo.uk/security/fortify/internal/priv/shim" "git.gensokyo.uk/security/fortify/internal/state" "git.gensokyo.uk/security/fortify/internal/system" )