From 5c991a58e3ef78bdab7fc811dc2350f1da526272 Mon Sep 17 00:00:00 2001 From: Jacob Reynolds Date: Wed, 28 Feb 2018 13:33:30 -0600 Subject: [PATCH 1/2] Adding case insensitive match for netsh output `isSuccess` originally matched on `OK` without checking the case of the output. Some windows builds output `Ok` as well. --- firewall/firewall_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firewall/firewall_windows.go b/firewall/firewall_windows.go index 6cfd9f80..de20bcac 100644 --- a/firewall/firewall_windows.go +++ b/firewall/firewall_windows.go @@ -36,7 +36,7 @@ func (f WindowsFirewall) IsForwardingEnabled() bool { } func (f WindowsFirewall) isSuccess(output string) bool { - if trimmed := core.Trim(output); trimmed == "" || strings.Contains(trimmed, "OK") == true { + if trimmed := core.Trim(strings.ToLower(output)); trimmed == "" || strings.Contains(trimmed, "ok") == true { return true } else { return false From feb3ac3161e2d94e0750598827308c395ea68764 Mon Sep 17 00:00:00 2001 From: Jacob Reynolds Date: Wed, 28 Feb 2018 13:37:00 -0600 Subject: [PATCH 2/2] Keeping original case for OK statement --- firewall/firewall_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firewall/firewall_windows.go b/firewall/firewall_windows.go index de20bcac..8623f551 100644 --- a/firewall/firewall_windows.go +++ b/firewall/firewall_windows.go @@ -36,7 +36,7 @@ func (f WindowsFirewall) IsForwardingEnabled() bool { } func (f WindowsFirewall) isSuccess(output string) bool { - if trimmed := core.Trim(strings.ToLower(output)); trimmed == "" || strings.Contains(trimmed, "ok") == true { + if trimmed := core.Trim(strings.ToUpper(output)); trimmed == "" || strings.Contains(trimmed, "OK") == true { return true } else { return false