bettercap 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a2d2ef953dadd1f83f919602e1ce9ea7412196
-  data.tar.gz: 3f72b7be236e36d547ea39d8542946202c2299d1
+  metadata.gz: d1fb03c684e4f5c63193e20fa8d8cd226f619059
+  data.tar.gz: 02c684a36e92f414fb1ba06095e6690309320d60
 SHA512:
-  metadata.gz: ab73ae16afddedccdc90f7a4e5c1a370ff6e020514562dfaa06b46123b838cfee1166751bec560c63143d3c24cf9e5c3bf25c7120aedf1abde3d31b2ea39503b
-  data.tar.gz: 43286b7a2efabda473a34c333d5cbe37c1fb83706aba9a8beced40c314c84b7799062084cb2ce5eafdd9b183aa1973a664bf96aba1b5adb661d298807eb52255
+  metadata.gz: 9f0b04d7769d9d27a02c53bdf7af45024a417bd67fae18a3fa67b7b47af51454a8246e222df3d38657ab519af3dfa7d3e947406916ac963d6735f5514e7bc831
+  data.tar.gz: 9a145c4ecb97d929433b5411657d551145f3e1e4c642a42c54c5d6deba673556e53aae746647e1c82d713f0d7bb7bb049aec3648bd3ab00dcf85d5f5ae227ee5

data/lib/bettercap/context.rb

@@ -121,12 +121,11 @@ class Context
   # Start everything!
   def start!
     # Start targets auto discovery.
-    BetterCap::Logger.info( "Targeting the whole subnet #{@ifconfig[:ip4_obj].to_range} ..." ) unless @options.spoof.enabled? or @options.core.arpcache
     @discovery.start
     # give some time to the discovery thread to spawn its workers,
     # this will prevent 'Too many open files' errors to delay host
     # discovery.
-    sleep(1.5) unless @options.core.arpcache
+    sleep(1.5) if @options.core.discovery?
 
     # Start network spoofers if any.
     @spoofer.each do |spoofer|

data/lib/bettercap/discovery/thread.rb

@@ -23,6 +23,10 @@ class Thread
 
   # Start the active network discovery thread.
   def start
+    if @ctx.options.core.discovery?
+      Logger.info "[#{'DISCOVERY'.green}] Targeting the whole subnet #{@ctx.ifconfig[:ip4_obj].to_range} ..."
+    end
+
     @running = true
     @thread  = ::Thread.new { worker }
   end
@@ -31,7 +35,6 @@ class Thread
   def stop
     @running = false
     if @thread != nil
-      Logger.info( 'Stopping network discovery thread ...' ) unless @ctx.options.core.arpcache
       begin
         @thread.exit
       rescue
@@ -97,18 +100,23 @@ class Thread
   # This method implements the main discovery logic, it will be executed within
   # the spawned thread.
   def worker
-    Logger.debug( 'Network discovery thread started.' ) unless @ctx.options.core.arpcache
+    Logger.debug( 'Network discovery thread started.' ) if @ctx.options.core.discovery?
 
     prev = []
     while @running
-      @ctx.targets = Network.get_alive_targets(@ctx).sort_by { |t| t.sortable_ip }
+      # No targets specified.
+      if @ctx.options.core.targets.nil?
+        @ctx.targets = Network.get_alive_targets(@ctx).sort_by {
+          |t| t.sortable_ip
+        }
+      end
 
-      print_differences( prev ) unless @ctx.options.core.arpcache
+      print_differences( prev ) if @ctx.options.core.discovery?
 
       prev = @ctx.targets
 
       @ctx.memory.optimize!
-      sleep(1) if @ctx.options.core.arpcache
+      sleep(1) if @ctx.options.core.discovery?
     end
   end
 end

data/lib/bettercap/memory.rb

@@ -46,7 +46,7 @@ class Memory
         freed_d = new_freed
       end
 
-      Logger.debug "GC: allocd objects: #{allocs_d} freed objects: #{freed_d}"
+      # Logger.debug "GC: allocd objects: #{allocs_d} freed objects: #{freed_d}"
 
       @total_allocs = new_allocs
       @total_freed  = new_freed

data/lib/bettercap/network/network.rb

@@ -54,7 +54,7 @@ class << self
   # Return a list of BetterCap::Target objects found on the network, given a
   # BetterCap::Context ( +ctx+ ) and a +timeout+ in seconds for the operation.
   def get_alive_targets( ctx )
-    if ctx.options.core.should_discover_hosts?
+    if ctx.options.core.discovery?
       start_agents( ctx )
     else
       Logger.debug 'Using current ARP cache.'

data/lib/bettercap/network/packet_queue.rb

@@ -100,7 +100,9 @@ class PacketQueue
         sleep(@throttle) if @throttle != 0.0
 
       rescue Exception => e
