github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-22 06:23:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

session: SessionModule.IntParam() swap error returns

Browse source 
tls: fix calling function

module: fix calling functions
This commit is contained in:
Lars Lehtonen 2019-11-25 03:43:32 -08:00
commit dc23178b28
No known key found for this signature in database
GPG key ID: 8137D474EBCB04F2
22 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/any_proxy/any_proxy.go
View file

@ -85,9 +85,9 @@ func (mod *AnyProxy) Configure() error {
return err return err
} else if err, protocol = mod.StringParam("any.proxy.protocol"); err != nil { } else if err, protocol = mod.StringParam("any.proxy.protocol"); err != nil {
return err return err
} else if err, srcPort = mod.IntParam("any.proxy.src_port"); err != nil { } else if srcPort, err = mod.IntParam("any.proxy.src_port"); err != nil {
return err return err
} else if err, dstPort = mod.IntParam("any.proxy.dst_port"); err != nil { } else if dstPort, err = mod.IntParam("any.proxy.dst_port"); err != nil {
return err return err
} else if err, srcAddress = mod.StringParam("any.proxy.src_address"); err != nil { } else if err, srcAddress = mod.StringParam("any.proxy.src_address"); err != nil {
return err return err

2
modules/api_rest/api_rest.go
View file

@ -191,7 +191,7 @@ func (mod *RestAPI) Configure() error {
return session.ErrAlreadyStarted(mod.Name()) return session.ErrAlreadyStarted(mod.Name())
} else if err, ip = mod.StringParam("api.rest.address"); err != nil { } else if err, ip = mod.StringParam("api.rest.address"); err != nil {
return err return err
} else if err, port = mod.IntParam("api.rest.port"); err != nil { } else if port, err = mod.IntParam("api.rest.port"); err != nil {
return err return err
} else if err, mod.allowOrigin = mod.StringParam("api.rest.alloworigin"); err != nil { } else if err, mod.allowOrigin = mod.StringParam("api.rest.alloworigin"); err != nil {
return err return err

2
modules/api_rest/api_rest_record.go
View file

@ -82,7 +82,7 @@ func (mod *RestAPI) startRecording(filename string) (err error) {
return mod.errAlreadyRecording() return mod.errAlreadyRecording()
} else if mod.replaying { } else if mod.replaying {
return mod.errAlreadyReplaying() return mod.errAlreadyReplaying()
} else if err, mod.recClock = mod.IntParam("api.rest.record.clock"); err != nil { } else if mod.recClock, err = mod.IntParam("api.rest.record.clock"); err != nil {
return err return err
} else if mod.recordFileName, err = fs.Expand(filename); err != nil { } else if mod.recordFileName, err = fs.Expand(filename); err != nil {
return err return err

6
modules/ble/ble_recon.go
View file

@ -157,7 +157,7 @@ func (mod *BLERecon) Configure() (err error) {
if mod.Running() { if mod.Running() {
return session.ErrAlreadyStarted(mod.Name()) return session.ErrAlreadyStarted(mod.Name())
} else if mod.gattDevice == nil { } else if mod.gattDevice == nil {
if err, mod.deviceId = mod.IntParam("ble.device"); err != nil { if mod.deviceId, err = mod.IntParam("ble.device"); err != nil {
return err return err
} }
@ -180,9 +180,9 @@ func (mod *BLERecon) Configure() (err error) {
mod.gattDevice.Init(mod.onStateChanged) mod.gattDevice.Init(mod.onStateChanged)
} }
if err, mod.connTimeout = mod.IntParam("ble.timeout"); err != nil { if mod.connTimeout, err = mod.IntParam("ble.timeout"); err != nil {
return err return err
} else if err, mod.devTTL = mod.IntParam("ble.ttl"); err != nil { } else if mod.devTTL, err = mod.IntParam("ble.ttl"); err != nil {
return err return err
} }

2
modules/gps/gps.go
View file

@ -75,7 +75,7 @@ func (mod *GPS) Configure() (err error) {
return session.ErrAlreadyStarted(mod.Name()) return session.ErrAlreadyStarted(mod.Name())
} else if err, mod.serialPort = mod.StringParam("gps.device"); err != nil { } else if err, mod.serialPort = mod.StringParam("gps.device"); err != nil {
return err return err
} else if err, mod.baudRate = mod.IntParam("gps.baudrate"); err != nil { } else if mod.baudRate, err = mod.IntParam("gps.baudrate"); err != nil {
return err return err
} }

8
modules/hid/hid.go
View file

@ -176,23 +176,23 @@ func (mod *HIDRecon) Configure() error {
return err return err
} }
if err, mod.devTTL = mod.IntParam("hid.ttl"); err != nil { if mod.devTTL, err = mod.IntParam("hid.ttl"); err != nil {
return err return err
} }
if err, n = mod.IntParam("hid.hop.period"); err != nil { if n, err = mod.IntParam("hid.hop.period"); err != nil {
return err return err
} else { } else {
mod.hopPeriod = time.Duration(n) * time.Millisecond mod.hopPeriod = time.Duration(n) * time.Millisecond
} }
if err, n = mod.IntParam("hid.ping.period"); err != nil { if n, err = mod.IntParam("hid.ping.period"); err != nil {
return err return err
} else { } else {
mod.pingPeriod = time.Duration(n) * time.Millisecond mod.pingPeriod = time.Duration(n) * time.Millisecond
} }
if err, n = mod.IntParam("hid.sniff.period"); err != nil { if n, err = mod.IntParam("hid.sniff.period"); err != nil {
return err return err
} else { } else {
mod.sniffPeriod = time.Duration(n) * time.Millisecond mod.sniffPeriod = time.Duration(n) * time.Millisecond

4
modules/http_proxy/http_proxy.go
View file

@ -92,9 +92,9 @@ func (mod *HttpProxy) Configure() error {
return session.ErrAlreadyStarted(mod.Name()) return session.ErrAlreadyStarted(mod.Name())
} else if err, address = mod.StringParam("http.proxy.address"); err != nil { } else if err, address = mod.StringParam("http.proxy.address"); err != nil {
return err return err
} else if err, proxyPort = mod.IntParam("http.proxy.port"); err != nil { } else if proxyPort, err = mod.IntParam("http.proxy.port"); err != nil {
return err return err
} else if err, httpPort = mod.IntParam("http.port"); err != nil { } else if httpPort, err = mod.IntParam("http.port"); err != nil {
return err return err
} else if err, scriptPath = mod.StringParam("http.proxy.script"); err != nil { } else if err, scriptPath = mod.StringParam("http.proxy.script"); err != nil {
return err return err

2
modules/http_server/http_server.go
View file

@ -92,7 +92,7 @@ func (mod *HttpServer) Configure() error {
return err return err
} }
if err, port = mod.IntParam("http.server.port"); err != nil { if port, err = mod.IntParam("http.server.port"); err != nil {
return err return err
} }

4
modules/https_proxy/https_proxy.go
View file

@ -109,9 +109,9 @@ func (mod *HttpsProxy) Configure() error {
return session.ErrAlreadyStarted(mod.Name()) return session.ErrAlreadyStarted(mod.Name())
} else if err, address = mod.StringParam("https.proxy.address"); err != nil { } else if err, address = mod.StringParam("https.proxy.address"); err != nil {
return err return err
} else if err, proxyPort = mod.IntParam("https.proxy.port"); err != nil { } else if proxyPort, err = mod.IntParam("https.proxy.port"); err != nil {
return err return err
} else if err, httpPort = mod.IntParam("https.port"); err != nil { } else if httpPort, err = mod.IntParam("https.port"); err != nil {
return err return err
} else if stripSSL, err = mod.BoolParam("https.proxy.sslstrip"); err != nil { } else if stripSSL, err = mod.BoolParam("https.proxy.sslstrip"); err != nil {
return err return err

2
modules/https_server/https_server.go
View file

@ -110,7 +110,7 @@ func (mod *HttpsServer) Configure() error {
return err return err
} }
if err, port = mod.IntParam("https.server.port"); err != nil { if port, err = mod.IntParam("https.server.port"); err != nil {
return err return err
} }

2
modules/mdns_server/mdns_server.go
View file

@ -114,7 +114,7 @@ func (mod *MDNSServer) Configure() (err error) {
return err return err
} else if err, ip6 = mod.StringParam("mdns.server.address6"); err != nil { } else if err, ip6 = mod.StringParam("mdns.server.address6"); err != nil {
return err return err
} else if err, port = mod.IntParam("mdns.server.port"); err != nil { } else if port, err = mod.IntParam("mdns.server.port"); err != nil {
return err return err
} else if err, info = mod.StringParam("mdns.server.info"); err != nil { } else if err, info = mod.StringParam("mdns.server.info"); err != nil {
return err return err

2
modules/mysql_server/mysql_server.go
View file

@ -86,7 +86,7 @@ func (mod *MySQLServer) Configure() error {
return err return err
} else if err, address = mod.StringParam("mysql.server.address"); err != nil { } else if err, address = mod.StringParam("mysql.server.address"); err != nil {
return err return err
} else if err, port = mod.IntParam("mysql.server.port"); err != nil { } else if port, err = mod.IntParam("mysql.server.port"); err != nil {
return err return err
} else if mod.address, err = net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", address, port)); err != nil { } else if mod.address, err = net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", address, port)); err != nil {
return err return err

2
modules/net_probe/net_probe.go
View file

@ -81,7 +81,7 @@ func (mod Prober) Author() string {
func (mod *Prober) Configure() error { func (mod *Prober) Configure() error {
var err error var err error
if err, mod.throttle = mod.IntParam("net.probe.throttle"); err != nil { if mod.throttle, err = mod.IntParam("net.probe.throttle"); err != nil {
return err return err
} else if mod.probes.NBNS, err = mod.BoolParam("net.probe.nbns"); err != nil { } else if mod.probes.NBNS, err = mod.BoolParam("net.probe.nbns"); err != nil {
return err return err

2
modules/packet_proxy/packet_proxy_linux_amd64.go
View file

@ -132,7 +132,7 @@ func (mod *PacketProxy) Configure() (err error) {
mod.destroyQueue() mod.destroyQueue()
if err, mod.queueNum = mod.IntParam("packet.proxy.queue.num"); err != nil { if mod.queueNum, err = mod.IntParam("packet.proxy.queue.num"); err != nil {
return return
} else if err, mod.chainName = mod.StringParam("packet.proxy.chain"); err != nil { } else if err, mod.chainName = mod.StringParam("packet.proxy.chain"); err != nil {
return return

2
modules/syn_scan/syn_scan.go
View file

@ -78,7 +78,7 @@ func NewSynScanner(s *session.Session) *SynScanner {
return err return err
} else if err = mod.parsePorts(args); err != nil { } else if err = mod.parsePorts(args); err != nil {
return err return err
} else if err, period = mod.IntParam("syn.scan.show-progress-every"); err != nil { } else if period, err = mod.IntParam("syn.scan.show-progress-every"); err != nil {
return err return err
} else { } else {
mod.progressEvery = time.Duration(period) * time.Second mod.progressEvery = time.Duration(period) * time.Second

6
modules/tcp_proxy/tcp_proxy.go
View file

@ -102,13 +102,13 @@ func (mod *TcpProxy) Configure() error {
return err return err
} else if err, proxyAddress = mod.StringParam("tcp.proxy.address"); err != nil { } else if err, proxyAddress = mod.StringParam("tcp.proxy.address"); err != nil {
return err return err
} else if err, proxyPort = mod.IntParam("tcp.proxy.port"); err != nil { } else if proxyPort, err = mod.IntParam("tcp.proxy.port"); err != nil {
return err return err
} else if err, port = mod.IntParam("tcp.port"); err != nil { } else if port, err = mod.IntParam("tcp.port"); err != nil {
return err return err
} else if err, tunnelAddress = mod.StringParam("tcp.tunnel.address"); err != nil { } else if err, tunnelAddress = mod.StringParam("tcp.tunnel.address"); err != nil {
return err return err
} else if err, tunnelPort = mod.IntParam("tcp.tunnel.port"); err != nil { } else if tunnelPort, err = mod.IntParam("tcp.tunnel.port"); err != nil {
return err return err
} else if err, scriptPath = mod.StringParam("tcp.proxy.script"); err != nil { } else if err, scriptPath = mod.StringParam("tcp.proxy.script"); err != nil {
return err return err

2
modules/ticker/ticker.go
View file

@ -62,7 +62,7 @@ func (mod *Ticker) Configure() error {
return session.ErrAlreadyStarted(mod.Name()) return session.ErrAlreadyStarted(mod.Name())
} else if err, commands = mod.StringParam("ticker.commands"); err != nil { } else if err, commands = mod.StringParam("ticker.commands"); err != nil {
return err return err
} else if err, period = mod.IntParam("ticker.period"); err != nil { } else if period, err = mod.IntParam("ticker.period"); err != nil {
return err return err
} }

2
modules/utils/view_selector.go
View file

@ -100,7 +100,7 @@ func (s *ViewSelector) Update() (err error) {
return return
} else if err = s.parseSorting(); err != nil { } else if err = s.parseSorting(); err != nil {
return return
} else if err, s.Limit = s.owner.IntParam(s.limitName); err != nil { } else if s.Limit, err = s.owner.IntParam(s.limitName); err != nil {
return return
} }
return return

10
modules/wifi/wifi.go
View file

@ -421,19 +421,19 @@ func (mod *WiFiModule) Configure() error {
var hopPeriod int var hopPeriod int
var err error var err error
if err, mod.apTTL = mod.IntParam("wifi.ap.ttl"); err != nil { if mod.apTTL, err = mod.IntParam("wifi.ap.ttl"); err != nil {
return err return err
} else if err, mod.staTTL = mod.IntParam("wifi.sta.ttl"); err != nil { } else if mod.staTTL, err = mod.IntParam("wifi.sta.ttl"); err != nil {
return err return err
} }
if err, mod.region = mod.StringParam("wifi.region"); err != nil { if err, mod.region = mod.StringParam("wifi.region"); err != nil {
return err return err
} else if err, mod.txPower = mod.IntParam("wifi.txpower"); err != nil { } else if mod.txPower, err = mod.IntParam("wifi.txpower"); err != nil {
return err return err
} else if err, mod.source = mod.StringParam("wifi.source.file"); err != nil { } else if err, mod.source = mod.StringParam("wifi.source.file"); err != nil {
return err return err
} else if err, mod.minRSSI = mod.IntParam("wifi.rssi.min"); err != nil { } else if mod.minRSSI, err = mod.IntParam("wifi.rssi.min"); err != nil {
return err return err
} }
@ -517,7 +517,7 @@ func (mod *WiFiModule) Configure() error {
if mod.skipBroken, err = mod.BoolParam("wifi.skip-broken"); err != nil { if mod.skipBroken, err = mod.BoolParam("wifi.skip-broken"); err != nil {
return err return err
} else if err, hopPeriod = mod.IntParam("wifi.hop.period"); err != nil { } else if hopPeriod, err = mod.IntParam("wifi.hop.period"); err != nil {
return err return err
} }

2
modules/wifi/wifi_ap.go
View file

@ -22,7 +22,7 @@ func (mod *WiFiModule) parseApConfig() (err error) {
return return
} else if mod.apConfig.BSSID, err = net.ParseMAC(network.NormalizeMac(bssid)); err != nil { } else if mod.apConfig.BSSID, err = net.ParseMAC(network.NormalizeMac(bssid)); err != nil {
return return
} else if err, mod.apConfig.Channel = mod.IntParam("wifi.ap.channel"); err != nil { } else if mod.apConfig.Channel, err = mod.IntParam("wifi.ap.channel"); err != nil {
return return
} else if mod.apConfig.Encryption, err = mod.BoolParam("wifi.ap.encryption"); err != nil { } else if mod.apConfig.Encryption, err = mod.BoolParam("wifi.ap.encryption"); err != nil {
return return

8
session/module.go
View file

@ -189,16 +189,16 @@ func (m SessionModule) IPParam(name string) (error, net.IP) {
} }
} }
func (m SessionModule) IntParam(name string) (error, int) { func (m SessionModule) IntParam(name string) (int, error) {
if p, found := m.params[name]; found { if p, found := m.params[name]; found {
if v, err := p.Get(m.Session); err != nil { if v, err := p.Get(m.Session); err != nil {
return err, 0 return 0, err
} else { } else {
return nil, v.(int) return v.(int), nil
} }
} else { } else {
return fmt.Errorf("Parameter %s does not exist.", name), 0 return 0, fmt.Errorf("Parameter %s does not exist.", name)
} }
} }

2
tls/cert.go
View file

@ -58,7 +58,7 @@ func CertConfigToModule(prefix string, m *session.SessionModule, defaults CertCo
} }
func CertConfigFromModule(prefix string, m session.SessionModule) (cfg CertConfig, err error) { func CertConfigFromModule(prefix string, m session.SessionModule) (cfg CertConfig, err error) {
if err, cfg.Bits = m.IntParam(prefix + ".certificate.bits"); err != nil { if cfg.Bits, err = m.IntParam(prefix + ".certificate.bits"); err != nil {
return cfg, err return cfg, err
} else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil { } else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil {
return cfg, err return cfg, err