bettercap 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fb03c684e4f5c63193e20fa8d8cd226f619059
-  data.tar.gz: 02c684a36e92f414fb1ba06095e6690309320d60
+  metadata.gz: 182a02bf76fdd35026f7807807c63c0f27f2dae2
+  data.tar.gz: 231c55ddf54d61c4fd50bc7aa66e39e825f99fd8
 SHA512:
-  metadata.gz: 9f0b04d7769d9d27a02c53bdf7af45024a417bd67fae18a3fa67b7b47af51454a8246e222df3d38657ab519af3dfa7d3e947406916ac963d6735f5514e7bc831
-  data.tar.gz: 9a145c4ecb97d929433b5411657d551145f3e1e4c642a42c54c5d6deba673556e53aae746647e1c82d713f0d7bb7bb049aec3648bd3ab00dcf85d5f5ae227ee5
+  metadata.gz: 17d11b9a0f810509cde47dc5e236ea22e0d18abd8fb5ec74fec50abab8e0b65f2ee6d2a91490d1d4e861cfb0e52d6f4febc383a30f4e89bd98a0f4280443b6de
+  data.tar.gz: 0c465a3405d311a59323be9b976951c6e670353af20ccb57e6a7189de89d463162a56b0f9d5c5dc6283b467830ff4e4677b4ee1d4db6fd0749bb699ea8747ed8

data/lib/bettercap/context.rb

@@ -17,10 +17,10 @@ module BetterCap
 class Context
   # Instance of BetterCap::Options class.
   attr_accessor :options
-  # A dictionary containing information about the selected network interface.
-  attr_accessor :ifconfig
   # Instance of the current BetterCap::Firewalls class.
   attr_accessor :firewall
+  # Local interface ( as an instance of BetterCap::Network::Target ).
+  attr_accessor :iface
   # Network gateway ( as an instance of BetterCap::Network::Target ).
   attr_accessor :gateway
   # A list of BetterCap::Target objects which is periodically updated.
@@ -63,8 +63,10 @@ class Context
     @running      = true
     @timeout      = 5
     @options      = Options.new iface
-    @ifconfig     = nil
-    @firewall     = nil
+    @discovery    = Discovery::Thread.new self
+    @firewall     = Firewalls::Base.get
+    @memory       = Memory.new
+    @iface        = nil
     @gateway      = nil
     @targets      = []
     @spoofer      = nil
@@ -72,10 +74,7 @@ class Context
     @dnsd         = nil
     @proxies      = []
     @redirections = []
-    @discovery    = Discovery::Thread.new self
-    @firewall     = Firewalls::Base.get
     @packets      = nil
-    @memory       = Memory.new
   end
 
   # Update the Context state parsing network related informations.
@@ -86,23 +85,24 @@ class Context
                             'correct network configuration, this could also happen if bettercap '\
                             'is launched from a virtual environment.' unless Network::Validator.is_ip?(gw)
 
-    @gateway  = Network::Target.new gw
-    @targets  = @options.core.targets unless @options.core.targets.nil?
-    @ifconfig = PacketFu::Utils.ifconfig @options.core.iface
 
+    cfg = PacketFu::Utils.ifconfig @options.core.iface
     raise BetterCap::Error, "Could not determine IPv4 address of '#{@options.core.iface}', make sure this interface "\
-                            'is active and connected.' if @ifconfig[:ip4_obj].nil?
+                            'is active and connected.' if cfg[:ip4_obj].nil?
+
+    @gateway = Network::Target.new gw
+    @targets = @options.core.targets unless @options.core.targets.nil?
+    @iface   = Network::Target.new( cfg[:ip_saddr], cfg[:eth_saddr], cfg[:ip4_obj], cfg[:iface] )
+
+    Logger.info "[#{@iface.name.green}] #{@iface.to_s(false)}"
 
     Logger.debug '----- NETWORK INFORMATIONS -----'
-    Logger.debug "  network  = #{@ifconfig[:ip4_obj]}"
+    Logger.debug "  network  = #{@iface.network} ( #{@iface.network.to_range.to_s.split('..').join( ' -> ')} )"
     Logger.debug "  gateway  = #{@gateway.ip}"
