bettercap 1.1.1 → 1.1.2

data/lib/bettercap/httpd/server.rb

@@ -20,10 +20,10 @@ class Server
     @port = port
     @path = path
     @server = WEBrick::HTTPServer.new(
-        :Port => @port,
-        :DocumentRoot => @path,
-        :Logger => WEBrick::Log.new("/dev/null"),
-        :AccessLog => []
+      :Port => @port,
+      :DocumentRoot => @path,
+      :Logger => WEBrick::Log.new("/dev/null"),
+      :AccessLog => []
     )
   end
 

data/lib/bettercap/network.rb

@@ -22,53 +22,60 @@ require 'bettercap/discovery/syn'
 require 'bettercap/discovery/arp'
 
 class Network
-
-  def Network.is_ip?(ip)
-    if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ ip
-      return $~.captures.all? {|i| i.to_i < 256}
+    class << self
+    def is_ip?(ip)
+      if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ ip
+        return $~.captures.all? {|i| i.to_i < 256}
+      end
+      false
     end
-    false
-  end
 
-  def Network.get_gateway
-    nstat = Shell.execute('netstat -nr')
+    def get_gateway
+      nstat = Shell.execute('netstat -nr')
 
-    Logger.debug "NETSTAT:\n#{nstat}"
-      
-    out = nstat.split(/\n/).select {|n| n =~ /UG/ }
-    gw = out.first.split[1]
-
-    raise BetterCap::Error, 'Could not detect gateway address' unless is_ip?(gw)
-    gw
-  end
+      Logger.debug "NETSTAT:\n#{nstat}"
 
-  def Network.get_local_ips
-    ips = []
-    
-    Shell.ifconfig.split("\n").each do |line|
-      if line =~ /inet [adr:]*([\d\.]+)/
-        ips << $1
+      out = nstat.split(/\n/).select {|n| n =~ /UG/ }
+      gw  = nil
+      out.each do |line|
+        if line.include?( Context.get.options[:iface] )
+          gw = line.split[1]
+        end
       end
+
+      raise BetterCap::Error, 'Could not detect gateway address' unless gw.nil? or is_ip?(gw)
+      gw
     end
 
-    ips
-  end
+    def get_local_ips
+      ips = []
+
+      Shell.ifconfig.split("\n").each do |line|
+        if line =~ /inet [adr:]*([\d\.]+)/
+          ips << $1
+        end
+      end
 
-  def Network.get_alive_targets( ctx, timeout = 5 )
-    if ctx.options[:arpcache] == false
-      icmp = IcmpAgent.new timeout
-      udp = UdpAgent.new ctx.ifconfig, ctx.gateway, ctx.iface[:ip_saddr]
-      syn = SynAgent.new ctx.ifconfig, ctx.gateway, ctx.iface[:ip_saddr]
-
-      syn.wait
-      icmp.wait
-      udp.wait
-    else
-      Logger.debug 'Using current ARP cache.'
+      ips
     end
 
-    ArpAgent.parse ctx
-  end
+    def get_alive_targets( ctx, timeout = 5 )
+      if ctx.options[:arpcache] == false
+        icmp = IcmpAgent.new timeout
+        udp  = UdpAgent.new ctx.ifconfig, ctx.gateway, ctx.ifconfig[:ip_saddr]
+        syn  = SynAgent.new ctx.ifconfig, ctx.gateway, ctx.ifconfig[:ip_saddr]
+        arp  = ArpAgent.new ctx.ifconfig, ctx.gateway, ctx.ifconfig[:ip_saddr]
+
+        syn.wait
+        icmp.wait
+        arp.wait
+        udp.wait
+      else
+        Logger.debug 'Using current ARP cache.'
+      end
+
+      ArpAgent.parse ctx
+    end
 
 =begin
   FIXME:
@@ -83,49 +90,55 @@ class Network
 
   won't catch anything, instead we're using cap.stream.each.
 =end
