github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 10:46:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact: restored firewall_windows.go functionalities as they still do work system wide and might be useful

Browse source
This commit is contained in:
evilsocket 2018-02-15 20:24:57 +01:00
commit 1300d51822
1 changed files with 21 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

53
firewall/firewall_windows.go
View file

@ -26,18 +26,13 @@ func Make(iface *net.Endpoint) FirewallManager {
return firewall
}
// TODO: This should be obsolete now .. Clean
func (f WindowsFirewall) IsForwardingEnabled() bool {
fmt.Errorf("Forwarding is dead in Windows .. cleanup")
return false
//if out, err := core.Exec("netsh", []string{"interface", "ipv4", "dump"}); err != nil {
// fmt.Printf("%s\n", err)
// return false
//} else {
// return strings.Contains(out, "forwarding=enabled")
//}
if out, err := core.Exec("netsh", []string{"interface", "ipv4", "dump"}); err != nil {
fmt.Printf("%s\n", err)
return false
} else {
return strings.Contains(out, "forwarding=enabled")
}
}
func (f WindowsFirewall) isSuccess(output string) bool {
@ -48,27 +43,21 @@ func (f WindowsFirewall) isSuccess(output string) bool {
}
}
// TODO: This should be obsolete now .. Clean
func (f WindowsFirewall) EnableForwarding(enabled bool) error {
v := "enabled"
if enabled == false {
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 {
return fmt.Errorf("Unexpected netsh output: %s", out)
}
fmt.Errorf("Forwarding is dead in Windows .. cleanup")
return nil
//
//v := "enabled"
//if enabled == false {
// 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 {
// return fmt.Errorf("Unexpected netsh output: %s", out)
//}
//
//return nil
}
func (f WindowsFirewall) generateRule(r *Redirection, enabled bool) []string {
@ -145,7 +134,7 @@ func (f WindowsFirewall) Restore() {
}
}
//if err := f.EnableForwarding(f.forwarding); err != nil {
// fmt.Printf("%s", err)
//}
if err := f.EnableForwarding(f.forwarding); err != nil {
fmt.Printf("%s", err)
}
}