-    Logger.debug "  local_ip = #{@ifconfig[:ip_saddr]}\n"
-    @ifconfig.each do |key,value|
-      Logger.debug "  ifconfig[:#{key}] = #{value}"
-    end
+    Logger.debug "  local_ip = #{@iface.ip}"
     Logger.debug "--------------------------------\n"
 
-    @packets = Network::PacketQueue.new( @ifconfig[:iface], @options.core.packet_throttle, 4 )
+    @packets = Network::PacketQueue.new( @iface.name, @options.core.packet_throttle, 4 )
     # Spoofers need the context network data to be initialized.
     @spoofer = @options.spoof.parse_spoofers
   end
@@ -122,10 +122,6 @@ class Context
   def start!
     # Start targets auto discovery.
     @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) if @options.core.discovery?
 
     # Start network spoofers if any.
     @spoofer.each do |spoofer|
@@ -193,7 +189,7 @@ class Context
 
   # Apply needed BetterCap::Firewalls::Redirection objects.
   def enable_port_redirection!
-    @redirections = @options.get_redirections(@ifconfig)
+    @redirections = @options.get_redirections(@iface)
     @redirections.each do |r|
       Logger.debug "Redirecting #{r.protocol} traffic from #{r.src_address.nil? ? '*' : r.src_address}:#{r.src_port} to #{r.dst_address}:#{r.dst_port}"
       @firewall.add_port_redirection( r )
@@ -210,17 +206,17 @@ class Context
 
     # create HTTP proxy
     if @options.proxies.proxy
-      @proxies << Proxy::HTTP::Proxy.new( @ifconfig[:ip_saddr], @options.proxies.proxy_port, false )
+      @proxies << Proxy::HTTP::Proxy.new( @iface.ip, @options.proxies.proxy_port, false )
     end
 
     # create HTTPS proxy
     if @options.proxies.proxy_https
-      @proxies << Proxy::HTTP::Proxy.new( @ifconfig[:ip_saddr], @options.proxies.proxy_https_port, true )
+      @proxies << Proxy::HTTP::Proxy.new( @iface.ip, @options.proxies.proxy_https_port, true )
     end
 
     # create TCP proxy
     if @options.proxies.tcp_proxy
-      @proxies << Proxy::TCP::Proxy.new( @ifconfig[:ip_saddr], @options.proxies.tcp_proxy_port, @options.proxies.tcp_proxy_upstream_address, @options.proxies.tcp_proxy_upstream_port )
+      @proxies << Proxy::TCP::Proxy.new( @iface.ip, @options.proxies.tcp_proxy_port, @options.proxies.tcp_proxy_upstream_address, @options.proxies.tcp_proxy_upstream_port )
     end
 
     @proxies.each do |proxy|
@@ -234,7 +230,7 @@ class Context
     if @options.servers.dnsd
       Logger.warn "Starting DNS server with spoofing disabled, bettercap will only reply to local DNS queries." unless @options.spoof.enabled?
 
-      @dnsd = Network::Servers::DNSD.new( @options.servers.dnsd_file, @ifconfig[:ip_saddr], @options.servers.dnsd_port )
+      @dnsd = Network::Servers::DNSD.new( @options.servers.dnsd_file, @iface.ip, @options.servers.dnsd_port )
       @dnsd.start
     end
 

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

@@ -23,10 +23,10 @@ class Arp < Discovery::Agents::Base
   def get_probe( ip )
     pkt = PacketFu::ARPPacket.new
 
-    pkt.eth_saddr     = pkt.arp_saddr_mac = @ifconfig[:eth_saddr]
+    pkt.eth_saddr     = pkt.arp_saddr_mac = @ctx.iface.mac
     pkt.eth_daddr     = 'ff:ff:ff:ff:ff:ff'
     pkt.arp_daddr_mac = '00:00:00:00:00:00'
-    pkt.arp_saddr_ip  = @ifconfig[:ip_saddr]
+    pkt.arp_saddr_ip  = @ctx.iface.ip
     pkt.arp_daddr_ip  = ip.to_s
 
     pkt

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

@@ -20,13 +20,11 @@ class Base
   # Initialize the agent using the +ctx+ BetterCap::Context instance.
   # If +address+ is not nil only that ip will be probed.
   def initialize( ctx, address = nil )
-    @ctx       = ctx
-    @ifconfig  = ctx.ifconfig
-    @local_ip  = @ifconfig[:ip_saddr]
-    @address   = address
+    @ctx     = ctx
+    @address = address
 
     if @address.nil?
