bettercap 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e3ec675b769d7ac29357593472c14af387f440
-  data.tar.gz: a0a7fdf3060cf8179dd1bb9baa59d2e54658bf88
+  metadata.gz: ebf307012a9f7a95c84810c21db31d0ca657575f
+  data.tar.gz: 7aa29333600b9ad15821f2f4ad760dbee5dfcd76
 SHA512:
-  metadata.gz: afb795ebe9f9ece60e02235d60519814f49483078cf9898b6755ee8e2d68409d3f420905bca98325749f329624665777b06e6183758fbff200cc9de963701fee
-  data.tar.gz: 389117b84b7c6c2bc3b63a9479ed9a5c3a375c7eac5c2afbf53a9394f3a2b898e4f5879ff07c146e2c372686c6ebb1b32a8da5d030a401664d88d2fe6bc3fa4f
+  metadata.gz: 65328453bb055e8ddcea4073eac6b0c5c51b3d1a26c8fcab29f5d0a6be517516af1f5d9f7b21aad2877051dd37d3556e8bb457c781c82ab84e34060508995238
+  data.tar.gz: cff87a74985588e872ac886f5bf9e042bf507cbe911208f56f096eb786cf4783c673d352b8d8d9ddbe3777194dbefe263615171de86c9ab55cba0c8be844bdf5

data/lib/bettercap/context.rb

@@ -67,6 +67,7 @@ class Context
     @firewall     = Firewalls::Base.get
     @memory       = Memory.new
     @iface        = nil
+    @original_mac = nil
     @gateway      = nil
     @targets      = []
     @spoofer      = nil
@@ -85,6 +86,17 @@ class Context
                             'correct network configuration, this could also happen if bettercap '\
                             'is launched from a virtual environment.' unless Network::Validator.is_ip?(gw)
 
+    unless @options.core.use_mac.nil?
+      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 cfg[:ip4_obj].nil?
+
+      @original_mac = Network::Target.normalized_mac(cfg[:eth_saddr])
+
+      Logger.info "Changing interface MAC address to #{@options.core.use_mac}"
+
+      Shell.ifconfig( "#{@options.core.iface} ether #{@options.core.use_mac}")
+    end
 
     cfg = PacketFu::Utils.ifconfig @options.core.iface
     raise BetterCap::Error, "Could not determine IPv4 address of '#{@options.core.iface}', make sure this interface "\
@@ -183,6 +195,8 @@ class Context
 
     @dnsd.stop unless @dnsd.nil?
     @httpd.stop unless @httpd.nil?
+
+    Shell.ifconfig( "#{@options.core.iface} ether #{@original_mac}") unless @original_mac.nil?
   end
 
   private

data/lib/bettercap/firewalls/base.rb

@@ -22,7 +22,7 @@ class Base
     def get
       return @@instance unless @@instance.nil?
 
-      if RUBY_PLATFORM =~ /openbsd/ or RUBY_PLATFORM =~ /darwin/
+      if RUBY_PLATFORM =~ /.+bsd/ or RUBY_PLATFORM =~ /darwin/
         @@instance = Firewalls::BSD.new
       elsif RUBY_PLATFORM =~ /linux/
         @@instance = Firewalls::Linux.new

data/lib/bettercap/monkey/packetfu/utils.rb

@@ -49,7 +49,7 @@ module PacketFu
           ret = linux_ifconfig iface, data
         when /darwin/i
           ret = darwin_ifconfig iface, data
-	      when /openbsd/i
+	      when /.+bsd/i
 	        ret = openbsd_ifconfig iface, data
         end
       elsif BetterCap::Shell.available?('ip')

data/lib/bettercap/network/network.rb

@@ -56,6 +56,8 @@ class << self
   def get_alive_targets( ctx )
     if ctx.options.core.discovery?
       start_agents( ctx )
+    else
+      sleep(0.3)
     end
 
     ArpReader.parse ctx

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

@@ -62,7 +62,12 @@ class DNSD
 
     block = Proc.new do |transaction|
       Logger.info "[#{transaction.options[:peer]} > #{'DNS'.green}] Received request for '#{transaction.question.to_s.yellow}', sending spoofed reply #{addr.yellow} ..."
-      transaction.respond!(addr)
+      begin
+        transaction.respond!(addr)
+      rescue Exception => e
+        Logger.warn "[#{'DNS'.green}] #{e.message}"
+        Logger.exception e
+      end
     end
 
     DnsWrapper.get.rules << RubyDNS::RuleBasedServer::Rule.new( [ Regexp.new(exp), Resolv::DNS::Resource::IN::A ], block )

data/lib/bettercap/options/core_options.rb

@@ -39,6 +39,8 @@ class CoreOptions
   attr_accessor :packet_throttle
   # If true, bettercap will check for updates then exit.
   attr_accessor :check_updates
+  # If not nil, the interface MAC address will be changed to this value.
+  attr_accessor :use_mac
 
   def initialize( iface )
     @iface           = iface
@@ -53,6 +55,7 @@ class CoreOptions
     @no_target_nbns  = false
     @packet_throttle = 0.0
     @check_updates   = false
+    @use_mac         = nil
   end
 
   def parse!( ctx, opts )
@@ -64,6 +67,15 @@ class CoreOptions
       @iface = v
     end
 
+    opts.on( '--use-mac ADDRESS', 'Change the interface MAC address to this value before performing the attack.' ) do |v|
+      @use_mac = v
+      raise BetterCap::Error, "Invalid MAC address specified." unless Network::Validator.is_mac?(@use_mac)
+    end
+
+    opts.on( '--random-mac', 'Change the interface MAC address to a random one before performing the attack.' ) do |v|
+      @use_mac = [format('%0.2x', rand(256) & ~1), (1..5).map { format('%0.2x', rand(256)) }].join(':')
+    end
+
     opts.on( '-G', '--gateway ADDRESS', 'Manually specify the gateway address, if not specified the current gateway will be retrieved and used. ' ) do |v|
       @gateway = v
       raise BetterCap::Error, "The specified gateway '#{v}' is not a valid IPv4 address." unless Network::Validator.is_ip?(v)

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

@@ -56,9 +56,13 @@ class Streamer
 
       if r.nil?
         # call modules on_pre_request
-        process( request )
-
-        self.send( "do_#{request.method}", request, response )
+        r = process( request )
+        if r.nil?
+          self.send( "do_#{request.method}", request, response )
+        else
+          Logger.info "[#{'PROXY'.green}] Module returned crafted response."
+          response = r
+        end
       else
         response = r
       end
@@ -107,7 +111,10 @@ class Streamer
 
         begin
           if response.nil?
-            mod.on_pre_request request
+            r = mod.on_pre_request request
+            # the handler returned a response, do not execute
+            # the request
+            response = r unless r.nil?
           else
             mod.on_request request, response
           end
@@ -119,6 +126,7 @@ class Streamer
         end
       end
     end
+    return response
   end
 
   # List of security headers to remove/patch from any response.

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.4'
+  VERSION = '1.5.5'
   # 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.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize