aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2025-02-08 13:03:45 +0900
committerOphestra <cat@gensokyo.uk>2025-02-08 13:03:45 +0900
commite14923ae530dda0601c204fe17ac1956f54a45b0 (patch)
tree1578bbc4c08d9afc94c4b009cd2bf64260574f05
parent7aff3ead3afaa7461e0054fbef23fb571b4add0a (diff)
helper/proc: move package out of internal
Signed-off-by: Ophestra <cat@gensokyo.uk>
-rw-r--r--helper/bwrap/arg.go2
-rw-r--r--helper/pipe.go2
-rw-r--r--helper/proc/fd.go (renamed from internal/proc/fd.go)0
-rw-r--r--helper/proc/files.go (renamed from internal/proc/files.go)0
-rw-r--r--helper/proc/self.go (renamed from internal/proc/self.go)0
-rw-r--r--internal/app/app.go2
-rw-r--r--internal/app/start.go2
-rw-r--r--internal/priv/init/early.go (renamed from internal/proc/priv/init/early.go)0
-rw-r--r--internal/priv/init/main.go (renamed from internal/proc/priv/init/main.go)2
-rw-r--r--internal/priv/init/payload.go (renamed from internal/proc/priv/init/payload.go)0
-rw-r--r--internal/priv/shim/main.go (renamed from internal/proc/priv/shim/main.go)4
-rw-r--r--internal/priv/shim/manager.go (renamed from internal/proc/priv/shim/manager.go)2
-rw-r--r--internal/priv/shim/payload.go (renamed from internal/proc/priv/shim/payload.go)0
-rw-r--r--main.go4
14 files changed, 10 insertions, 10 deletions
diff --git a/helper/bwrap/arg.go b/helper/bwrap/arg.go
index d419ba50..d69c597c 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 c87d4f64..f17b74fb 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
index e99abb38..e99abb38 100644
--- a/internal/proc/fd.go
+++ b/helper/proc/fd.go
diff --git a/internal/proc/files.go b/helper/proc/files.go
index 712713a2..712713a2 100644
--- a/internal/proc/files.go
+++ b/helper/proc/files.go
diff --git a/internal/proc/self.go b/helper/proc/self.go
index 6dc92eb7..6dc92eb7 100644
--- a/internal/proc/self.go
+++ b/helper/proc/self.go
diff --git a/internal/app/app.go b/internal/app/app.go
index 30f893a9..34b59bfc 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 96198df5..aba331e7 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
index cc1c2f7e..cc1c2f7e 100644
--- a/internal/proc/priv/init/early.go
+++ b/internal/priv/init/early.go
diff --git a/internal/proc/priv/init/main.go b/internal/priv/init/main.go
index d9f57b3e..4c69312e 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
index d1dc9ec3..d1dc9ec3 100644
--- a/internal/proc/priv/init/payload.go
+++ b/internal/priv/init/payload.go
diff --git a/internal/proc/priv/shim/main.go b/internal/priv/shim/main.go
index 7ad0a44b..4dccb876 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
index 064f5c87..106e4865 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
index e659e3fd..e659e3fd 100644
--- a/internal/proc/priv/shim/payload.go
+++ b/internal/priv/shim/payload.go
diff --git a/main.go b/main.go
index 36396edf..1c6ab080 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"
)