Merge branch 'master' into hid_recon

This commit is contained in:
evilsocket 2019-02-21 12:12:47 +01:00
commit c6987c1652
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
5 changed files with 25 additions and 10 deletions

View file

@ -2,7 +2,7 @@ package core
const (
Name = "bettercap"
Version = "2.16"
Version = "2.17"
Author = "Simone 'evilsocket' Margaritelli"
Website = "https://bettercap.org/"
)

View file

@ -27,6 +27,13 @@ func UniqueInts(a []int, sorted bool) []int {
return uniq
}
func HasBinary(executable string) bool {
if path, err := exec.LookPath(executable); err != nil || path == "" {
return false
}
return true
}
func ExecSilent(executable string, args []string) (string, error) {
path, err := exec.LookPath(executable)
if err != nil {

View file

@ -48,3 +48,7 @@ func (b *BLE) MarshalJSON() ([]byte, error) {
}
return json.Marshal(doc)
}
func (b *BLE) EachDevice(cb func(mac string, d *BLEDevice)) {
}

View file

@ -265,10 +265,12 @@ func FindInterface(name string) (*Endpoint, error) {
}
func SetWiFiRegion(region string) error {
if out, err := core.Exec("iw", []string{"reg", "set", region}); err != nil {
return err
} else if out != "" {
return fmt.Errorf("unexpected output while setting WiFi region %s: %s", region, out)
if core.HasBinary("iw") {
if out, err := core.Exec("iw", []string{"reg", "set", region}); err != nil {
return err
} else if out != "" {
return fmt.Errorf("unexpected output while setting WiFi region %s: %s", region, out)
}
}
return nil
}
@ -283,10 +285,12 @@ func ActivateInterface(name string) error {
}
func SetInterfaceTxPower(name string, txpower int) error {
if out, err := core.ExecSilent("iwconfig", []string{name, "txpower", fmt.Sprintf("%d", txpower)}); err != nil {
return err
} else if out != "" {
return fmt.Errorf("unexpected output while setting txpower to %d for interface %s: %s", txpower, name, out)
if core.HasBinary("iwconfig") {
if out, err := core.ExecSilent("iwconfig", []string{name, "txpower", fmt.Sprintf("%d", txpower)}); err != nil {
return err
} else if out != "" {
return fmt.Errorf("unexpected output while setting txpower to %d for interface %s: %s", txpower, name, out)
}
}
return nil
}

View file

@ -1,5 +1,5 @@
name: bettercap
version: '2.16'
version: '2.17'
summary: 802.11, BLE and Ethernet networks reconnaissance and MITM attacks tool.
description: |
The Swiss Army knife for 802.11, BLE and Ethernet networks reconnaissance and MITM attacks.