From e14923ae530dda0601c204fe17ac1956f54a45b0 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 8 Feb 2025 13:03:45 +0900 Subject: [PATCH] helper/proc: move package out of internal Signed-off-by: Ophestra --- helper/bwrap/arg.go | 2 +- helper/pipe.go | 2 +- {internal => helper}/proc/fd.go | 0 {internal => helper}/proc/files.go | 0 {internal => helper}/proc/self.go | 0 internal/app/app.go | 2 +- internal/app/start.go | 2 +- internal/{proc => }/priv/init/early.go | 0 internal/{proc => }/priv/init/main.go | 2 +- internal/{proc => }/priv/init/payload.go | 0 internal/{proc => }/priv/shim/main.go | 4 ++-- internal/{proc => }/priv/shim/manager.go | 2 +- internal/{proc => }/priv/shim/payload.go | 0 main.go | 4 ++-- 14 files changed, 10 insertions(+), 10 deletions(-) rename {internal => helper}/proc/fd.go (100%) rename {internal => helper}/proc/files.go (100%) rename {internal => helper}/proc/self.go (100%) rename internal/{proc => }/priv/init/early.go (100%) rename internal/{proc => }/priv/init/main.go (98%) rename internal/{proc => }/priv/init/payload.go (100%) rename internal/{proc => }/priv/shim/main.go (97%) rename internal/{proc => }/priv/shim/manager.go (98%) rename internal/{proc => }/priv/shim/payload.go (100%) diff --git a/helper/bwrap/arg.go b/helper/bwrap/arg.go index d419ba5..d69c597 100644 --- a/helper/bwrap/arg.go +++ b/helper/bwrap/arg.go @@ -6,7 +6,7 @@ import ( "slices" "strconv" - "git.gensokyo.uk/security/fortify/internal/proc" + "git.gensokyo.uk/security/fortify/helper/proc" ) type Builder interface { diff --git a/helper/pipe.go b/helper/pipe.go index c87d4f6..f17b74f 100644 --- a/helper/pipe.go +++ b/helper/pipe.go @@ -6,7 +6,7 @@ import ( "os" "os/exec" - "git.gensokyo.uk/security/fortify/internal/proc" + "git.gensokyo.uk/security/fortify/helper/proc" ) type pipes struct { diff --git a/internal/proc/fd.go b/helper/proc/fd.go similarity index 100% rename from internal/proc/fd.go rename to helper/proc/fd.go diff --git a/internal/proc/files.go b/helper/proc/files.go similarity index 100% rename from internal/proc/files.go rename to helper/proc/files.go diff --git a/internal/proc/self.go b/helper/proc/self.go similarity index 100% rename from internal/proc/self.go rename to helper/proc/self.go diff --git a/internal/app/app.go b/internal/app/app.go index 30f893a..34b59bf 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -6,7 +6,7 @@ import ( "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/internal/linux" - "git.gensokyo.uk/security/fortify/internal/proc/priv/shim" + "git.gensokyo.uk/security/fortify/internal/priv/shim" ) type App interface { diff --git a/internal/app/start.go b/internal/app/start.go index 96198df..aba331e 100644 --- a/internal/app/start.go +++ b/internal/app/start.go @@ -11,7 +11,7 @@ import ( "git.gensokyo.uk/security/fortify/helper" "git.gensokyo.uk/security/fortify/internal/fmsg" - "git.gensokyo.uk/security/fortify/internal/proc/priv/shim" + "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/internal/proc/priv/init/early.go b/internal/priv/init/early.go similarity index 100% rename from internal/proc/priv/init/early.go rename to internal/priv/init/early.go diff --git a/internal/proc/priv/init/main.go b/internal/priv/init/main.go similarity index 98% rename from internal/proc/priv/init/main.go rename to internal/priv/init/main.go index d9f57b3..4c69312 100644 --- a/internal/proc/priv/init/main.go +++ b/internal/priv/init/main.go @@ -8,9 +8,9 @@ import ( "syscall" "time" + "git.gensokyo.uk/security/fortify/helper/proc" "git.gensokyo.uk/security/fortify/internal" "git.gensokyo.uk/security/fortify/internal/fmsg" - "git.gensokyo.uk/security/fortify/internal/proc" ) const ( diff --git a/internal/proc/priv/init/payload.go b/internal/priv/init/payload.go similarity index 100% rename from internal/proc/priv/init/payload.go rename to internal/priv/init/payload.go diff --git a/internal/proc/priv/shim/main.go b/internal/priv/shim/main.go similarity index 97% rename from internal/proc/priv/shim/main.go rename to internal/priv/shim/main.go index 7ad0a44..4dccb87 100644 --- a/internal/proc/priv/shim/main.go +++ b/internal/priv/shim/main.go @@ -8,11 +8,11 @@ import ( "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/helper" + "git.gensokyo.uk/security/fortify/helper/proc" "git.gensokyo.uk/security/fortify/helper/seccomp" "git.gensokyo.uk/security/fortify/internal" "git.gensokyo.uk/security/fortify/internal/fmsg" - "git.gensokyo.uk/security/fortify/internal/proc" - init0 "git.gensokyo.uk/security/fortify/internal/proc/priv/init" + init0 "git.gensokyo.uk/security/fortify/internal/priv/init" ) // everything beyond this point runs as unconstrained target user diff --git a/internal/proc/priv/shim/manager.go b/internal/priv/shim/manager.go similarity index 98% rename from internal/proc/priv/shim/manager.go rename to internal/priv/shim/manager.go index 064f5c8..106e486 100644 --- a/internal/proc/priv/shim/manager.go +++ b/internal/priv/shim/manager.go @@ -10,9 +10,9 @@ import ( "strings" "time" + "git.gensokyo.uk/security/fortify/helper/proc" "git.gensokyo.uk/security/fortify/internal" "git.gensokyo.uk/security/fortify/internal/fmsg" - "git.gensokyo.uk/security/fortify/internal/proc" ) // used by the parent process diff --git a/internal/proc/priv/shim/payload.go b/internal/priv/shim/payload.go similarity index 100% rename from internal/proc/priv/shim/payload.go rename to internal/priv/shim/payload.go diff --git a/main.go b/main.go index 36396ed..1c6ab08 100644 --- a/main.go +++ b/main.go @@ -21,8 +21,8 @@ import ( "git.gensokyo.uk/security/fortify/internal/app" "git.gensokyo.uk/security/fortify/internal/fmsg" "git.gensokyo.uk/security/fortify/internal/linux" - init0 "git.gensokyo.uk/security/fortify/internal/proc/priv/init" - "git.gensokyo.uk/security/fortify/internal/proc/priv/shim" + init0 "git.gensokyo.uk/security/fortify/internal/priv/init" + "git.gensokyo.uk/security/fortify/internal/priv/shim" "git.gensokyo.uk/security/fortify/internal/system" )