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

Merge branch 'master' of github.com:bettercap/bettercap

Browse source
This commit is contained in:
evilsocket 2019-03-17 12:50:25 +01:00
commit b676d68b4c
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/dns_spoof/dns_spoof.go
View file

@ -109,7 +109,7 @@ func (mod *DNSSpoofer) Configure() error {
if hostsFile != "" { if hostsFile != "" {
mod.Info("loading hosts from file %s ...", hostsFile) mod.Info("loading hosts from file %s ...", hostsFile)
if err, hosts := HostsFromFile(hostsFile); err != nil { if err, hosts := HostsFromFile(hostsFile, address); err != nil {
return fmt.Errorf("error reading hosts from file %s: %v", hostsFile, err) return fmt.Errorf("error reading hosts from file %s: %v", hostsFile, err)
} else { } else {
mod.Hosts = append(mod.Hosts, hosts...) mod.Hosts = append(mod.Hosts, hosts...)

5
modules/dns_spoof/dns_spoof_hosts.go
View file

@ -2,7 +2,6 @@ package dns_spoof
import ( import (
"bufio" "bufio"
"fmt"
"net" "net"
"os" "os"
"regexp" "regexp"
@ -47,7 +46,7 @@ func NewHostEntry(host string, address net.IP) HostEntry {
return entry return entry
} }
func HostsFromFile(filename string) (err error, entries []HostEntry) { func HostsFromFile(filename string,defaultAddress net.IP) (err error, entries []HostEntry) {
input, err := os.Open(filename) input, err := os.Open(filename)
if err != nil { if err != nil {
return return
@ -66,7 +65,7 @@ func HostsFromFile(filename string) (err error, entries []HostEntry) {
domain := parts[1] domain := parts[1]
entries = append(entries, NewHostEntry(domain, address)) entries = append(entries, NewHostEntry(domain, address))
} else { } else {
return fmt.Errorf("'%s' invalid hosts line", line), nil entries = append(entries, NewHostEntry(line, defaultAddress))
} }
} }