-      net = ip = @ifconfig[:ip4_obj]
+      net = ip = @ctx.iface.network
       # loop each ip in our subnet and push it to the queue
       while net.include?ip
         unless skip_address?(ip)
@@ -52,7 +50,7 @@ class Base
     if ip == @ctx.gateway.ip
       return !@ctx.gateway.mac.nil?
     # don't send probes to our device
-    elsif ip == @local_ip
+    elsif ip == @ctx.iface.ip
       return true
     # don't stress endpoints we already discovered
     else

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

@@ -26,9 +26,9 @@ class Icmp
     3.times do
       pkt = PacketFu::ICMPPacket.new
 
-      pkt.eth_saddr = ctx.ifconfig[:eth_saddr]
+      pkt.eth_saddr = ctx.iface.mac
       pkt.eth_daddr = 'ff:ff:ff:ff:ff:ff'
-      pkt.ip_saddr  = ctx.ifconfig[:ip_saddr]
+      pkt.ip_saddr  = ctx.iface.ip
       pkt.ip_daddr  = '255.255.255.255'
       pkt.icmp_type = 8
       pkt.icmp_code = 0

data/lib/bettercap/discovery/thread.rb

@@ -23,12 +23,16 @@ 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 }
+
+    if @ctx.options.core.discovery?
+      Logger.info "[#{'DISCOVERY'.green}] Targeting the whole subnet #{@ctx.iface.network.to_range} ..."
+      # 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)
+    end
   end
 
   # Stop the active network discovery thread.

data/lib/bettercap/monkey/celluloid/actor.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+
+# Monkey patching to remove Internals::Logger.crash calls.
+module Celluloid
+class Actor
+  # Handle any exceptions that occur within a running actor
+  def handle_crash(exception)
+      shutdown ExitEvent.new(behavior_proxy, exception)
+    rescue => ex
+  end
+end
+end

data/lib/bettercap/network/arp_reader.rb

@@ -21,7 +21,7 @@ class ArpReader
   def self.parse( ctx )
     targets = []
     self.parse_cache do |ip,mac|
-      if ip != ctx.gateway.ip and ip != ctx.ifconfig[:ip_saddr]
+      if ip != ctx.gateway.ip and ip != ctx.iface.ip
         if ctx.options.core.ignore_ip?(ip)
           Logger.debug "Ignoring #{ip} ..."
         else
@@ -65,7 +65,7 @@ class ArpReader
   # Read the computer ARP cache and parse each line, it will yield each
   # ip and mac address it will be able to extract.
   def self.parse_cache
-    iface = Context.get.ifconfig[:iface]
+    iface = Context.get.iface.name
     Shell.arp.split("\n").each do |line|
       m = self.parse_cache_line(iface,line)
       unless m.nil?

data/lib/bettercap/network/network.rb

@@ -56,8 +56,6 @@ class << self
   def get_alive_targets( ctx )
     if ctx.options.core.discovery?
       start_agents( ctx )
-    else
-      Logger.debug 'Using current ARP cache.'
     end
 
     ArpReader.parse ctx

data/lib/bettercap/network/packet_queue.rb

@@ -26,10 +26,19 @@ class PacketQueue
     @running  = true
     @stream   = PCAPRUB::Pcap.open_live( iface, 0xffff, false , 1 )
     @mutex    = Mutex.new
-    @udp      = UDPSocket.new
     @queue    = Queue.new
     @workers  = (0...nworkers).map { ::Thread.new { worker } }
     @ctx      = Context.get
+
+    begin
+      @udp = UDPSocket.new
+    rescue Errno::EMFILE
+      Logger.warn "It looks like another process is using a lot of UDP file descriptors" \
+                  "and the operating system is denying resources to me, I'll try again in one second."
+
+      sleep 1.0
+      retry
+    end
   end
 
   # Push a packet to the queue.

data/lib/bettercap/network/servers/dnsd.rb

@@ -78,22 +78,26 @@ class DNSD
       :server_class => DnsWrapper
     }
 
