security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 12 Wiki Activity

verbose: remove system package interaction

Browse Source 
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
This commit is contained in:
Ophestra
2024-09-12 21:07:05 +09:00
parent b0aff89166
commit da6d238d8a
13 changed files with 85 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/state/exit.go
View File

@@ -7,7 +7,7 @@ import (
"os"
"git.ophivana.moe/cat/fortify/internal/acl"
"git.ophivana.moe/cat/fortify/internal/system"
"git.ophivana.moe/cat/fortify/internal/verbose"
"git.ophivana.moe/cat/fortify/internal/xcb"
)
@@ -24,9 +24,7 @@ func BeforeExit() {
}
if statePath == "" {
if system.V.Verbose {
fmt.Println("State path is unset")
}
verbose.Println("State path is unset")
} else {
if err := os.Remove(statePath); err != nil && !errors.Is(err, fs.ErrNotExist) {
fmt.Println("Error removing state file:", err)
@@ -38,20 +36,14 @@ func BeforeExit() {
os.Exit(1)
} else if len(d) > 0 {
// other launchers are still active
if system.V.Verbose {
fmt.Printf("Found %d active launchers, exiting without cleaning up\n", len(d))
}
verbose.Printf("Found %d active launchers, exiting without cleaning up\n", len(d))
return
}
if system.V.Verbose {
fmt.Println("No other launchers active, will clean up")
}
verbose.Println("No other launchers active, will clean up")
if xcbActionComplete {
if system.V.Verbose {
fmt.Printf("X11: Removing XHost entry SI:localuser:%s\n", u.Username)
}
verbose.Printf("X11: Removing XHost entry SI:localuser:%s\n", u.Username)
if err := xcb.ChangeHosts(xcb.HostModeDelete, xcb.FamilyServerInterpreted, "localuser\x00"+u.Username); err != nil {
fmt.Println("Error removing XHost entry:", err)
}
@@ -61,21 +53,15 @@ func BeforeExit() {
if err := acl.UpdatePerm(candidate, uid); err != nil {
fmt.Printf("Error stripping ACL entry from '%s': %s\n", candidate, err)
}
if system.V.Verbose {
fmt.Printf("Stripped ACL entry for user '%s' from '%s'\n", u.Username, candidate)
}
verbose.Printf("Stripped ACL entry for user '%s' from '%s'\n", u.Username, candidate)
}
if dbusProxy != nil {
if system.V.Verbose {
fmt.Println("D-Bus proxy registered, cleaning up")
}
verbose.Println("D-Bus proxy registered, cleaning up")
if err := dbusProxy.Close(); err != nil {
if errors.Is(err, os.ErrClosed) {
if system.V.Verbose {
fmt.Println("D-Bus proxy already closed")
}
verbose.Println("D-Bus proxy already closed")
} else {
fmt.Println("Error closing D-Bus proxy:", err)
}

13
internal/state/print.go
View File

@@ -9,6 +9,7 @@ import (
"text/tabwriter"
"git.ophivana.moe/cat/fortify/internal/system"
"git.ophivana.moe/cat/fortify/internal/verbose"
)
var (
@@ -31,16 +32,12 @@ func Early() {
} else {
for _, e := range runDir {
if !e.IsDir() {
if system.V.Verbose {
fmt.Println("Skipped non-directory entry", e.Name())
}
verbose.Println("Skipped non-directory entry", e.Name())
continue
}
if _, err = strconv.Atoi(e.Name()); err != nil {
if system.V.Verbose {
fmt.Println("Skipped non-uid entry", e.Name())
}
verbose.Println("Skipped non-uid entry", e.Name())
continue
}
@@ -74,7 +71,7 @@ func printLauncherState(uid string, w **tabwriter.Writer) {
if *w == nil {
*w = tabwriter.NewWriter(os.Stdout, 0, 1, 4, ' ', 0)
if !system.V.Verbose {
if !verbose.Get() {
_, _ = fmt.Fprintln(*w, "\tUID\tPID\tEnablements\tLauncher\tCommand")
} else {
_, _ = fmt.Fprintln(*w, "\tUID\tPID\tArgv")
@@ -92,7 +89,7 @@ func printLauncherState(uid string, w **tabwriter.Writer) {
enablementsDescription.WriteString("none")
}
if !system.V.Verbose {
if !verbose.Get() {
_, _ = fmt.Fprintf(*w, "\t%s\t%d\t%s\t%s\t%s\n",
uid, state.PID, strings.TrimPrefix(enablementsDescription.String(), ", "), state.Launcher,
state.Command)