-  def Network.get_hw_address( iface, ip_address, attempts = 2 )
-    hw_address = nil
-
-    attempts.times do
-      arp_pkt = PacketFu::ARPPacket.new
-
-      arp_pkt.eth_saddr     = arp_pkt.arp_saddr_mac = iface[:eth_saddr]
-      arp_pkt.eth_daddr     = 'ff:ff:ff:ff:ff:ff'
-      arp_pkt.arp_daddr_mac = '00:00:00:00:00:00'
-      arp_pkt.arp_saddr_ip  = iface[:ip_saddr]
-      arp_pkt.arp_daddr_ip  = ip_address
-
-      cap_thread = Thread.new do
-        target_mac = nil
-        cap = PacketFu::Capture.new(
-          :iface => iface[:iface],
-          :start => true,
-          :filter => "arp src #{ip_address} and ether dst #{arp_pkt.eth_saddr}"
-        )
-        arp_pkt.to_w(iface[:iface])
-
-        timeout = 0
-
-        while target_mac.nil? && timeout <= 5
-          cap.stream.each do |p|
-            arp_response = PacketFu::Packet.parse(p)
-            target_mac = arp_response.arp_saddr_mac if arp_response.arp_saddr_ip == ip_address
-
-            break unless target_mac.nil?
+    def get_hw_address( iface, ip_address, attempts = 2 )
+      hw_address = nil
+
+      attempts.times do
+        arp_pkt = PacketFu::ARPPacket.new
+
+        arp_pkt.eth_saddr     = arp_pkt.arp_saddr_mac = iface[:eth_saddr]
+        arp_pkt.eth_daddr     = 'ff:ff:ff:ff:ff:ff'
+        arp_pkt.arp_daddr_mac = '00:00:00:00:00:00'
+        arp_pkt.arp_saddr_ip  = iface[:ip_saddr]
+        arp_pkt.arp_daddr_ip  = ip_address
+
+        cap_thread = Thread.new do
+          target_mac = nil
+          timeout = 0
+
+          cap = PacketFu::Capture.new(
+            :iface => iface[:iface],
+            :start => true,
+            :filter => "arp src #{ip_address} and ether dst #{arp_pkt.eth_saddr}"
+          )
+          arp_pkt.to_w(iface[:iface])
+
+          begin
+            Logger.debug 'Attempting to get MAC from packet capture ...'
+            target_mac = Timeout::timeout(0.5) { get_mac_from_capture(cap, ip_address) }
+          rescue Timeout::Error
+            timeout += 0.1
+            retry if target_mac.nil? && timeout <= 5
           end
 
-          timeout += 0.1
-
-          Logger.debug 'Retrying ...'
-          sleep 0.1
+          target_mac
         end
-        target_mac
+        hw_address = cap_thread.value
+
+        break unless hw_address.nil?
       end
-      hw_address = cap_thread.value
 
-      break unless hw_address.nil?
+      hw_address
     end
 
-    hw_address
+    private
+
+    def get_mac_from_capture( cap, ip_address )
+      cap.stream.each do |p|
+        arp_response = PacketFu::Packet.parse(p)
+        target_mac = arp_response.arp_saddr_mac if arp_response.arp_saddr_ip == ip_address
+        break target_mac unless target_mac.nil?
+      end
+    end
   end
 end

data/lib/bettercap/proxy/module.rb

@@ -21,7 +21,7 @@ class Module
   end
 
   # we're enabled by default, yo!
-  def is_enabled?
+  def enabled?
     true
   end
 

data/lib/bettercap/proxy/proxy.rb

@@ -52,7 +52,7 @@ class Proxy
       Logger.info 'Stopping proxy ...'
 
       if @socket and @running
-        @running = false        
+        @running = false
         @socket.close
       end
     rescue
@@ -115,7 +115,7 @@ class Proxy
         read += buff.size
 
         # collect into the proper object
-        if not opts[:request].nil? and opts[:request].is_post?
+        if not opts[:request].nil? and opts[:request].post?
           opts[:request] << buff
         end
 
@@ -229,7 +229,7 @@ class Proxy
           break unless not response.headers_done
         end
 
