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: new ListParam utility method for modules CSV parameters

Browse source
This commit is contained in:
evilsocket 2018-01-13 13:40:52 +01:00
commit 90c1550a19
3 changed files with 46 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

57
modules/dhcp6_spoof.go
View file

@ -76,6 +76,31 @@ func (s DHCP6Spoofer) Author() string {
return "Simone Margaritelli <evilsocket@protonmail.com>"
}
func (s *DHCP6Spoofer) encodeDomains() {
totLen := 0
for _, d := range s.Domains {
totLen += len(d)
}
if totLen > 0 {
s.RawDomains = make([]byte, totLen+1*len(s.Domains))
i := 0
for _, domain := range s.Domains {
lenDomain := len(domain)
plusOne := lenDomain + 1
s.RawDomains[i] = byte(lenDomain & 0xff)
k := 0
for j := i + 1; j < plusOne; j++ {
s.RawDomains[j] = domain[k]
k++
}
i += plusOne
}
}
}
func (s *DHCP6Spoofer) Configure() error {
var err error
var addr string
@ -89,38 +114,10 @@ func (s *DHCP6Spoofer) Configure() error {
return err
}
s.Domains = make([]string, 0)
if err, domains := s.StringParam("dhcp6.spoof.domains"); err != nil {
if err, s.Domains = s.ListParam("dhcp6.spoof.domains"); err != nil {
return err
} else {
parts := strings.Split(domains, ",")
totLen := 0
for _, part := range parts {
part = strings.Trim(part, "\t\n\r ")
if part != "" {
s.Domains = append(s.Domains, part)
totLen += len(part)
}
}
if totLen > 0 {
s.RawDomains = make([]byte, totLen+1*len(s.Domains))
i := 0
for _, domain := range s.Domains {
lenDomain := len(domain)
plusOne := lenDomain + 1
s.RawDomains[i] = byte(lenDomain & 0xff)
k := 0
for j := i + 1; j < plusOne; j++ {
s.RawDomains[j] = domain[k]
k++
}
i += plusOne
}
}
}
s.encodeDomains()
if err, addr = s.StringParam("dhcp6.spoof.address"); err != nil {
return err

11
modules/dns_spoof.go
View file

@ -79,17 +79,8 @@ func (s *DNSSpoofer) Configure() error {
return err
}
s.Domains = make([]string, 0)
if err, domains := s.StringParam("dns.spoof.domains"); err != nil {
if err, s.Domains = s.ListParam("dns.spoof.domains"); err != nil {
return err
} else {
parts := strings.Split(domains, ",")
for _, part := range parts {
part = strings.Trim(part, "\t\n\r ")
if part != "" {
s.Domains = append(s.Domains, part)
}
}
}
if err, addr = s.StringParam("dns.spoof.address"); err != nil {

18
session/module.go
View file

@ -2,6 +2,7 @@ package session
import (
"fmt"
"strings"
"sync"
)
@ -53,6 +54,23 @@ func (m *SessionModule) Param(name string) *ModuleParam {
return m.params[name]
}
func (m SessionModule) ListParam(name string) (err error, values []string) {
values = make([]string, 0)
list := ""
if err, list = m.StringParam(name); err != nil {
return
} else {
parts := strings.Split(list, ",")
for _, part := range parts {
part = strings.Trim(part, "\t\n\r ")
if part != "" {
values = append(values, part)
}
}
}
return
}
func (m SessionModule) StringParam(name string) (error, string) {
if p, found := m.params[name]; found == true {
if err, v := p.Get(m.Session); err != nil {