-        Logger.debug "#{self.class.name} ( #{packet.class.name} ) : #{e.message}"
+        if !e.message.include?('Host is down') and !e.message.include?('Permission denied') and !e.message.include?('No route to host')
+          Logger.debug "#{self.class.name} ( #{packet.class.name} ) : #{e.message}"
+        end
 
         # If we've got an error message such as:
         #   (cannot open BPF device) /dev/bpf0: Too many open files

data/lib/bettercap/network/validator.rb

@@ -27,6 +27,15 @@ class Validator
     false
   end
 
+  # Return true if +port+ is a valid port, otherwise false.
+  def self.is_valid_port?(port)
+    port ||= ""
+    return false if port.strip.empty?
+    return false unless port =~ /^[0-9]+$/
+    port = port.to_i
+    return ( port > 0 and port <= 65535 )
+  end
+
   # Extract valid IP addresses from +data+ and yields each one of them.
   def self.each_ip(data)
     data.scan(/(#{IP_ADDRESS_REGEX})/).each do |m|

data/lib/bettercap/options/core_options.rb

@@ -41,18 +41,18 @@ class CoreOptions
   attr_accessor :check_updates
 
   def initialize( iface )
-    @iface = iface
-    @gateway = nil
-    @targets = nil
-    @logfile = nil
-    @log_timestamp = false
-    @silent = false
-    @debug = false
-    @ignore = nil
-    @arpcache = false
-    @no_target_nbns = false
+    @iface           = iface
+    @gateway         = nil
+    @targets         = nil
+    @logfile         = nil
+    @log_timestamp   = false
+    @silent          = false
+    @debug           = false
+    @ignore          = nil
+    @arpcache        = false
+    @no_target_nbns  = false
     @packet_throttle = 0.0
-    @check_updates = false
+    @check_updates   = false
   end
 
   def parse!( ctx, opts )
@@ -127,6 +127,7 @@ class CoreOptions
     raise BetterCap::Error, 'No default interface found, please specify one with the -I argument.' if @iface.nil?
   end
 
+  # Return true if active host discovery is enabled, otherwise false.
   def discovery?
     ( @targets.nil? and !@arpcache )
   end
@@ -179,11 +180,6 @@ class CoreOptions
   def ignore_ip?(ip)
     !@ignore.nil? and @ignore.include?(ip)
   end
-
-  # Return true if active host discovery is enabled, otherwise false.
-  def should_discover_hosts?
-    !@arpcache
-  end
 end
 
 end

data/lib/bettercap/options/options.rb

@@ -78,7 +78,7 @@ class Options
   end
 
   def need_gateway?
-    ( @core.should_discover_hosts? or @spoof.enabled? )
+    ( @core.discovery? or @spoof.enabled? )
   end
 
   # Helper method to create a Firewalls::Redirection object.

data/lib/bettercap/options/proxy_options.rb

@@ -98,17 +98,35 @@ class ProxyOptions
     end
 
     opts.on( '--tcp-proxy-port PORT', "Set local TCP proxy port, default to #{@tcp_proxy_port.to_s.yellow} ." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @tcp_proxy      = true
       @tcp_proxy_port = v.to_i
     end
 
+    opts.on( '--tcp-proxy-upstream ADDRESS:PORT', 'Set TCP proxy upstream server address and port.' ) do |v|
+      if v =~ /^(.+):(\d+)$/
+        address = $1
+        port    = $2
+      else
+        raise BetterCap::Error, "Invalid address and port specified, the correct syntax is ADDRESS:PORT ( i.e. 192.168.1.2:22 )."
+      end
+
+      address, port = validate_address address, port
+
+      @tcp_proxy                  = true
+      @tcp_proxy_upstream_address = address
+      @tcp_proxy_upstream_port    = port.to_i
+    end
+
     opts.on( '--tcp-proxy-upstream-address ADDRESS', 'Set TCP proxy upstream server address.' ) do |v|
-      raise BetterCap::Error, 'Invalid TCP proxy upstream server address specified.' unless Network::Validator.is_ip?(v)
+      v, _ = validate_address v
+
       @tcp_proxy                  = true
       @tcp_proxy_upstream_address = v
     end
 
     opts.on( '--tcp-proxy-upstream-port PORT', 'Set TCP proxy upstream server port.' ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @tcp_proxy               = true
       @tcp_proxy_upstream_port = v.to_i
     end
@@ -121,6 +139,7 @@ class ProxyOptions
     end
 
     opts.on( '--proxy-port PORT', "Set HTTP proxy port, default to #{@proxy_port.to_s.yellow}." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @proxy = true
       @proxy_port = v.to_i
     end
@@ -146,6 +165,7 @@ class ProxyOptions
     end
 
     opts.on( '--proxy-https-port PORT', "Set HTTPS proxy port, default to #{@proxy_https_port.to_s.yellow}." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @proxy_https = true
       @proxy_https_port = v.to_i
     end
@@ -168,6 +188,7 @@ class ProxyOptions
     end
 
     opts.on( '--custom-proxy-port PORT', "Specify a port for the custom HTTP upstream proxy, default to #{@custom_proxy_port.to_s.yellow}." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @custom_proxy_port = v.to_i
     end
 
@@ -176,6 +197,7 @@ class ProxyOptions
     end
 
     opts.on( '--custom-https-proxy-port PORT', "Specify a port for the custom HTTPS upstream proxy, default to #{@custom_https_proxy_port.to_s.yellow}." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @custom_https_proxy_port = v.to_i
     end
 
@@ -253,6 +275,20 @@ class ProxyOptions
   def any?
     @proxy or @proxy_https or @tcp_proxy or @custom_proxy
   end
+
+  def validate_address( address, port = nil )
+    unless Network::Validator.is_ip?(address)
+      begin
+        address = IPSocket.getaddress address
+      rescue SocketError
+        raise BetterCap::Error, "Could not resolve '#{address}' to a valid ip address."
+      end
+    end
+
+    raise BetterCap::Error, "Invalid port '#{port}' specified." unless port.nil? or Network::Validator.is_valid_port?(port)
+
+    [ address, port ]
+  end
 end
 
 end

data/lib/bettercap/options/server_options.rb

@@ -28,12 +28,12 @@ class ServerOptions
   attr_accessor :dnsd_file
 
   def initialize
-    @httpd = false
+    @httpd      = false
     @httpd_port = 8081
     @httpd_path = './'
-    @dnsd = false
-    @dnsd_port = 5300
-    @dnsd_file = nil
+    @dnsd       = false
+    @dnsd_port  = 5300
+    @dnsd_file  = nil
   end
 
   def parse!( ctx, opts )
@@ -46,6 +46,7 @@ class ServerOptions
     end
 
     opts.on( '--httpd-port PORT', "Set HTTP server port, default to #{@httpd_port.to_s.yellow}." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @httpd = true
       @httpd_port = v.to_i
     end
@@ -61,6 +62,7 @@ class ServerOptions
     end
 
     opts.on( '--dns-port PORT', "Set DNS server port, default to #{@dnsd_port.to_s.yellow}." ) do |v|
+      raise BetterCap::Error, "Invalid port '#{v}' specified." unless Network::Validator.is_valid_port?(v)
       @dnsd_port = v.to_i
     end
 

data/lib/bettercap/options/sniff_options.rb

@@ -31,13 +31,13 @@ class SniffOptions
   attr_accessor :local
 
   def initialize
-    @enabled = false
-    @output = nil
-    @filter = nil
-    @src = nil
-    @parsers = ['*']
+    @enabled       = false
+    @output        = nil
+    @filter        = nil
+    @src           = nil
+    @parsers       = ['*']
     @custom_parser = nil
-    @local = false
+    @local         = false
   end
 
   def parse!( ctx, opts )

data/lib/bettercap/options/spoof_options.rb

@@ -23,9 +23,9 @@ class SpoofOptions
   attr_accessor :kill
 
   def initialize
-    @spoofer = 'ARP'
+    @spoofer     = 'ARP'
     @half_duplex = false
-    @kill = false
+    @kill        = false
   end
 
   def parse!( ctx, opts )

data/lib/bettercap/proxy/http/module.rb

@@ -51,8 +51,8 @@ class Module
       require ctx.options.proxies.proxy_module
 
       self.register_options(opts)
-    rescue LoadError
-      raise BetterCap::Error, "Invalid proxy module name '#{name}' ."
+    rescue LoadError => e
+      raise BetterCap::Error, "Invalid proxy module name '#{name}': #{e.message}"
     end
   end
 

data/lib/bettercap/proxy/tcp/module.rb

@@ -51,8 +51,8 @@ class Module
     def load( file )
       begin
         require file
-      rescue LoadError
-        raise BetterCap::Error, "Invalid TCP proxy module specified."
+      rescue LoadError => e
+        raise BetterCap::Error, "Invalid TCP proxy module specified: #{e.message}"
       end
 
       @@loaded.each do |name,mod|

data/lib/bettercap/spoofers/base.rb

@@ -92,7 +92,7 @@ private
           break
       end
 
-      Logger.debug "Spoofing #{@ctx.targets.size} targets ..."
+      Logger.debug "Spoofing #{@ctx.targets.size} targets ..." unless @ctx.targets.empty?
 
       update_targets!
 

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.5.0'
+  VERSION = '1.5.1'
   # 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.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize