bettercap 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a830b906b0c9ea8c95b66699910e60e79c1eb728
-  data.tar.gz: 607fb72b1fd6dc77b4481ff2c3d8cb2dddefc8d3
+  metadata.gz: 14c3df538db89404723e56bde2c2a8a92446d8f9
+  data.tar.gz: 7b48c98712b2c2b879f6e7bfc67529627ba1668d
 SHA512:
-  metadata.gz: 37ffe1a82e6da08ea9e1136892a9ec1b720b8fd5841eb74370e6e462151aa004e8ad0a3391d0db449dae5b5b86f2c5f7fe7d752c42566500039b1b7f478e677d
-  data.tar.gz: 1a2c0b6e2035a144bf677adaefba785abf614b375d9bb9d0d5284232ec1bac9cff467272eca2c3fa01e8acdbaf0c66ec726f47f6ba60e380bce61be615d2779e
+  metadata.gz: c35e2b12effaa67a2236427922d0f7af6d200f177304e3d2f09adb3b38db1b7c7cc6b0c7f9f6ee7f70a3d8155a99f8dedcc0351f099871819357277338e54148
+  data.tar.gz: 1477fda71236367e364c3e392f2b44b1edbef1d19f3a792231d0a32bc613500a9b6dea86881d699a92b1afcfe5a58a61c604963df3ad16eecc99abb2a60d3d09

data/README.md

@@ -2,7 +2,7 @@
 
 http://www.bettercap.org/
 