-    RubyDNS::run_server( options ) do
-      # Suppress RubyDNS logging.
-      @logger.level = ::Logger::ERROR
-      @upstream ||= RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
-
-      # Default DNS handler
-      otherwise do |transaction|
-        Logger.debug "[#{transaction.options[:peer]} > #{'DNS'.green}] Received request for '#{transaction.question.to_s.yellow}' -> upstream DNS"
-        transaction.passthrough!(@upstream)
+    begin
+      RubyDNS::run_server( options ) do
+        # Suppress RubyDNS logging.
+        @logger.level = ::Logger::ERROR
+        @upstream ||= RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+
+        # Default DNS handler
+        otherwise do |transaction|
+          Logger.debug "[#{transaction.options[:peer]} > #{'DNS'.green}] Received request for '#{transaction.question.to_s.yellow}' -> upstream DNS"
+          transaction.passthrough!(@upstream)
+        end
       end
-    end
 
-    unless @hosts.nil?
-      DNSD.parse_hosts( @hosts ).each do |exp,addr|
-        add_rule!( exp, addr )
+      unless @hosts.nil?
+        DNSD.parse_hosts( @hosts ).each do |exp,addr|
+          add_rule!( exp, addr )
+        end
       end
+    rescue Errno::EADDRINUSE
+      raise BetterCap::Error, "[DNS] It looks like there's another process listening on #{@address}:#{@port}, please chose a different port."
     end
   end
 
@@ -120,7 +124,7 @@ class DNSD
         expression = $2
 
         if address == 'local'
-          address = Context.get.ifconfig[:ip_saddr].to_s
+          address = Context.get.iface.ip.to_s
         end
 
         raise BetterCap::Error, "Invalid IPv4 address '#{address}' on line #{lineno + 1} of '#{filename}'." \

data/lib/bettercap/network/servers/httpd.rb

@@ -22,12 +22,16 @@ class HTTPD
   def initialize( port = 8081, path = './' )
     @port = port
     @path = path
-    @server = WEBrick::HTTPServer.new(
-      Port: @port,
-      DocumentRoot: @path,
-      Logger: WEBrick::Log.new("/dev/null"),
-      AccessLog: []
-    )
+    begin
+      @server = WEBrick::HTTPServer.new(
+        Port: @port,
+        DocumentRoot: @path,
+        Logger: WEBrick::Log.new("/dev/null"),
+        AccessLog: []
+      )
+    rescue Errno::EADDRINUSE
+      raise BetterCap::Error, "[HTTPD] It looks like there's another process listening on port #{@port}, please chose a different port."
+    end
   end
 
   # Start the server.

data/lib/bettercap/network/target.rb

@@ -20,10 +20,13 @@ class Target
   attr_accessor :ip
   # The MAC address of the device network interface.
   attr_accessor :mac
+  # Network object.
+  attr_accessor :network
   # Vendor of the device network interface if available.
   attr_accessor :vendor
-  # NetBIOS hostname of the device if available.
-  attr_accessor :hostname
+  # NetBIOS hostname of the device if available OR interface name in case of
+  # local address.
+  attr_accessor :name
   # True if the IP attribute of this target needs to be updated.
   attr_accessor :ip_refresh
 
@@ -43,7 +46,7 @@ class Target
   # The +ip+ argument could also be a MAC address itself, in this case the
   # ip address will be parsed from the computer ARP cache and updated
   # accordingly.
-  def initialize( ip, mac=nil )
+  def initialize( ip, mac=nil, network=nil, name=nil )
     if Network::Validator.is_ip?(ip)
       @ip         = ip
       @ip_refresh = false
@@ -57,8 +60,9 @@ class Target
 
     @mac      = Target.normalized_mac(mac) unless mac.nil?
     @vendor   = Target.lookup_vendor(@mac) unless mac.nil?
-    @hostname = nil
-    @resolver = Thread.new { resolve! } unless Context.get.options.core.no_target_nbns or @ip.nil?
+    @name     = name
+    @network  = network
+    @resolver = Thread.new { resolve! } unless Context.get.options.core.no_target_nbns or @ip.nil? or !@network.nil?
   end
 
   # Return the integer representation of the +ip+ attribute which can be
@@ -86,15 +90,15 @@ class Target
     vendor  = @vendor.nil?? " ( ??? )" : " ( #{@vendor} )"
 
     s = sprintf( fmt, address, @mac )
-    s += " / #{@hostname}" unless @hostname.nil?
+    s += " / #{@name}" unless @name.nil?
     s += vendor
     s
   end
 
   # Return a compact string representation of this object.
   def to_s_compact
-    if @hostname
-      "#{@hostname}/#{@ip}"
+    if @name
+      "#{@name}/#{@ip}"
     else
       @ip
     end
@@ -131,8 +135,8 @@ private
         sock.recvfrom(NBNS_BUFSIZE)
       end
       if resp
-        @hostname = parse_nbns_response resp
-        Logger.info "Found NetBIOS name '#{@hostname}' for address #{@ip}"
+        @name = parse_nbns_response resp
+        Logger.info "Found NetBIOS name '#{@name}' for address #{@ip}"
       end
     rescue Exception => e
       Logger.debug e

data/lib/bettercap/options/core_options.rb

@@ -22,9 +22,9 @@ class CoreOptions
   attr_accessor :targets
   # Comma separated list of ip addresses to ignore.
   attr_accessor :ignore
-  # If true will disable active network discovery, the program will just use
+  # If false will disable active network discovery, the program will just use
   # the current ARP cache.
-  attr_accessor :arpcache
+  attr_accessor :discovery
   # If true, targets NBNS hostname resolution won't be performed.
   attr_accessor :no_target_nbns
   # Log file name.
@@ -49,7 +49,7 @@ class CoreOptions
     @silent          = false
     @debug           = false
     @ignore          = nil
-    @arpcache        = false
+    @discovery       = true
     @no_target_nbns  = false
     @packet_throttle = 0.0
     @check_updates   = false
@@ -78,7 +78,7 @@ class CoreOptions
     end
 
     opts.on( '--no-discovery', "Do not actively search for hosts, just use the current ARP cache, default to #{'false'.yellow}." ) do
-      @arpcache = true
+      @discovery = false
     end
 
     opts.on( '--no-target-nbns', 'Disable target NBNS hostname resolution.' ) do
@@ -129,7 +129,7 @@ class CoreOptions
 
   # Return true if active host discovery is enabled, otherwise false.
   def discovery?
-    ( @targets.nil? and !@arpcache )
+    ( @discovery and @targets.nil? )
   end
 
   # Split specified targets and parse them ( either as IP or MAC ), will raise a

data/lib/bettercap/options/options.rb

@@ -93,28 +93,28 @@ class Options
 
   # Create a list of BetterCap::Firewalls::Redirection objects which are needed
   # given the specified command line arguments.
-  def get_redirections ifconfig
+  def get_redirections iface
     redirections = []
 
     if @servers.dnsd or @proxies.sslstrip?
-      redirections << redir( ifconfig[:ip_saddr], 53, @servers.dnsd_port )
-      redirections << redir( ifconfig[:ip_saddr], 53, @servers.dnsd_port, 'UDP' )
+      redirections << redir( iface.ip, 53, @servers.dnsd_port )
+      redirections << redir( iface.ip, 53, @servers.dnsd_port, 'UDP' )
     end
 
     if @proxies.proxy
       @proxies.http_ports.each do |port|
-        redirections << redir( ifconfig[:ip_saddr], port, @proxies.proxy_port )
+        redirections << redir( iface.ip, port, @proxies.proxy_port )
       end
     end
 
     if @proxies.proxy_https
       @proxies.https_ports.each do |port|
-        redirections << redir( ifconfig[:ip_saddr], port, @proxies.proxy_https_port )
+        redirections << redir( iface.ip, port, @proxies.proxy_https_port )
       end
     end
 
     if @proxies.tcp_proxy
-      redirections << redir_single( @proxies.tcp_proxy_upstream_address, ifconfig[:ip_saddr], @proxies.tcp_proxy_upstream_port, @proxies.tcp_proxy_port )
+      redirections << redir_single( @proxies.tcp_proxy_upstream_address, iface.ip, @proxies.tcp_proxy_upstream_port, @proxies.tcp_proxy_port )
     end
 
     if @proxies.custom_proxy
@@ -130,7 +130,7 @@ class Options
     end
 
     @proxies.custom_redirections.each do |r|
-      redirections << redir( ifconfig[:ip_saddr], r[:from], r[:to], r[:proto] )
+      redirections << redir( iface.ip, r[:from], r[:to], r[:proto] )
     end
 
     redirections

data/lib/bettercap/options/proxy_options.rb

