app: rename app implementation package

Signed-off-by: Ophestra <cat@gensokyo.uk>

14 files changed, 23 insertions, 23 deletions

diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go
index f3310c69..3102d402 100644
--- a/cmd/fpkg/main.go
+++ b/cmd/fpkg/main.go
@@ -13,7 +13,7 @@ import (
 	"git.gensokyo.uk/security/fortify/command"
 	"git.gensokyo.uk/security/fortify/fst"
 	"git.gensokyo.uk/security/fortify/internal"
-	"git.gensokyo.uk/security/fortify/internal/app"
+	"git.gensokyo.uk/security/fortify/internal/app/setuid"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
 	"git.gensokyo.uk/security/fortify/internal/sys"
 	"git.gensokyo.uk/security/fortify/sandbox"
@@ -62,7 +62,7 @@ func main() {
 		Flag(&flagVerbose, "v", command.BoolFlag(false), "Print debug messages to the console").
 		Flag(&flagDropShell, "s", command.BoolFlag(false), "Drop to a shell in place of next fortify action")
 
-	c.Command("shim", command.UsageInternal, func([]string) error { app.ShimMain(); return errSuccess })
+	c.Command("shim", command.UsageInternal, func([]string) error { setuid.ShimMain(); return errSuccess })
 
 	{
 		var (
diff --git a/cmd/fpkg/proc.go b/cmd/fpkg/proc.go
index 677ddb75..6cda7346 100644
--- a/cmd/fpkg/proc.go
+++ b/cmd/fpkg/proc.go
@@ -5,20 +5,20 @@ import (
 	"os"
 
 	"git.gensokyo.uk/security/fortify/fst"
-	"git.gensokyo.uk/security/fortify/internal/app"
+	"git.gensokyo.uk/security/fortify/internal/app/setuid"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
 )
 
 func mustRunApp(ctx context.Context, config *fst.Config, beforeFail func()) {
 	rs := new(fst.RunState)
-	a := app.MustNew(ctx, std)
+	a := setuid.MustNew(ctx, std)
 
 	var code int
 	if sa, err := a.Seal(config); err != nil {
 		fmsg.PrintBaseError(err, "cannot seal app:")
 		code = 1
 	} else {
-		code = app.PrintRunStateErr(rs, sa.Run(rs))
+		code = setuid.PrintRunStateErr(rs, sa.Run(rs))
 	}
 
 	if code != 0 {
diff --git a/internal/app/app.go b/internal/app/setuid/app.go
index 42d67b96..472d06ea 100644
--- a/internal/app/app.go
+++ b/internal/app/setuid/app.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"context"
diff --git a/internal/app/app_nixos_test.go b/internal/app/setuid/app_nixos_test.go
index 88efa7d3..6469f235 100644
--- a/internal/app/app_nixos_test.go
+++ b/internal/app/setuid/app_nixos_test.go
@@ -1,4 +1,4 @@
-package app_test
+package setuid_test
 
 import (
 	"git.gensokyo.uk/security/fortify/acl"
diff --git a/internal/app/app_pd_test.go b/internal/app/setuid/app_pd_test.go
index ac07d703..c4ab5797 100644
--- a/internal/app/app_pd_test.go
+++ b/internal/app/setuid/app_pd_test.go
@@ -1,4 +1,4 @@
-package app_test
+package setuid_test
 
 import (
 	"os"
diff --git a/internal/app/app_stub_test.go b/internal/app/setuid/app_stub_test.go
index 665dfa04..0b414f25 100644
--- a/internal/app/app_stub_test.go
+++ b/internal/app/setuid/app_stub_test.go
@@ -1,4 +1,4 @@
-package app_test
+package setuid_test
 
 import (
 	"fmt"
diff --git a/internal/app/app_test.go b/internal/app/setuid/app_test.go
index fa13ddd9..4454e6ff 100644
--- a/internal/app/app_test.go
+++ b/internal/app/setuid/app_test.go
@@ -1,4 +1,4 @@
-package app_test
+package setuid_test
 
 import (
 	"encoding/json"
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.gensokyo.uk/security/fortify/fst"
-	"git.gensokyo.uk/security/fortify/internal/app"
+	"git.gensokyo.uk/security/fortify/internal/app/setuid"
 	"git.gensokyo.uk/security/fortify/internal/sys"
 	"git.gensokyo.uk/security/fortify/sandbox"
 	"git.gensokyo.uk/security/fortify/system"
@@ -28,7 +28,7 @@ func TestApp(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			a := app.NewWithID(tc.id, tc.os)
+			a := setuid.NewWithID(tc.id, tc.os)
 			var (
 				gotSys       *system.I
 				gotContainer *sandbox.Params
@@ -38,7 +38,7 @@ func TestApp(t *testing.T) {
 					t.Errorf("Seal: error = %v", err)
 					return
 				} else {
-					gotSys, gotContainer = app.AppIParams(a, sa)
+					gotSys, gotContainer = setuid.AppIParams(a, sa)
 				}
 			}) {
 				return
diff --git a/internal/app/errors.go b/internal/app/setuid/errors.go
index 5a490f90..e6c9685c 100644
--- a/internal/app/errors.go
+++ b/internal/app/setuid/errors.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"errors"
diff --git a/internal/app/export_test.go b/internal/app/setuid/export_test.go
index 60d97b36..77182863 100644
--- a/internal/app/export_test.go
+++ b/internal/app/setuid/export_test.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"git.gensokyo.uk/security/fortify/fst"
diff --git a/internal/app/process.go b/internal/app/setuid/process.go
index f5872c81..e730225e 100644
--- a/internal/app/process.go
+++ b/internal/app/setuid/process.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"context"
diff --git a/internal/app/seal.go b/internal/app/setuid/seal.go
index 3c93b34d..92fbc2fa 100644
--- a/internal/app/seal.go
+++ b/internal/app/setuid/seal.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"bytes"
diff --git a/internal/app/shim.go b/internal/app/setuid/shim.go
index ea11dcc1..1717f812 100644
--- a/internal/app/shim.go
+++ b/internal/app/setuid/shim.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"context"
diff --git a/internal/app/strings.go b/internal/app/setuid/strings.go
index 19f6ea8e..f5b51344 100644
--- a/internal/app/strings.go
+++ b/internal/app/setuid/strings.go
@@ -1,4 +1,4 @@
-package app
+package setuid
 
 import (
 	"strconv"
diff --git a/main.go b/main.go
index 408f23e1..aa7de3b3 100644
--- a/main.go
+++ b/main.go
@@ -19,7 +19,7 @@ import (
 	"git.gensokyo.uk/security/fortify/dbus"
 	"git.gensokyo.uk/security/fortify/fst"
 	"git.gensokyo.uk/security/fortify/internal"
-	"git.gensokyo.uk/security/fortify/internal/app"
+	"git.gensokyo.uk/security/fortify/internal/app/setuid"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
 	"git.gensokyo.uk/security/fortify/internal/state"
 	"git.gensokyo.uk/security/fortify/internal/sys"
@@ -73,7 +73,7 @@ func buildCommand(out io.Writer) command.Command {
 		Flag(&flagVerbose, "v", command.BoolFlag(false), "Print debug messages to the console").
 		Flag(&flagJSON, "json", command.BoolFlag(false), "Serialise output as JSON when applicable")
 
-	c.Command("shim", command.UsageInternal, func([]string) error { app.ShimMain(); return errSuccess })
+	c.Command("shim", command.UsageInternal, func([]string) error { setuid.ShimMain(); return errSuccess })
 
 	c.Command("app", "Launch app defined by the specified config file", func(args []string) error {
 		if len(args) < 1 {
@@ -284,14 +284,14 @@ func runApp(config *fst.Config) {
 	ctx, stop := signal.NotifyContext(context.Background(),
 		syscall.SIGINT, syscall.SIGTERM)
 	defer stop() // unreachable
-	a := app.MustNew(ctx, std)
+	a := setuid.MustNew(ctx, std)
 
 	rs := new(fst.RunState)
 	if sa, err := a.Seal(config); err != nil {
 		fmsg.PrintBaseError(err, "cannot seal app:")
 		internal.Exit(1)
 	} else {
-		internal.Exit(app.PrintRunStateErr(rs, sa.Run(rs)))
+		internal.Exit(setuid.PrintRunStateErr(rs, sa.Run(rs)))
 	}
 
 	*(*int)(nil) = 0 // not reached