-[![Gem Version](https://badge.fury.io/rb/bettercap.svg)](http://badge.fury.io/rb/bettercap) [![Code Climate](https://codeclimate.com/github/evilsocket/bettercap/badges/gpa.svg)](https://codeclimate.com/github/evilsocket/bettercap)
+[![Gem Version](https://badge.fury.io/rb/bettercap.svg)](http://badge.fury.io/rb/bettercap) [![Code Climate](https://codeclimate.com/github/evilsocket/bettercap/badges/gpa.svg)](https://codeclimate.com/github/evilsocket/bettercap) [![Join the chat at https://gitter.im/evilsocket/bettercap-proxy-modules](https://badges.gitter.im/evilsocket/bettercap-proxy-modules.svg)](https://gitter.im/evilsocket/bettercap-proxy-modules?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 ---
 
 **bettercap** is a complete, modular, portable and easily extensible **MITM** tool and framework with every kind of diagnostic

data/bin/bettercap

@@ -18,6 +18,9 @@ begin
   puts BetterCap::BANNER.green.bold
   puts "\n\n\n"
 
+  # We need this in order to report unhandled exceptions.
+  original_argv = ARGV.clone
+
   # Create global context, parse command line arguments and perform basic
   # error checking.
   ctx = BetterCap::Options.parse!
@@ -78,9 +81,17 @@ rescue BetterCap::Error => e
   BetterCap::Logger.error e.message
 
 rescue Exception => e
-  BetterCap::Logger.error "EXCEPTION '#{e.class}' :"
-  BetterCap::Logger.error e.message
-  BetterCap::Logger.error e.backtrace.join("\n")
+  puts "\n\n"
+  BetterCap::Logger.error "Oooops, seems like something weird occurred, please copy paste the following output " \
+                          "and open a new issue on https://github.com/evilsocket/bettercap/issues :\n"
+
+  BetterCap::Logger.error "Platform          : #{RUBY_PLATFORM}"
+  BetterCap::Logger.error "Ruby Version      : #{RUBY_VERSION}"
+  BetterCap::Logger.error "BetterCap Version : #{BetterCap::VERSION}"
+  BetterCap::Logger.error "Command Line      : #{original_argv.join(" ")}"
+  BetterCap::Logger.error "Exception         : #{e.class}"
+  BetterCap::Logger.error "Message           : #{e.message}"
+  BetterCap::Logger.error "Backtrace         :\n\n    #{e.backtrace.join("\n    ")}\n"
 
 ensure
   # Make sure all the messages on the logger queue are printed.

data/lib/bettercap.rb

@@ -26,7 +26,9 @@ Config = RbConfig
 
 require 'bettercap/update_checker'
 require 'bettercap/error'
+require 'bettercap/loader'
 require 'bettercap/options'
+require 'bettercap/arp_reader'
 require 'bettercap/packet_queue'
 require 'bettercap/discovery/thread'
 require 'bettercap/discovery/agents/base'

data/lib/bettercap/arp_reader.rb

@@ -0,0 +1,78 @@
+=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
+require 'bettercap/error'
+
+module BetterCap
+# This class is responsible for reading the computer ARP table.
+class ArpReader
+  # Parse the current ARP cache and return a list of BetterCap::Target
+  # objects which are found inside it, using the +ctx+ BetterCap::Context
+  # instance.
+  def self.parse( ctx )
+    targets = []
+    self.parse_cache do |ip,mac|
+      if ip != ctx.gateway and ip != ctx.ifconfig[:ip_saddr]
+        if ctx.options.ignore_ip?(ip)
+          Logger.debug "Ignoring #{ip} ..."
+        else
+          # reuse Target object if it's already a known address
+          known = ctx.find_target ip, mac
+          if known.nil?
+            targets << Target.new( ip, mac )
+          else
+            targets << known
+          end
+        end
+      end
+    end
+    targets
+  end
+
+  # Parse the ARP cache searching for the given IP +address+ and return its
+  # MAC if found, otherwise nil.
+  def self.find_address( address )
+    self.parse_cache do |ip,mac|
+      if ip == address
+        return mac
+      end
+    end
+    nil
+  end
+
+  # Parse the ARP cache searching for the given MAC +address+ and return its
+  # IP if found, otherwise nil.
+  def self.find_mac( address )
+    self.parse_cache do |ip,mac|
+      if mac == address
+        return ip
+      end
+    end
+    nil
+  end
+
+  private
+
+  def self.parse_cache
+    iface = Context.get.ifconfig[:iface]
+    Shell.arp.split("\n").each do |line|
+      m = self.parse_cache_line(iface,line)
+      unless m.nil?
+        ip = m[1]
+        hw = Target.normalized_mac( m[2] )
+        if hw != 'FF:FF:FF:FF:FF:FF'
+          yield( ip, hw )
+        end
+      end
+    end
+  end
+
+  def self.parse_cache_line( iface, line )
+    /[^\s]+\s+\(([0-9\.]+)\)\s+at\s+([a-f0-9:]+).+#{iface}.*/i.match(line)
+  end
+end
+end

data/lib/bettercap/context.rb

@@ -127,10 +127,8 @@ class Context
   # is needed in order to run proxy modules.
   def create_proxies
     if @options.has_proxy_module?
-      require @options.proxy_module
-
       Proxy::Module.register_modules
-
+      
       raise BetterCap::Error, "#{@options.proxy_module} is not a valid bettercap proxy module." if Proxy::Module.modules.empty?
     end
 

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

@@ -14,73 +14,10 @@ This project is released under the GPL 3 license.
 module BetterCap
 module Discovery
 module Agents
-# Class responsible to parse ARP cache and send ARP probes to each
-# possible IP on the network.
+# Class responsible of sending ARP probes to each possible IP on the network.
 class Arp < Discovery::Agents::Base
-  # Parse the current ARP cache and return a list of BetterCap::Target
-  # objects which are found inside it, using the +ctx+ BetterCap::Context
-  # instance.
-  def self.parse( ctx )
-    targets = []
-    self.parse_cache do |ip,mac|
-      if ip != ctx.gateway and ip != ctx.ifconfig[:ip_saddr]
-        if ctx.options.ignore_ip?(ip)
-          Logger.debug "Ignoring #{ip} ..."
-        else
-          # reuse Target object if it's already a known address
-          known = ctx.find_target ip, mac
-          if known.nil?
-            targets << Target.new( ip, mac )
-          else
-            targets << known
-          end
-        end
-      end
-    end
-    targets
-  end
-
-  # Parse the ARP cache searching for the given IP +address+ and return its
-  # MAC if found, otherwise nil.
-  def self.find_address( address )
-    self.parse_cache do |ip,mac|
-      if ip == address
-        return mac
-      end
-    end
-    nil
-  end
-
-  # Parse the ARP cache searching for the given MAC +address+ and return its
-  # IP if found, otherwise nil.
-  def self.find_mac( address )
-    self.parse_cache do |ip,mac|
-      if mac == address
-        return ip
-      end
-    end
-    nil
-  end
-
   private
 
-  def self.parse_cache
-    Shell.arp.split("\n").each do |line|
-      m = self.parse_cache_line(line)
-      unless m.nil?
-        ip = m[1]
-        hw = Target.normalized_mac( m[2] )
-        if hw != 'FF:FF:FF:FF:FF:FF'
-          yield( ip, hw )
-        end
-      end
-    end
-  end
-
-  def self.parse_cache_line( line )
-    /[^\s]+\s+\(([0-9\.]+)\)\s+at\s+([a-f0-9:]+).+#{Context.get.ifconfig[:iface]}.*/i.match(line)
-  end
-
   def get_probe( ip )
     pkt = PacketFu::ARPPacket.new
 

data/lib/bettercap/factories/parser.rb

@@ -55,7 +55,7 @@ class Parser
 
           require_relative "#{@@path}#{file}"
 
-          loaded << Kernel.const_get("BetterCap::Parsers::#{cname.capitalize}").new
+          loaded << BetterCap::Loader.load("BetterCap::Parsers::#{cname.capitalize}").new
         end
       end
       loaded

data/lib/bettercap/factories/spoofer.rb

@@ -37,7 +37,7 @@ class Spoofer
 
       require_relative "../spoofers/#{name}"
 
-      Kernel.const_get("BetterCap::Spoofers::#{name.capitalize}").new
+      BetterCap::Loader.load("BetterCap::Spoofers::#{name.capitalize}").new
     end
 
     private

data/lib/bettercap/loader.rb

@@ -0,0 +1,23 @@
+=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
+require 'bettercap/error'
+
+module BetterCap
+# This class is responsible for dynamically loading modules.
+class Loader
+  # Dynamically load a class given its +name+.
+  # @see https://github.com/evilsocket/bettercap/issues/88
+  def self.load(name)
+    root = Kernel
+    name.split('::').each do |part|
+      root = root.const_get(part)
+    end
+    root
+  end
+end
+end

data/lib/bettercap/network.rb

@@ -70,16 +70,16 @@ class << self
       Logger.debug 'Using current ARP cache.'
     end
 
-    Discovery::Agents::Arp.parse ctx
+    ArpReader.parse ctx
   end
 
   # Return the IP address associated with the +mac+ hardware address using the
   # given BetterCap::Context ( +ctx+ ).
   def get_ip_address( ctx, mac )
-    ip = Discovery::Agents::Arp.find_mac( mac )
+    ip = ArpReader.find_mac( mac )
     if ip.nil?
       start_agents( ctx )
-      ip = Discovery::Agents::Arp.find_mac( mac )
+      ip = ArpReader.find_mac( mac )
     end
     ip
   end
@@ -88,7 +88,7 @@ class << self
   # the +iface+ network interface.
   # The resolution will be performed for the specified number of +attempts+.
   def get_hw_address( iface, ip_address, attempts = 2 )
-    hw_address = Discovery::Agents::Arp.find_address( ip_address )
+    hw_address = ArpReader.find_address( ip_address )
 
     if hw_address.nil?
       attempts.times do
@@ -135,7 +135,7 @@ class << self
 
   def start_agents( ctx )
     [ 'Icmp', 'Udp', 'Arp' ].each do |name|
-      Kernel.const_get("BetterCap::Discovery::Agents::#{name}").new( ctx )
+      BetterCap::Loader.load("BetterCap::Discovery::Agents::#{name}").new(ctx)
     end
     ctx.packets.wait_empty( ctx.timeout )
   end

data/lib/bettercap/options.rb

@@ -80,6 +80,9 @@ class Options
   attr_accessor :check_updates
   # If true, targets NBNS hostname resolution won't be performed.
   attr_accessor :no_target_nbns
+  # If true, bettercap won't forward packets for any target, causing
+  # connections to be killed.
+  attr_accessor :kill
 
   # Create a BetterCap::Options class instance using the specified network interface.
   def initialize( iface )
@@ -93,6 +96,7 @@ class Options
     @debug = false
     @arpcache = false
     @no_target_nbns = false
+    @kill = false
 
     @ignore = nil
 
@@ -131,8 +135,11 @@ class Options
     ctx = Context.get
 
     OptionParser.new do |opts|
-      opts.banner = "Usage: #{$0} [options]"
       opts.version = BetterCap::VERSION
+      opts.banner = "Usage: bettercap [options]"
+      opts.separator ""
+      opts.separator "Specific options:"
+      opts.separator ""
 
       opts.on( '-G', '--gateway ADDRESS', 'Manually specify the gateway address, if not specified the current gateway will be retrieved and used. ' ) do |v|
         ctx.options.gateway = v
@@ -246,6 +253,10 @@ class Options
       opts.on( '--proxy-module MODULE', 'Ruby proxy module to load.' ) do |v|
         ctx.options.proxy = true
         ctx.options.proxy_module = File.expand_path v
+
+        require ctx.options.proxy_module
+
+        Proxy::Module.register_options(opts)
       end
 
       opts.on( '--custom-proxy ADDRESS', 'Use a custom HTTP upstream proxy instead of the builtin one.' ) do |v|
@@ -278,6 +289,10 @@ class Options
         ctx.options.httpd_path = v
       end
 
+      opts.on( '--kill', 'Instead of forwarding packets, this switch will make targets connections to be killed.' ) do
+        ctx.options.kill = true
+      end
+
       opts.on( '--check-updates', 'Will check if any update is available and then exit.' ) do
         ctx.options.check_updates = true
       end

data/lib/bettercap/packet_queue.rb

@@ -17,53 +17,9 @@ class PacketQueue
     @nworkers = nworkers
     @running  = true
     @injector = PacketFu::Inject.new(:iface => iface)
+    @udp      = UDPSocket.new
     @queue    = Queue.new
-    @workers  = (0...nworkers).map {
-      ::Thread.new {
-        Logger.debug "PacketQueue worker started."
-
-        while @running
-          begin
-            packet = @queue.pop
-            # nil packet pushed to signal stopping
-            if packet.nil?
-              Logger.debug "Got nil packet, PacketQueue stopping ..."
-              break
-
-            # [ ip, port, data ] pushed by Discovery::Agents::Udp
-            elsif packet.is_a?(Array)
-              ip, port, data = packet
-              Logger.debug "Sending UDP data packet to #{ip}:#{port} ..."
-
-              # TODO: Maybe just create one globally?
-              sd = UDPSocket.new
-              sd.send( data, 0, ip, port )
-              sd = nil
-
-            # PacketFu packet
-            else
-              Logger.debug "Sending #{packet.class.name} packet ..."
-
-              # Use a global PacketFu::Inject object.
-              @injector.array = [packet.headers[0].to_s]
-              @injector.inject
-            end
-          rescue Exception => e
-            Logger.debug "#{self.class.name} ( #{packet.class.name} ) : #{e.message}"
-
-            # If we've got an error message such as:
-            #   (cannot open BPF device) /dev/bpf0: Too many open files
-            # We want to retry to probe this ip in a while.
-            if e.message.include? 'Too many open files'
-              Logger.debug "Repushing #{self.class.name} to the packet queue ..."
-              push(packet)
-            end
-          end
-        end
-
-        Logger.debug "PacketQueue worker stopped."
-      }
-    }
+    @workers  = (0...nworkers).map { ::Thread.new { worker } }
   end
 
   # Push a packet to the queue.
@@ -88,5 +44,53 @@ class PacketQueue
     @nworkers.times { push(nil) }
     @workers.map(&:join)
   end
+
+  private
+
+  def dispatch_udp_packet(packet)
+    ip, port, data = packet
+    Logger.debug "Sending UDP data packet to #{ip}:#{port} ..."
+    @udp.send( data, 0, ip, port )
+  end
+
+  def dispatch_raw_packet(packet)
+    Logger.debug "Sending #{packet.class.name} packet ..."
+    @injector.array = [packet.headers[0].to_s]
+    @injector.inject
+  end
+
+  def worker
+    Logger.debug "PacketQueue worker started."
+
+    while @running
+      begin
+        packet = @queue.pop
+        case packet
+        # nil packet pushed to signal stopping
+        when nil
+          Logger.debug "Got nil packet, PacketQueue stopping ..."
+          break
+        # [ ip, port, data ] pushed by Discovery::Agents::Udp
+        when Array
+          dispatch_udp_packet(packet)
+        # PacketFu raw packet
+        when Object
+          dispatch_raw_packet(packet)
+        end
+      rescue Exception => e
+        Logger.debug "#{self.class.name} ( #{packet.class.name} ) : #{e.message}"
+
+        # If we've got an error message such as:
+        #   (cannot open BPF device) /dev/bpf0: Too many open files
+        # We want to retry to probe this ip in a while.
+        if e.message.include? 'Too many open files'
+          Logger.debug "Repushing #{self.class.name} to the packet queue ..."
+          push(packet)
+        end
+      end
+    end
+
+    Logger.debug "PacketQueue worker stopped."
+  end
 end
 end

data/lib/bettercap/proxy/module.rb

@@ -26,13 +26,30 @@ class Module
     true
   end
 
+  # Register custom options for each available module.
+  def self.register_options(opts)
+    self.each_module do |const|
+      if const.respond_to?(:on_options)
+        const.on_options(opts)
+      end
+    end
+  end
+
   # Register available proxy modules into the system.
   def self.register_modules
+    self.each_module do |const|
+      Logger.debug "Registering module #{const}"
+      @@modules << const.new
+    end
+  end
+
+  private
+
+  def self.each_module
     Object.constants.each do |klass|
       const = Kernel.const_get(klass)
       if const.respond_to?(:superclass) and const.superclass == self
-        Logger.debug "Registering module #{const}"
-        @@modules << const.new
+        yield const
       end
     end
   end

data/lib/bettercap/sniffer/sniffer.rb

@@ -29,7 +29,7 @@ class Sniffer
   # +ctx+ BetterCap::Context instance.
   def self.start( ctx )
     Thread.new do
-      Logger.info 'Starting sniffer ...'
+      Logger.debug 'Starting sniffer ...'
 
       setup( ctx )
 

data/lib/bettercap/spoofers/arp.rb

@@ -51,12 +51,17 @@ class Arp < Base
 
   # Start the ARP spoofing.
   def start
-    Logger.info "Starting ARP spoofer ( #{@ctx.options.half_duplex ? 'Half' : 'Full'} Duplex ) ..."
+    Logger.debug "Starting ARP spoofer ( #{@ctx.options.half_duplex ? 'Half' : 'Full'} Duplex ) ..."
 
     stop() if @running
     @running = true
 
-    @ctx.firewall.enable_forwarding(true) unless @forwarding
+    if @ctx.options.kill
+      Logger.warn "Disabling packet forwarding."
+      @ctx.firewall.enable_forwarding(false) if @forwarding
+    else
+      @ctx.firewall.enable_forwarding(true) unless @forwarding
+    end
 
     @sniff_thread = Thread.new { arp_watcher }
     @spoof_thread = Thread.new { arp_spoofer }
@@ -66,8 +71,7 @@ class Arp < Base
   def stop
     raise 'ARP spoofer is not running' unless @running
 
-    Logger.info 'Stopping ARP spoofer ...'
-
+    Logger.debug 'Stopping ARP spoofer ...'
     Logger.debug "Resetting packet forwarding to #{@forwarding} ..."
     @ctx.firewall.enable_forwarding( @forwarding )
 
@@ -77,7 +81,7 @@ class Arp < Base
     rescue
     end
 
-    Logger.info "Restoring ARP table of #{@ctx.targets.size} targets ..."
+    Logger.debug "Restoring ARP table of #{@ctx.targets.size} targets ..."
 
     @ctx.targets.each do |target|
       unless target.ip.nil? or target.mac.nil?
@@ -91,32 +95,6 @@ class Arp < Base
 
   private
 
-  def update_targets!
-    @ctx.targets.each do |target|
-      # targets could change, update mac addresses if needed
-      if target.mac.nil?
-        hw = Network.get_hw_address( @ctx.ifconfig, target.ip )
-        if hw.nil?
-          Logger.warn "Couldn't determine target #{ip} MAC!"
-          next
-        else
-          Logger.info "  Target MAC    : #{hw}"
-          target.mac = hw
-        end
-      # target was specified by MAC address
-      elsif target.ip_refresh
-        ip = Network.get_ip_address( @ctx, target.mac )
-        if ip.nil?
-          Logger.warn "Couldn't determine target #{target.mac} IP!"
-          next
-        else
-          Logger.info "Target #{target.mac} IP : #{ip}" if target.ip.nil? or target.ip != ip
-          target.ip = ip
-        end
-      end
-    end
-  end
-
   def arp_spoofer
     spoof_loop(1) { |target|
       unless target.ip.nil? or target.mac.nil?
@@ -127,7 +105,7 @@ class Arp < Base
   end
 
   def arp_watcher
-    Logger.info 'ARP watcher started ...'
+    Logger.debug 'ARP watcher started ...'
 
     sniff_packets('arp') { |pkt|
       # we're only interested in 'who-has' packets

data/lib/bettercap/spoofers/base.rb

@@ -88,14 +88,11 @@ private
   end
 
   def update_gateway!
-    Logger.info "Getting gateway #{@ctx.gateway} MAC address ..."
-
     hw = Network.get_hw_address( @ctx.ifconfig, @ctx.gateway )
     raise BetterCap::Error, "Couldn't determine router MAC" if hw.nil?
-
     @gateway = Target.new( @ctx.gateway, hw )
 
-    Logger.info "  #{@gateway}"
+    Logger.info "[#{'GATEWAY'.green}] #{@gateway.to_s(false)}"
   end
 
   def update_targets!
@@ -104,21 +101,22 @@ private
       if target.mac.nil?
         hw = Network.get_hw_address( @ctx.ifconfig, target.ip )
         if hw.nil?
-          Logger.warn "Couldn't determine target #{ip} MAC!"
+          Logger.warn "Couldn't determine target #{ip} MAC address!"
           next
         else
-          Logger.info "  Target MAC    : #{hw}"
           target.mac = hw
+          Logger.info "[#{'TARGET'.green}] #{target.to_s(false)}"
         end
       # target was specified by MAC address
       elsif target.ip_refresh
         ip = Network.get_ip_address( @ctx, target.mac )
         if ip.nil?
-          Logger.warn "Couldn't determine target #{target.mac} IP!"
+          Logger.warn "Couldn't determine target #{target.mac} IP address!"
           next
         else
-          Logger.info "Target #{target.mac} IP : #{ip}" if target.ip.nil? or target.ip != ip
+          doprint = ( target.ip.nil? or target.ip != ip )
           target.ip = ip
+          Logger.info("[#{'TARGET'.green}] #{target.to_s(false)}") if doprint
         end
       end
     end

data/lib/bettercap/spoofers/icmp.rb

@@ -112,12 +112,18 @@ class Icmp < Base
 
   # Start the ICMP redirect spoofing.
   def start
-    Logger.info "Starting ICMP redirect spoofer ..."
+    Logger.debug "Starting ICMP redirect spoofer ..."
 
     stop() if @running
     @running = true
 
-    @ctx.firewall.enable_forwarding(true) unless @forwarding
+    if @ctx.options.kill
+      Logger.warn "Disabling packet forwarding."
+      @ctx.firewall.enable_forwarding(false) if @forwarding
+    else
+      @ctx.firewall.enable_forwarding(true) unless @forwarding
+    end
+    
     @ctx.firewall.enable_send_redirects(false)
 
     @spoof_thread = Thread.new { icmp_spoofer }
@@ -128,8 +134,7 @@ class Icmp < Base
   def stop
     raise 'ICMP redirect spoofer is not running' unless @running
 
-    Logger.info 'Stopping ICMP redirect spoofer ...'
-
+    Logger.debug 'Stopping ICMP redirect spoofer ...'
     Logger.debug "Resetting packet forwarding to #{@forwarding} ..."
     @ctx.firewall.enable_forwarding( @forwarding )
 
@@ -156,7 +161,7 @@ class Icmp < Base
   end
 
   def dns_watcher
-    Logger.info 'DNS watcher started ...'
+    Logger.debug 'DNS watcher started ...'
 
     sniff_packets('udp and port 53') { |pkt|
       next unless is_interesting_packet?(pkt)

data/lib/bettercap/target.rb

@@ -72,8 +72,12 @@ class Target
   end
 
   # Return a verbose string representation of this object.
-  def to_s
-    s = sprintf( '%-15s : %-17s', if @ip.nil? then '???' else @ip end, @mac )
+  def to_s(padding=true)
+    if padding
+      s = sprintf( '%-15s : %-17s', if @ip.nil? then '???' else @ip end, @mac )
+    else
+      s = sprintf( '%s : %s', if @ip.nil? then '???' else @ip end, @mac )
+    end
     s += " / #{@hostname}" unless @hostname.nil?
     s += if @vendor.nil? then " ( ??? )" else " ( #{@vendor} )" end
     s

data/lib/bettercap/version.rb

@@ -11,7 +11,7 @@ This project is released under the GPL 3 license.
 =end
 module BetterCap
   # Current version of bettercap.
-  VERSION = '1.2.0'
+  VERSION = '1.2.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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -91,6 +91,7 @@ files:
 - LICENSE.md
 - README.md
 - TODO.md
+- lib/bettercap/arp_reader.rb
 - lib/bettercap/banner
 - lib/bettercap/context.rb
 - lib/bettercap/discovery/agents/arp.rb
@@ -108,6 +109,7 @@ files:
 - lib/bettercap/firewalls/redirection.rb
 - lib/bettercap/httpd/server.rb
 - lib/bettercap/hw-prefixes
+- lib/bettercap/loader.rb
 - lib/bettercap/logger.rb
 - lib/bettercap/monkey/packetfu/utils.rb
 - lib/bettercap/network.rb