From 70b56c314ba5958047a323a4b0c0fe4a337ea5fb Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 31 May 2018 18:01:11 -0700 Subject: [PATCH] Close #90. Firewall 'off' values are properly formatted --- security/firewall.go | 12 ++++++------ security/widget.go | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/security/firewall.go b/security/firewall.go index 5867e983..6323b5e1 100644 --- a/security/firewall.go +++ b/security/firewall.go @@ -44,7 +44,7 @@ func firewallStateMacOS() string { cmd := exec.Command(osxFirewallCmd, "--getglobalstate") str := wtf.ExecuteCommand(cmd) - return status(str) + return statusLabel(str) } func firewallStealthStateLinux() string { @@ -55,15 +55,15 @@ func firewallStealthStateMacOS() string { cmd := exec.Command(osxFirewallCmd, "--getstealthmode") str := wtf.ExecuteCommand(cmd) - return status(str) + return statusLabel(str) } -func status(str string) string { - icon := "[red]off[white]" +func statusLabel(str string) string { + label := "off" if strings.Contains(str, "enabled") { - icon = "[green]on[white]" + label = "on" } - return icon + return label } diff --git a/security/widget.go b/security/widget.go index 7ad2d5bb..61bab3b2 100644 --- a/security/widget.go +++ b/security/widget.go @@ -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", "Crypto", data.WifiEncryption) str = str + "\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: %4s %-16s\n", "Stealth", data.FirewallStealth, data.DnsAt(1)) + str = str + " [red]Firewall[white] [red]DNS[white]\n" + 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: [%s]%-3s[white] %-16s\n", "Stealth", widget.labelColor(data.FirewallStealth), data.FirewallStealth, data.DnsAt(1)) str = str + "\n" str = str + " [red]Users[white]\n" str = str + fmt.Sprintf(" %s", strings.Join(data.LoggedInUsers, ", ")) return str } + +func (widget *Widget) labelColor(label string) string { + switch label { + case "on": + return "green" + case "off": + return "red" + default: + return "white" + } +}