cmd/fsu: remove import of internal package
test / test (push) Successful in 24s Details

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
This commit is contained in:
Ophestra Umiker 2024-11-04 12:32:14 +09:00
parent af15b1c048
commit 88abcbe0b2
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
3 changed files with 10 additions and 5 deletions

View File

@ -8,16 +8,17 @@ import (
"strconv"
"strings"
"syscall"
"git.ophivana.moe/security/fortify/internal"
)
const (
compPoison = "INVALIDINVALIDINVALIDINVALIDINVALID"
fsuConfFile = "/etc/fsurc"
envShim = "FORTIFY_SHIM"
envAID = "FORTIFY_APP_ID"
)
var Fmain = compPoison
func main() {
log.SetFlags(0)
log.SetPrefix("fsu: ")
@ -33,7 +34,7 @@ func main() {
}
var fmain string
if p, ok := internal.Path(internal.Fmain); !ok {
if p, ok := checkPath(Fmain); !ok {
log.Fatal("invalid fortify path, this copy of fsu is not compiled correctly")
} else {
fmain = p
@ -137,3 +138,7 @@ func parseConfig(p string, puid int) (fid int, ok bool) {
return -1, false
}
}
func checkPath(p string) (string, bool) {
return p, p != compPoison && p != "" && path.IsAbs(p)
}

View File

@ -3,7 +3,6 @@ package internal
import "path"
var (
Fmain = compPoison
Fsu = compPoison
Fshim = compPoison
Finit = compPoison

View File

@ -28,10 +28,11 @@ buildGoModule rec {
[
"-s"
"-w"
"-X"
"main.Fmain=${placeholder "out"}/bin/.fortify-wrapped"
]
{
Version = "v${version}";
Fmain = "${placeholder "out"}/bin/.fortify-wrapped";
Fsu = "/run/wrappers/bin/fsu";
Fshim = "${placeholder "out"}/bin/.fshim";
Finit = "${placeholder "out"}/bin/.finit";