@@ -145,15 +145,18 @@ class ProxyOptions
     end
 
     opts.on( '--no-sslstrip', 'Disable SSLStrip.' ) do
+      @proxy    = true
       @sslstrip = false
     end
 
     opts.on( '--proxy-module MODULE', "Ruby proxy module to load, either a custom file or one of the following: #{Proxy::HTTP::Module.available.map{|x| x.yellow}.join(', ')}." ) do |v|
       Proxy::HTTP::Module.load(ctx, opts, v)
+      @proxy = true
     end
 
     opts.on( '--http-ports PORT1,PORT2', "Comma separated list of HTTP ports to redirect to the proxy, default to #{@http_ports.map{|x| x.to_s.yellow }.join(', ')}." ) do |v|
-      @http_ports = self.parse_ports( v )
+      @http_ports = ProxyOptions.parse_ports( v )
+      @proxy      = true
     end
 
     opts.separator ""
@@ -176,7 +179,8 @@ class ProxyOptions
     end
 
     opts.on( '--https-ports PORT1,PORT2', "Comma separated list of HTTPS ports to redirect to the proxy, default to #{@https_ports.map{|x| x.to_s.yellow }.join(', ')}." ) do |v|
-      @https_ports = self.parse_ports( v )
+      @https_ports = ProxyOptions.parse_ports( v )
+      @proxy_https = true
     end
 
     opts.separator ""
@@ -213,7 +217,7 @@ class ProxyOptions
       raise BetterCap::Error, "No TCP proxy upstream server port specified ( --tcp-proxy-upstream-port PORT )." if @tcp_proxy_upstream_port.nil?
     end
 
-    if @sslstrip and ctx.options.servers.dnsd
+    if @proxy and @sslstrip and ctx.options.servers.dnsd
       raise BetterCap::Error, "SSL Stripping and builtin DNS server are mutually exclusive features, " \
                               "either use the --no-sslstrip option or remove the --dns option."
     end

data/lib/bettercap/pluggable.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+
+module BetterCap
+# Simple base class for modules and plugins of various types.
+class Pluggable
+  @@metadata = {
+    'Name'        => '',
+    'Version'     => '',
+    'Author'      => "Simone 'evilsocket' Margaritelli",
+    'License'     => 'GPL3',
+    'Description' => ''
+  }
+
+  # Define the metadata for this module.
+  def self.meta(meta = {})
+    meta.each do |key,value|
+      @@metadata[key] = value
+    end
+  end
+
+  # Get the metadata of this module.
+  def self.metadata
+    @@metadata
+  end
+end
+end

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

@@ -16,7 +16,7 @@ module Proxy
 module HTTP
 
 # Base class for transparent proxy modules.
-class Module
+class Module < BetterCap::Pluggable
   @@path    = File.dirname(__FILE__) + '/modules/'
   @@modules = []
 

data/lib/bettercap/proxy/http/modules/injectcss.rb

@@ -13,6 +13,14 @@ This project is released under the GPL 3 license.
 
 # This proxy module will take care of CSS code injection.
 class InjectCSS < BetterCap::Proxy::HTTP::Module
+  meta(
+    'Name'        => 'InjectCSS',
+    'Description' => 'This proxy module will take care of CSS code injection.',
+    'Version'     => '1.0.0',
+    'Author'      => "Simone 'evilsocket' Margaritelli",
+    'License'     => 'GPL3'
+  )
+
   # CSS data to be injected.
   @@cssdata = nil
   # CSS file URL to be injected.

data/lib/bettercap/proxy/http/modules/injecthtml.rb

@@ -13,6 +13,14 @@ This project is released under the GPL 3 license.
 
 # This proxy module will take care of HTML code injection.
 class InjectHTML < BetterCap::Proxy::HTTP::Module
+  meta(
+    'Name'        => 'InjectHTML',
+    'Description' => 'This proxy module will take care of HTML code injection.',
+    'Version'     => '1.0.0',
+    'Author'      => "Simone 'evilsocket' Margaritelli",
+    'License'     => 'GPL3'
+  )
+
   # URL of the iframe if --html-iframe-url was specified.
   @@iframe = nil
   # HTML data to be injected.

data/lib/bettercap/proxy/http/modules/injectjs.rb

