bettercap 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c1b50612037538a301084dd6780fbbe25ce5c8
-  data.tar.gz: 24c4fea056b5f2c2a8be6520ddb1f81895d7630a
+  metadata.gz: 5e80ed7cf8ff695b09a19be15f3fd7e38bb9e4fd
+  data.tar.gz: 359ad3c86019ae9fe19a42f121293aada476638a
 SHA512:
-  metadata.gz: 1d0d3cf857d16c39ec4da7bb37a00892397050b5f2ff4f37227c7a9ba2af0f40f07cf0869064fe90a609bcd838bee85d3df1d5805f43223b8a853d5158dc17f6
-  data.tar.gz: 930097cd8f7103cefaa4f5e79feedbe0adbab02cccd7c4705d7c5d72a1b3146ae3e6f91be1a13e246ae258516b57117da5c05cf867d07a20279e236948a88c2b
+  metadata.gz: aacecd1696e02cfae46e23345fa4d48915c7c7539027acbf310ba3da604db4d36974b18a0e8535b9f5bf95315fd4767deda95168be553ac842ef4ca162d93e45
+  data.tar.gz: a779eecb8aaadf88dc818fbc58af27398653c3ed0cdc871e414058702e2ed2893add104e5c0e53b6a8c258e379e387dd2d231af8710d2be6c61da09328a925bc

data/lib/bettercap/context.rb

@@ -51,6 +51,12 @@ class Context
     @@instance ||= self.new
   end
 
+  # Runs a minor GC to collect young, short-lived objects.
+  def self.run_gc
+    Logger.debug "Running Ruby garbage collector ..."
+    GC.start( full_mark: false )
+  end
+
   # Initialize the global context object.
   def initialize
     begin
@@ -156,6 +162,10 @@ class Context
     ( @options.sniffer and @options.parsers.include?('POST') )
   end
 
+  def need_gateway?
+    ( @options.arpcache == false or @options.has_spoofer? )
+  end
+
   # Stop every running daemon that was started and reset system state.
   def finalize
     @running = false

data/lib/bettercap/firewalls/base.rb

@@ -26,6 +26,8 @@ class Base
         @@instance = Firewalls::OSX.new
       elsif RUBY_PLATFORM =~ /linux/
         @@instance = Firewalls::Linux.new
+      elsif RUBY_PLATFORM =~ /openbsd/
+        @@instance = Firewalls::OpenBSD.new
       else
         raise BetterCap::Error, 'Unsupported operating system'
       end

data/lib/bettercap/firewalls/openbsd.rb

@@ -0,0 +1,77 @@
+# encoding: UTF-8
+=begin
+
+BETTERCAP
+
+Author : Angelos D. Keromytis
+Email  : angelos@cs.columbia.edu
+
+This project is released under the GPL 3 license.
+
+=end
+
+module BetterCap
+module Firewalls
+  # OpenBSD Firewall class; for now, it's a direct copy of the OSX firewall
+class OpenBSD < Base
+  # If +enabled+ is true will enable packet forwarding, otherwise it will
+  # disable it.
+  def enable_forwarding(enabled)
+    Shell.execute("sysctl -w net.inet.ip.forwarding=#{enabled ? 1 : 0}")
+  end
+
+  # If +enabled+ is true will enable packet icmp_echo_ignore_broadcasts, otherwise it will
+  # disable it.
+  def enable_icmp_bcast(enabled)
+    Shell.execute("sysctl -w net.inet.icmp.bmcastecho=#{enabled ? 1 : 0}")
+  end
+
+  # Return true if packet forwarding is currently enabled, otherwise false.
+  def forwarding_enabled?
+    Shell.execute('sysctl net.inet.ip.forwarding').strip.split(' ')[1] == '1'
+  end
+
+  # This method is ignored on OpenBSD.
+  def enable_send_redirects(enabled); end
+
+  # If +enabled+ is true, the PF firewall will be enabled, otherwise it will
+  # be disabled.
+  def enable(enabled)
+    begin
+      Shell.execute("pfctl -#{enabled ? 'e' : 'd'} >/dev/null 2>&1")
+    rescue; end
+  end
+
+  # Apply the +r+ BetterCap::Firewalls::Redirection port redirection object.
+  def add_port_redirection( r )
+    # create the pf config file
+    config_file = "/tmp/bettercap_pf_#{Process.pid}.conf"
+
+    File.open( config_file, 'a+t' ) do |f|
+      f.write "rdr pass on #{r.interface} proto #{r.protocol} from any to any port #{r.src_port} -> #{r.dst_address} port #{r.dst_port}\n"
+    end
+
+    # load the rule
+    Shell.execute("pfctl -f #{config_file} >/dev/null 2>&1")
+    # enable pf
+    enable true
+  end
+
+  # Remove the +r+ BetterCap::Firewalls::Redirection port redirection object.
+  def del_port_redirection( r )
+    # FIXME: This should search for multiple rules inside the
+    # file and remove only this one.
+
+    # disable pf
+    enable false
+
+    begin
+      # remove the pf config file
+      File.delete( "/tmp/bettercap_pf_#{Process.pid}.conf" )
+    rescue
+    end
+
+  end
+end
+end
+end

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

@@ -35,12 +35,7 @@ module PacketFu
 
       BetterCap::Logger.debug "ifconfig #{iface}"
 
