bettercap 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f64cdb79dca07a3c065c5f3366f7f671c6079bfe
-  data.tar.gz: c0e595b1c5fbc9063ca6a0221e1abdf672285d90
+  metadata.gz: b2645aedfa3e74db2c01d8856b6c0149302317d5
+  data.tar.gz: 3e891382aec5781ff109d8e2e7705c48bc6cb3a7
 SHA512:
-  metadata.gz: af93686ecafad8b4cea0f54358006c671687065a1c07374ff8791e170294fb5a51664acafa1a2b00c3e29e742366e53eaacf0a67b64d4f5be73dbc2f6faa490e
-  data.tar.gz: 9bd343afaf63459684ddf4db394374cb07f65707da3dadf8d9747a59be8a8391c08181bf96b3b572808ec2c8d14db8ffd97bd898928c42ff6a982632fd19b51c
+  metadata.gz: a704b2a1156afa0a087a48d64041d3197f86664f778172acdf299fc34da6c6b602091961d86e484ca576f5c06408f3a91ec9610d324800285eb85747a1235d21
+  data.tar.gz: 33f2ed1ea9e4e643d196269f7015f4d47be69e175859355ca797bba1597d2bd8763cbe6bb011f6687a3725243d1f448a1e34bcc2318a42da410df8f4db4693bf

data/lib/bettercap/context.rb

@@ -25,6 +25,7 @@ class Context
   attr_accessor :firewall
   # Network gateway IP address.
   attr_accessor :gateway
+  # A boolean value indicating if the gateway mac address was already resolved.
   attr_accessor :gateway_mac_resolved
   # A list of BetterCap::Target objects which is periodically updated.
   attr_accessor :targets

data/lib/bettercap/discovery/agents/base.rb

@@ -48,9 +48,9 @@ class Base
 
   # Return true if +ip+ must be skipped during discovery, otherwise false.
   def skip_address?(ip)
-    # don't send probes to the gateway
-    if ip == @ctx.gateway and @ctx.gateway_mac_resolved
-      return true
+    # don't send probes to the gateway if we already have its MAC.
+    if ip == @ctx.gateway
+      return @ctx.gateway_mac_resolved
     # don't send probes to our device
     elsif ip == @local_ip
       return true

data/lib/bettercap/options.rb

@@ -511,7 +511,7 @@ class Options
   def get_redirections ifconfig
     redirections = []
 
-    if @dnsd
+    if @dnsd or @proxy
       redirections << redir( ifconfig[:ip_saddr], 53, @dnsd_port )
       redirections << redir( ifconfig[:ip_saddr], 53, @dnsd_port, 'UDP' )
     end
@@ -548,14 +548,14 @@ class Options
     on = '✔'.green
     off = '✘'.red
     status = {
-      'spoofing'    => if has_spoofer? then on else off end,
-      'discovery'   => if !target.nil? or arpcache then off else on end,
-      'sniffer'     => if sniffer then on else off end,
-      'http-proxy'  => if proxy then on else off end,
-      'https-proxy' => if proxy_https then on else off end,
-      'sslstrip'    => if proxy and sslstrip then on else off end,
-      'http-server' => if httpd then on else off end,
-      'dns-server'  => if dnsd then on else off end
+      'spoofing'    => ( has_spoofer? ? on : off ),
+      'discovery'   => ( ( !target.nil? or arpcache ) ? off : on ),
+      'sniffer'     => ( sniffer ? on : off ),
+      'http-proxy'  => ( proxy ? on : off ),
+      'https-proxy' => ( proxy_https ? on : off ),
+      'sslstrip'    => ( ( proxy and sslstrip ) ? on : off ),
+      'http-server' => ( httpd ? on : off ),
+      'dns-server'  => ( ( sslstrip or dnsd ) ? on : off )
     }
 
     msg = "Starting [ "

data/lib/bettercap/spoofers/base.rb

@@ -109,7 +109,11 @@ private
     hw = Network.get_hw_address( @ctx, @ctx.gateway )
     raise BetterCap::Error, "Couldn't determine router MAC" if hw.nil?
     @gateway = Network::Target.new( @ctx.gateway, hw )
+    
+    # notify the system that the gateway mac is resolved, this will prevent
+    # the gateway ip to be unnecessarily probed from discovery agents.
     @ctx.gateway_mac_resolved = true
+
     Logger.info "[#{'GATEWAY'.green}] #{@gateway.to_s(false)}"
   end
 

data/lib/bettercap/version.rb

@@ -12,7 +12,7 @@ This project is released under the GPL 3 license.
 =end
 module BetterCap
   # Current version of bettercap.
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
   # Program banner.
   BANNER = File.read( File.dirname(__FILE__) + '/banner' ).gsub( '#VERSION#', "v#{VERSION}")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bettercap
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize