taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Close #90. Firewall 'off' values are properly formatted

Browse Source
This commit is contained in:
Chris Cummer 2018-05-31 18:01:11 -07:00
parent 1a6a25799a
commit 70b56c314b
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/firewall.go
View File

@ -44,7 +44,7 @@ func firewallStateMacOS() string {
cmd := exec.Command(osxFirewallCmd, "--getglobalstate") cmd := exec.Command(osxFirewallCmd, "--getglobalstate")
str := wtf.ExecuteCommand(cmd) str := wtf.ExecuteCommand(cmd)
return status(str) return statusLabel(str)
} }
func firewallStealthStateLinux() string { func firewallStealthStateLinux() string {
@ -55,15 +55,15 @@ func firewallStealthStateMacOS() string {
cmd := exec.Command(osxFirewallCmd, "--getstealthmode") cmd := exec.Command(osxFirewallCmd, "--getstealthmode")
str := wtf.ExecuteCommand(cmd) str := wtf.ExecuteCommand(cmd)
return status(str) return statusLabel(str)
} }
func status(str string) string { func statusLabel(str string) string {
icon := "[red]off[white]" label := "off"
if strings.Contains(str, "enabled") { if strings.Contains(str, "enabled") {
icon = "[green]on[white]" label = "on"
} }
return icon return label
} }

17
security/widget.go
View File

@ -46,12 +46,23 @@ func (widget *Widget) contentFrom(data *SecurityData) string {
str = str + fmt.Sprintf(" %8s: %s\n", "Network", data.WifiName) str = str + fmt.Sprintf(" %8s: %s\n", "Network", data.WifiName)
str = str + fmt.Sprintf(" %8s: %s\n", "Crypto", data.WifiEncryption) str = str + fmt.Sprintf(" %8s: %s\n", "Crypto", data.WifiEncryption)
str = str + "\n" str = str + "\n"
str = str + " [red]Firewall[white] [red]DNS[white]\n" str = str + " [red]Firewall[white] [red]DNS[white]\n"
str = str + fmt.Sprintf(" %8s: %4s %-16s\n", "Enabled", data.FirewallEnabled, data.DnsAt(0)) str = str + fmt.Sprintf(" %8s: [%s]%-3s[white] %-16s\n", "Enabled", widget.labelColor(data.FirewallEnabled), data.FirewallEnabled, data.DnsAt(0))
str = str + fmt.Sprintf(" %8s: %4s %-16s\n", "Stealth", data.FirewallStealth, data.DnsAt(1)) str = str + fmt.Sprintf(" %8s: [%s]%-3s[white] %-16s\n", "Stealth", widget.labelColor(data.FirewallStealth), data.FirewallStealth, data.DnsAt(1))
str = str + "\n" str = str + "\n"
str = str + " [red]Users[white]\n" str = str + " [red]Users[white]\n"
str = str + fmt.Sprintf(" %s", strings.Join(data.LoggedInUsers, ", ")) str = str + fmt.Sprintf(" %s", strings.Join(data.LoggedInUsers, ", "))
return str return str
} }
func (widget *Widget) labelColor(label string) string {
switch label {
case "on":
return "green"
case "off":
return "red"
default:
return "white"
}
}