-        if response.is_textual?
+        if response.textual?
           log_stream client_ip, request, response
 
           Logger.debug 'Detected textual response'

data/lib/bettercap/proxy/request.rb

@@ -40,7 +40,7 @@ class Request
 
       line = "#{@verb} #{url} HTTP/1.0"
 
-      # get the host header value
+    # get the host header value
     elsif line =~ /^Host: (.*)$/
       @host = $1
       if host =~ /([^:]*):([0-9]*)$/
@@ -48,7 +48,7 @@ class Request
         @port = $2.to_i
       end
 
-      # parse content length, this will speed up data streaming
+    # parse content length, this will speed up data streaming
     elsif line =~ /^Content-Length:\s+(\d+)\s*$/i
       @content_length = $1.to_i
 
@@ -65,12 +65,12 @@ class Request
       @lines << line
     end
 
-    def is_post?
-      return @verb == 'POST'
+    def post?
+      @verb == 'POST'
     end
 
     def to_s
-      return @lines.join("\n") + "\n"
+      @lines.join("\n") + "\n"
     end
   end
 

data/lib/bettercap/proxy/response.rb

@@ -52,12 +52,12 @@ class Response
     end
   end
 
-  def is_textual?
+  def textual? # textual?
     @content_type and ( @content_type =~ /^text\/.+/ or @content_type =~ /^application\/.+/ )
   end
 
   def to_s
-    if is_textual?
+    if textual?
       @headers.map! do |header|
         # update content length in case the body was
         # modified

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

@@ -13,19 +13,19 @@ require 'bettercap/logger'
 require 'colorize'
 
 class BaseParser
-    def initialize
-        @filters = []
-        @name = 'BASE'
-    end
+  def initialize
+    @filters = []
+    @name = 'BASE'
+  end
 
-    def on_packet( pkt )
-        s = pkt.to_s
-        @filters.each do |filter|
-            if s =~ filter
-                Logger.write "[#{pkt.ip_saddr}:#{pkt.tcp_src} > #{pkt.ip_daddr}:#{pkt.tcp_dst} #{pkt.proto.last}] " +
-                             "[#{@name}] ".green +
-                             pkt.payload.strip.yellow
-            end
-        end
+  def on_packet( pkt )
+    s = pkt.to_s
+    @filters.each do |filter|
+      if s =~ filter
+        Logger.write "[#{pkt.ip_saddr}:#{pkt.tcp_src} > #{pkt.ip_daddr}:#{pkt.tcp_dst} #{pkt.proto.last}] " +
+                     "[#{@name}] ".green +
+                     pkt.payload.strip.yellow
+      end
     end
+  end
 end

data/lib/bettercap/sniffer/sniffer.rb

@@ -22,13 +22,30 @@ class Sniffer
   def self.start( ctx )
     Logger.info 'Starting sniffer ...'
 
+    pcap = nil
+
+    if !ctx.options[:sniffer_pcap].nil?
+      pcap = PcapFile.new
+      Logger.warn "Saving packets to #{ctx.options[:sniffer_pcap]} ."
+    end
+
     @@parsers = ParserFactory.load_by_names ctx.options[:parsers]
 
-    cap = Capture.new(:iface => ctx.options[:iface], :start => true)
+    cap = Capture.new(
+        :iface => ctx.options[:iface],
+        :filter => ctx.options[:sniffer_filter],
+        :start => true
+    )
     cap.stream.each do |p|
+      begin
+        pcap.array_to_file( :filename => ctx.options[:sniffer_pcap], :array => [p], :append => true) unless pcap.nil?
+      rescue Exception => e
+        Logger.warn e.message
+      end
+
       pkt = Packet.parse p
       if not pkt.nil? and pkt.is_ip?
-        next if ( pkt.ip_saddr == ctx.iface[:ip_saddr] or pkt.ip_daddr == ctx.iface[:ip_saddr] ) and !ctx.options[:local]
+        next if ( pkt.ip_saddr == ctx.ifconfig[:ip_saddr] or pkt.ip_daddr == ctx.ifconfig[:ip_saddr] ) and !ctx.options[:local]
 
         @@parsers.each do |parser|
           begin

data/lib/bettercap/spoofers/arp.rb

@@ -27,7 +27,7 @@ class ArpSpoofer < ISpoofer
     Logger.debug 'ARP SPOOFER SELECTED'
 
     Logger.info "Getting gateway #{@ctx.gateway} MAC address ..."
-    @gw_hw = Network.get_hw_address( @ctx.iface, @ctx.gateway )
+    @gw_hw = Network.get_hw_address( @ctx.ifconfig, @ctx.gateway )
     if @gw_hw.nil?
       raise BetterCap::Error, "Couldn't determine router MAC"
     end
@@ -45,7 +45,7 @@ class ArpSpoofer < ISpoofer
     pkt.arp_daddr_ip = daddr
     pkt.arp_opcode = 2
 
-    pkt.to_w(@ctx.iface[:iface])
+    pkt.to_w(@ctx.ifconfig[:iface])
   end
 
   def start
@@ -84,7 +84,7 @@ class ArpSpoofer < ISpoofer
           if target.mac.nil?
             Logger.warn "Getting target #{target.ip} MAC address ..."
 
-            hw = Network.get_hw_address( @ctx.iface, target.ip, 1 )
+            hw = Network.get_hw_address( @ctx.ifconfig, target.ip, 1 )
             if hw.nil?
               Logger.warn "Couldn't determine target MAC"
               next
@@ -95,8 +95,8 @@ class ArpSpoofer < ISpoofer
             end
           end
 
-          send_spoofed_packed @ctx.gateway,    @ctx.iface[:eth_saddr], target.ip, target.mac
-          send_spoofed_packed target.ip, @ctx.iface[:eth_saddr], @ctx.gateway,    @gw_hw
+          send_spoofed_packed @ctx.gateway,    @ctx.ifconfig[:eth_saddr], target.ip, target.mac
+          send_spoofed_packed target.ip, @ctx.ifconfig[:eth_saddr], @ctx.gateway,    @gw_hw
         end
 
         prev_size = @ctx.targets.size

data/lib/bettercap/target.rb

@@ -17,36 +17,36 @@ class Target
     @@prefixes = nil
 
     def initialize( ip, mac )
-        @ip = ip
-        @mac = mac
-        @vendor = Target.lookup_vendor(mac) if not mac.nil?
-        @hostname = nil # for future use
+      @ip = ip
+      @mac = mac
+      @vendor = Target.lookup_vendor(mac) if not mac.nil?
+      @hostname = nil # for future use
     end
 
     def mac=(value)
-        @mac = value
-        @vendor = Target.lookup_vendor(@mac) if not @mac.nil?
+      @mac = value
+      @vendor = Target.lookup_vendor(@mac) if not @mac.nil?
     end
 
     def to_s
-        "#{@ip} : #{@mac}" + ( @vendor ? " ( #{@vendor} )" : "" )
+      "#{@ip} : #{@mac}" + ( @vendor ? " ( #{@vendor} )" : "" )
     end
 
 private
 
     def self.lookup_vendor( mac )
-        if @@prefixes == nil
-            Logger.debug 'Preloading hardware vendor prefixes ...'
-
-            @@prefixes = {}
-            filename = File.dirname(__FILE__) + '/hw-prefixes'
-            File.open( filename ).each do |line|
-                if line =~ /^([A-F0-9]{6})\s(.+)$/
-                    @@prefixes[$1] = $2
-                end
-            end
+      if @@prefixes == nil
+        Logger.debug 'Preloading hardware vendor prefixes ...'
+
+        @@prefixes = {}
+        filename = File.dirname(__FILE__) + '/hw-prefixes'
+        File.open( filename ).each do |line|
+          if line =~ /^([A-F0-9]{6})\s(.+)$/
+            @@prefixes[$1] = $2
+          end
         end
+      end
 
-        @@prefixes[ mac.split(':')[0,3].join('').upcase ]
+      @@prefixes[ mac.split(':')[0,3].join('').upcase ]
     end
 end