diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-04-12 13:56:41 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-04-12 13:56:41 +0900 |
| commit | 6309469e933a31a300fbf16d8e77f48dcee402d3 (patch) | |
| tree | 8f8a72ee02b3ca15b104a6e55c9379e20f8d7e8a /cmd | |
| parent | 0d7c1a9a4356614f035225aeb24e66421879a99b (diff) | |
app/instance: wrap internal implementation
This reduces the scope of the fst package, which was growing questionably large.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/fpkg/main.go | 4 | ||||
| -rw-r--r-- | cmd/fpkg/proc.go | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go index 3102d402..e48cfb57 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/setuid" + "git.gensokyo.uk/security/fortify/internal/app/instance" "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 { setuid.ShimMain(); return errSuccess }) + c.Command("shim", command.UsageInternal, func([]string) error { instance.ShimMain(); return errSuccess }) { var ( diff --git a/cmd/fpkg/proc.go b/cmd/fpkg/proc.go index 6cda7346..45fe3525 100644 --- a/cmd/fpkg/proc.go +++ b/cmd/fpkg/proc.go @@ -5,20 +5,21 @@ import ( "os" "git.gensokyo.uk/security/fortify/fst" - "git.gensokyo.uk/security/fortify/internal/app/setuid" + "git.gensokyo.uk/security/fortify/internal/app" + "git.gensokyo.uk/security/fortify/internal/app/instance" "git.gensokyo.uk/security/fortify/internal/fmsg" ) func mustRunApp(ctx context.Context, config *fst.Config, beforeFail func()) { - rs := new(fst.RunState) - a := setuid.MustNew(ctx, std) + rs := new(app.RunState) + a := instance.MustNew(instance.ISetuid, ctx, std) var code int if sa, err := a.Seal(config); err != nil { fmsg.PrintBaseError(err, "cannot seal app:") code = 1 } else { - code = setuid.PrintRunStateErr(rs, sa.Run(rs)) + code = instance.PrintRunStateErr(instance.ISetuid, rs, sa.Run(rs)) } if code != 0 { |