-      if BetterCap::Shell.available?('ip')
-        BetterCap::Logger.debug "Using iproute2"
-
-        data = BetterCap::Shell.ip(iface)
-        ret = linux_ip iface, data
-      else
+      if BetterCap::Shell.available?('ifconfig')
         BetterCap::Logger.debug "Using ifconfig"
 
         data = BetterCap::Shell.ifconfig(iface)
@@ -55,7 +50,16 @@ module PacketFu
           ret = linux_ifconfig iface, data
         when /darwin/i
           ret = darwin_ifconfig iface, data
+	      when /openbsd/i
+	        ret = openbsd_ifconfig iface, data
         end
+      elsif BetterCap::Shell.available?('ip')
+        BetterCap::Logger.debug "Using iproute2"
+
+        data = BetterCap::Shell.ip(iface)
+        ret = linux_ip iface, data
+      else
+        raise BetterCap::Error, 'Unsupported operating system'
       end
 
       ret
@@ -171,5 +175,37 @@ module PacketFu
 
       ret
     end
+
+    def self.openbsd_ifconfig(iface='em0',ifconfig_data)
+      BetterCap::Logger.debug "OpenBSD ifconfig #{iface}:\n#{ifconfig_data}"
+
+      ret = {}
+      real_iface = ifconfig_data.first
+      ret[:iface] = real_iface.split(':')[0]
+
+      ifconfig_data.each do |s|
+        case s
+          when /lladdr[\s]([0-9a-fA-F:]{17})/i
+            ret[:eth_saddr] = $1
+            ret[:eth_src] = EthHeader.mac2str(ret[:eth_saddr])
+          when /inet[\s]*([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)(.*Mask[\s]+(0x[a-f0-9]+))?/i
+            imask = 0
+            if $3
+              imask = $3.to_i(16).to_s(2).count("1")
+            end
+
+            ret[:ip_saddr] = $1
+            ret[:ip_src] = [IPAddr.new($1).to_i].pack("N")
+            ret[:ip4_obj] = IPAddr.new($1)
+            ret[:ip4_obj] = ret[:ip4_obj].mask(imask) if imask
+          when /inet6[\s]*([0-9a-fA-F:\x2f]+)/
+            ret[:ip6_saddr] = $1
+            ret[:ip6_obj] = IPAddr.new($1)
+        end
+      end
+
+      ret
+    end
+
   end
 end

data/lib/bettercap/network/arp_reader.rb

@@ -80,7 +80,11 @@ class ArpReader
 
   # Parse a single ARP cache +line+ related to the +iface+ network interface.
   def self.parse_cache_line( iface, line )
-    /[^\s]+\s+\(([0-9\.]+)\)\s+at\s+([a-f0-9:]+).+#{iface}.*/i.match(line)
+    if RUBY_PLATFORM =~ /openbsd/i
+      /([0-9\.]+)\s+([a-f0-9:]+)\s+#{iface}\s+.*/i.match(line)
+    else
+      /[^\s]+\s+\(([0-9\.]+)\)\s+at\s+([a-f0-9:]+).+#{iface}.*/i.match(line)
+    end
   end
 end
 end

data/lib/bettercap/network/packet_queue.rb

@@ -33,6 +33,8 @@ class PacketQueue
 
   # Push a packet to the queue.
   def push(packet)
+    Context.run_gc if @queue.size == 0
+
     @queue.push(packet)
   end
 

data/lib/bettercap/spoofers/base.rb

@@ -107,12 +107,14 @@ private
   # Get the MAC address of the gateway and update it.
   def update_gateway!
     hw = Network.get_hw_address( @ctx, @ctx.gateway )
-    raise BetterCap::Error, "Couldn't determine router MAC" if hw.nil?
+
+    raise BetterCap::Error, "Couldn't determine router MAC" if ( @ctx.need_gateway? and hw.nil? )
+
     @gateway = Network::Target.new( @ctx.gateway, hw )
-    
+
     # notify the system that the gateway mac is resolved, this will prevent
     # the gateway ip to be unnecessarily probed from discovery agents.
-    @ctx.gateway_mac_resolved = true
+    @ctx.gateway_mac_resolved = !hw.nil?
 
     Logger.info "[#{'GATEWAY'.green}] #{@gateway.to_s(false)}"
   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.5'
+  VERSION = '1.4.6'
   # Program banner.
   BANNER = File.read( File.dirname(__FILE__) + '/banner' ).gsub( '#VERSION#', "v#{VERSION}")
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: bettercap
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
 - !ruby/object:Gem::Dependency
@@ -49,6 +55,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
@@ -56,6 +65,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
@@ -63,6 +75,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
@@ -70,6 +85,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
@@ -77,6 +95,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
@@ -84,6 +105,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
@@ -129,6 +153,7 @@ files:
 - lib/bettercap/error.rb
 - lib/bettercap/firewalls/base.rb
 - lib/bettercap/firewalls/linux.rb
+- lib/bettercap/firewalls/openbsd.rb
 - lib/bettercap/firewalls/osx.rb
 - lib/bettercap/firewalls/redirection.rb
 - lib/bettercap/loader.rb
@@ -225,3 +250,4 @@ signing_key:
 specification_version: 4
 summary: A complete, modular, portable and easily extensible MITM framework.
 test_files: []
+has_rdoc: