diff options
| author | Ophestra Umiker <cat@ophivana.moe> | 2024-10-13 17:19:50 +0900 |
|---|---|---|
| committer | Ophestra Umiker <cat@ophivana.moe> | 2024-10-13 17:19:50 +0900 |
| commit | 3739b56504c7a268241c80b50461a19c4abe699c (patch) | |
| tree | 62c385a53e08999f9f39d67ea47c64e404c32ccc /internal | |
| parent | 77f2c320a6b1d5290c7596d2c8f8b6ba358b5de9 (diff) | |
shim: update payload comment
Generating permissive default no longer happens in shim.
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/shim/main.go | 4 | ||||
| -rw-r--r-- | internal/shim/payload.go | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/internal/shim/main.go b/internal/shim/main.go index 5b3303b4..bb0b15bb 100644 --- a/internal/shim/main.go +++ b/internal/shim/main.go @@ -18,7 +18,7 @@ import ( // everything beyond this point runs as target user // proceed with caution! -func shim(socket string) { +func doShim(socket string) { // re-exec if len(os.Args) > 0 && os.Args[0] != "fortify" && path.IsAbs(os.Args[0]) { if err := syscall.Exec(os.Args[0], []string{"fortify", "shim"}, os.Environ()); err != nil { @@ -163,7 +163,7 @@ func receiveWLfd(conn *net.UnixConn) (int, error) { func Try() { if args := flag.Args(); len(args) == 1 && args[0] == "shim" { if s, ok := os.LookupEnv(EnvShim); ok { - shim(s) + doShim(s) panic("unreachable") } } diff --git a/internal/shim/payload.go b/internal/shim/payload.go index 3919bb85..7248c86c 100644 --- a/internal/shim/payload.go +++ b/internal/shim/payload.go @@ -1,8 +1,6 @@ package shim -import ( - "git.ophivana.moe/cat/fortify/helper/bwrap" -) +import "git.ophivana.moe/cat/fortify/helper/bwrap" const EnvShim = "FORTIFY_SHIM" @@ -11,7 +9,7 @@ type Payload struct { Argv []string // bwrap, target full exec path Exec [2]string - // bwrap config, nil for permissive + // bwrap config Bwrap *bwrap.Config // whether to pass wayland fd WL bool |