@@ -13,6 +13,14 @@ This project is released under the GPL 3 license.
 
 # This proxy module will take care of Javascript code injection.
 class InjectJS < BetterCap::Proxy::HTTP::Module
+  meta(
+    'Name'        => 'InjectJS',
+    'Description' => 'This proxy module will take care of Javascript code injection.',
+    'Version'     => '1.0.0',
+    'Author'      => "Simone 'evilsocket' Margaritelli",
+    'License'     => 'GPL3'
+  )
+
   # JS data to be injected.
   @@jsdata = nil
   # JS file URL to be injected.

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

@@ -69,9 +69,10 @@ class Proxy
       end
 
       @main_thread = Thread.new &method(:server_thread)
+    rescue Errno::EADDRINUSE
+      raise BetterCap::Error, "[#{@type} PROXY] It looks like there's another process listening on #{@address}:#{@port}, please chose a different port."
     rescue Exception => e
       Logger.error "Error starting #{@type} proxy: #{e.inspect}"
-      @socket.close unless @socket.nil?
     end
   end
 

data/lib/bettercap/proxy/http/sslstrip/strip.rb

@@ -106,7 +106,7 @@ class Strip
     @stripped = []
     @cookies  = CookieMonitor.new
     @favicon  = Response.from_file( File.dirname(__FILE__) + '/lock.ico', 'image/x-icon' )
-    @resolver = BetterCap::Network::Servers::DNSD.new( nil, ctx.ifconfig[:ip_saddr], ctx.options.servers.dnsd_port )
+    @resolver = BetterCap::Network::Servers::DNSD.new( nil, ctx.iface.ip, ctx.options.servers.dnsd_port )
 
     @resolver.start
   end

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

@@ -203,6 +203,13 @@ class Streamer
     end
   end
 
+  # Handle a PUT request, +req+ is the request object and +res+ the response.
+  def do_PUT(req, res)
+    perform_proxy_request(req, res) do |http, path, header|
+      http.put(path, req.body || "", header)
+    end
+  end
+
 end
 end
 end

data/lib/bettercap/proxy/stream_logger.rb

@@ -31,7 +31,7 @@ class StreamLogger
   def self.addr2s( addr, alt = nil )
     ctx = Context.get
     # check for the local address
-    return 'local' if addr == ctx.ifconfig[:ip_saddr]
+    return 'local' if addr == ctx.iface.ip
     # is it a known target?
     target = ctx.find_target addr, nil
     return target.to_s_compact unless target.nil?

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

@@ -26,7 +26,7 @@ module TCP
 #      event.data = 'bbb'
 #    end
 #  end
-class Module
+class Module < BetterCap::Pluggable
   # This callback is called when the target is sending data to the upstream server.
   # +event+ is an instance of the BetterCap::Proxy::TCP::Event class.
   def on_data( event ); end

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

@@ -52,7 +52,7 @@ class Proxy
     # address is discovered and put in the ARP cache before we even start the proxy,
     # otherwise internal connections won't be spoofed and the proxy will be useless
     # until some random event will fill the ARP cache for the server.
-    if @ctx.ifconfig[:ip4_obj].include?( @upstream_address )
+    if @ctx.iface.network.include?( @upstream_address )
       Logger.debug "[#{'TCP PROXY'.green}] Sending probe to upstream server address ..."
       BetterCap::Network.get_hw_address( @ctx, @upstream_address )
       # wait for the system to acknowledge the ARP cache changes.

data/lib/bettercap/sniffer/sniffer.rb

@@ -88,7 +88,7 @@ class Sniffer
       return true unless pkt.is_ip?
       # skip if local packet and --local|-L was not specified.
       unless @@ctx.options.sniff.local
-        return ( pkt.ip_saddr == @@ctx.ifconfig[:ip_saddr] or pkt.ip_daddr == @@ctx.ifconfig[:ip_saddr] )
+        return ( pkt.ip_saddr == @@ctx.iface.ip or pkt.ip_daddr == @@ctx.iface.ip )
       end
     rescue; end
     false

data/lib/bettercap/spoofers/arp.rb

@@ -104,13 +104,13 @@ class Arp < Base
       end
     else
       # tell the target we're the gateway
-      send_spoofed_packet( @ctx.gateway.ip, @ctx.ifconfig[:eth_saddr], target.ip, target.mac )
+      send_spoofed_packet( @ctx.gateway.ip, @ctx.iface.mac, target.ip, target.mac )
       # tell the gateway we're the target
