From 0d7c1a9a4356614f035225aeb24e66421879a99b Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 12 Apr 2025 10:54:24 +0900 Subject: [PATCH] app: rename app implementation package Signed-off-by: Ophestra --- cmd/fpkg/main.go | 4 ++-- cmd/fpkg/proc.go | 6 +++--- internal/app/{ => setuid}/app.go | 2 +- internal/app/{ => setuid}/app_nixos_test.go | 2 +- internal/app/{ => setuid}/app_pd_test.go | 2 +- internal/app/{ => setuid}/app_stub_test.go | 2 +- internal/app/{ => setuid}/app_test.go | 8 ++++---- internal/app/{ => setuid}/errors.go | 2 +- internal/app/{ => setuid}/export_test.go | 2 +- internal/app/{ => setuid}/process.go | 2 +- internal/app/{ => setuid}/seal.go | 2 +- internal/app/{ => setuid}/shim.go | 2 +- internal/app/{ => setuid}/strings.go | 2 +- main.go | 8 ++++---- 14 files changed, 23 insertions(+), 23 deletions(-) rename internal/app/{ => setuid}/app.go (99%) rename internal/app/{ => setuid}/app_nixos_test.go (99%) rename internal/app/{ => setuid}/app_pd_test.go (99%) rename internal/app/{ => setuid}/app_stub_test.go (99%) rename internal/app/{ => setuid}/app_test.go (94%) rename internal/app/{ => setuid}/errors.go (99%) rename internal/app/{ => setuid}/export_test.go (97%) rename internal/app/{ => setuid}/process.go (99%) rename internal/app/{ => setuid}/seal.go (99%) rename internal/app/{ => setuid}/shim.go (99%) rename internal/app/{ => setuid}/strings.go (96%) diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go index f3310c6..3102d40 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 677ddb7..6cda734 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 similarity index 99% rename from internal/app/app.go rename to internal/app/setuid/app.go index 42d67b9..472d06e 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 similarity index 99% rename from internal/app/app_nixos_test.go rename to internal/app/setuid/app_nixos_test.go index 88efa7d..6469f23 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 similarity index 99% rename from internal/app/app_pd_test.go rename to internal/app/setuid/app_pd_test.go index ac07d70..c4ab579 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 similarity index 99% rename from internal/app/app_stub_test.go rename to internal/app/setuid/app_stub_test.go index 665dfa0..0b414f2 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 similarity index 94% rename from internal/app/app_test.go rename to internal/app/setuid/app_test.go index fa13ddd..4454e6f 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 similarity index 99% rename from internal/app/errors.go rename to internal/app/setuid/errors.go index 5a490f9..e6c9685 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 similarity index 97% rename from internal/app/export_test.go rename to internal/app/setuid/export_test.go index 60d97b3..7718286 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 similarity index 99% rename from internal/app/process.go rename to internal/app/setuid/process.go index f5872c8..e730225 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 similarity index 99% rename from internal/app/seal.go rename to internal/app/setuid/seal.go index 3c93b34..92fbc2f 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 similarity index 99% rename from internal/app/shim.go rename to internal/app/setuid/shim.go index ea11dcc..1717f81 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 similarity index 96% rename from internal/app/strings.go rename to internal/app/setuid/strings.go index 19f6ea8..f5b5134 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 408f23e..aa7de3b 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