github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 04:59:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: using netsh exit status instead of output message in order to avoid issues with localization (fixes #186)

Browse source
This commit is contained in:
evilsocket 2018-03-19 12:06:25 +01:00
commit 02da4a0cbd
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
firewall/firewall_windows.go
View file

@ -35,26 +35,14 @@ func (f WindowsFirewall) IsForwardingEnabled() bool {
} }
} }
func (f WindowsFirewall) isSuccess(output string) bool {
if trimmed := core.Trim(strings.ToUpper(output)); trimmed == "" || strings.Contains(trimmed, "OK") == true {
return true
} else {
return false
}
}
func (f WindowsFirewall) EnableForwarding(enabled bool) error { func (f WindowsFirewall) EnableForwarding(enabled bool) error {
v := "enabled" v := "enabled"
if enabled == false { if enabled == false {
v = "disabled" v = "disabled"
} }
out, err := core.Exec("netsh", []string{"interface", "ipv4", "set", "interface", fmt.Sprintf("%d", f.iface.Index), fmt.Sprintf("forwarding=\"%s\"", v)})
if err != nil {
return err
}
if f.isSuccess(out) == false { if _, err := core.Exec("netsh", []string{"interface", "ipv4", "set", "interface", fmt.Sprintf("%d", f.iface.Index), fmt.Sprintf("forwarding=\"%s\"", v)}); err != nil {
return fmt.Errorf("Unexpected netsh output: %s", out) return err
} }
return nil return nil
@ -90,15 +78,10 @@ func (f *WindowsFirewall) AllowPort(port int, address string, proto string, allo
cmd = []string{"advfirewall", "firewall", "delete", "rule", nameField, protoField, portField} cmd = []string{"advfirewall", "firewall", "delete", "rule", nameField, protoField, portField}
} }
out, err := core.Exec("netsh", cmd) if _, err := core.Exec("netsh", cmd); err != nil {
if err != nil {
return err return err
} }
if f.isSuccess(out) == false {
return fmt.Errorf("Unexpected netsh output: %s", out)
}
return nil return nil
} }
@ -116,14 +99,10 @@ func (f *WindowsFirewall) EnableRedirection(r *Redirection, enabled bool) error
rule = append([]string{"interface", "portproxy", "delete", "v4tov4"}, rule...) rule = append([]string{"interface", "portproxy", "delete", "v4tov4"}, rule...)
} }
out, err := core.Exec("netsh", rule) if _, err := core.Exec("netsh", rule); err != nil {
if err != nil {
return err return err
} }
if f.isSuccess(out) == false {
return fmt.Errorf("Unexpected netsh output: %s", out)
}
return nil return nil
} }