-      send_spoofed_packet( target.ip, @ctx.ifconfig[:eth_saddr], @ctx.gateway.ip, @ctx.gateway.mac ) unless @ctx.options.spoof.half_duplex
+      send_spoofed_packet( target.ip, @ctx.iface.mac, @ctx.gateway.ip, @ctx.gateway.mac ) unless @ctx.options.spoof.half_duplex
       # tell the target we're everybody else in the network :D
       @ctx.targets.each do |e|
         if e.spoofable? and e.ip != target.ip and e.ip != @ctx.gateway.ip
-          send_spoofed_packet( e.ip, @ctx.ifconfig[:eth_saddr], target.ip, target.mac )
+          send_spoofed_packet( e.ip, @ctx.iface.mac, target.ip, target.mac )
         end
       end
     end
@@ -131,7 +131,7 @@ class Arp < Base
     # we're only interested in 'who-has' packets
     pkt.arp_opcode == 1 and \
     pkt.arp_dst_mac.to_s == '00:00:00:00:00:00' and \
-    pkt.arp_src_ip.to_s != @ctx.ifconfig[:ip_saddr]
+    pkt.arp_src_ip.to_s != @ctx.iface.ip
   end
 
   # Will watch for incoming ARP requests and spoof the source address.
@@ -141,7 +141,7 @@ class Arp < Base
     sniff_packets('arp') { |pkt|
       if is_arp_query?(pkt)
         Logger.info "[#{'ARP'.green}] #{pkt.arp_src_ip.to_s} is asking who #{pkt.arp_dst_ip.to_s} is."
-        send_spoofed_packet pkt.arp_dst_ip.to_s, @ctx.ifconfig[:eth_saddr], pkt.arp_src_ip.to_s, pkt.arp_src_mac.to_s
+        send_spoofed_packet pkt.arp_dst_ip.to_s, @ctx.iface.mac, pkt.arp_src_ip.to_s, pkt.arp_src_mac.to_s
       end
     }
   end

data/lib/bettercap/spoofers/icmp.rb

@@ -79,7 +79,6 @@ class Icmp < Base
   def initialize
     @ctx          = Context.get
     @forwarding   = @ctx.firewall.forwarding_enabled?
-    @local        = @ctx.ifconfig[:ip_saddr]
     @spoof_thread = nil
     @watch_thread = nil
     @running      = false
@@ -97,7 +96,7 @@ class Icmp < Base
         Logger.debug "Sending ICMP Redirect to #{target.to_s_compact} redirecting #{address} to us ..."
 
         pkt = ICMPRedirectPacket.new
-        pkt.update!( @ctx.gateway, target, @local, address )
+        pkt.update!( @ctx.gateway, target, @ctx.iface.ip, address )
         @ctx.packets.push(pkt)
       rescue Exception => e
         Logger.debug "#{self.class.name} : #{e.message}"
@@ -147,7 +146,7 @@ class Icmp < Base
 
   # Return true if the +pkt+ packet comes from one of our targets.
   def is_interesting_packet?(pkt)
-    return false if pkt.ip_saddr == @local
+    return false if pkt.ip_saddr == @ctx.iface.ip
     @ctx.targets.each do |target|
       if target.ip and ( target.ip == pkt.ip_saddr or target.ip == pkt.ip_daddr )
         return true

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.1'
+  VERSION = '1.5.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.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -178,6 +178,7 @@ files:
 - lib/bettercap/loader.rb
 - lib/bettercap/logger.rb
 - lib/bettercap/memory.rb
+- lib/bettercap/monkey/celluloid/actor.rb
 - lib/bettercap/monkey/celluloid/io/udp_socket.rb
 - lib/bettercap/monkey/em-proxy/proxy.rb
 - lib/bettercap/monkey/openssl/server.rb
@@ -204,6 +205,7 @@ files:
 - lib/bettercap/options/server_options.rb
 - lib/bettercap/options/sniff_options.rb
 - lib/bettercap/options/spoof_options.rb
+- lib/bettercap/pluggable.rb
 - lib/bettercap/proxy/http/module.rb
 - lib/bettercap/proxy/http/modules/injectcss.rb
 - lib/bettercap/proxy/http/modules/injecthtml.rb