bettercap 1.3.5 → 1.3.6

data/lib/bettercap/spoofers/base.rb

@@ -14,6 +14,29 @@ module BetterCap
 module Spoofers
 # Base class for BetterCap::Spoofers modules.
 class Base
+  # Hash of available spoofers ( spoofer name -> class name )
+  @@loaded = {}
+
+  class << self
+    # Called when this base class is inherited from one of the spoofers.
+    def inherited(subclass)
+      name = subclass.name.split('::')[2].upcase
+      @@loaded[name] = subclass.name
+    end
+
+    # Return a list of available spoofers names.
+    def available
+      @@loaded.keys
+    end
+
+    # Create an instance of a BetterCap::Spoofers object given its +name+.
+    # Will raise a BetterCap::Error if +name+ is not valid.
+    def get_by_name(name)
+      raise BetterCap::Error, "Invalid spoofer name '#{name}'!" unless available.include? name
+      BetterCap::Loader.load(@@loaded[name]).new
+    end
+  end
+
   # Will raise NotImplementedError .
   def initialize
     not_implemented_method!

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.3.5'
+  VERSION = '1.3.6'
   # 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.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -128,9 +128,6 @@ files:
 - lib/bettercap/discovery/agents/udp.rb
 - lib/bettercap/discovery/thread.rb
 - lib/bettercap/error.rb
-- lib/bettercap/factories/firewall.rb
-- lib/bettercap/factories/parser.rb
-- lib/bettercap/factories/spoofer.rb
 - lib/bettercap/firewalls/base.rb
 - lib/bettercap/firewalls/linux.rb
 - lib/bettercap/firewalls/osx.rb
@@ -142,6 +139,8 @@ files:
 - lib/bettercap/network/hw-prefixes
 - lib/bettercap/network/network.rb
 - lib/bettercap/network/packet_queue.rb
+- lib/bettercap/network/protos/base.rb
+- lib/bettercap/network/protos/dhcp.rb
 - lib/bettercap/network/servers/dnsd.rb
 - lib/bettercap/network/servers/httpd.rb
 - lib/bettercap/network/target.rb
@@ -163,7 +162,9 @@ files:
 - lib/bettercap/proxy/thread_pool.rb
 - lib/bettercap/shell.rb
 - lib/bettercap/sniffer/parsers/base.rb
+- lib/bettercap/sniffer/parsers/cookie.rb
 - lib/bettercap/sniffer/parsers/custom.rb
+- lib/bettercap/sniffer/parsers/dhcp.rb
 - lib/bettercap/sniffer/parsers/dict.rb
 - lib/bettercap/sniffer/parsers/ftp.rb
 - lib/bettercap/sniffer/parsers/httpauth.rb
@@ -178,6 +179,7 @@ files:
 - lib/bettercap/sniffer/parsers/rlogin.rb
 - lib/bettercap/sniffer/parsers/snpp.rb
 - lib/bettercap/sniffer/parsers/url.rb
+- lib/bettercap/sniffer/parsers/whatsapp.rb
 - lib/bettercap/sniffer/sniffer.rb
 - lib/bettercap/spoofers/arp.rb
 - lib/bettercap/spoofers/base.rb

data/lib/bettercap/factories/firewall.rb

@@ -1,43 +0,0 @@
-# encoding: UTF-8
-=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'
-require 'bettercap/firewalls/osx'
-require 'bettercap/firewalls/linux'
-
-module BetterCap
-module Factories
-# Factory class responsible of creating the correct object for the current
-# operating system of the user.
-class Firewall
-  @@instance = nil
-  # Save and return an instance of the appropriate BetterCap::Firewalls object.
-  def self.get
-    return @@instance unless @@instance.nil?
-
-    if RUBY_PLATFORM =~ /darwin/
-      @@instance = Firewalls::OSX.new
-    elsif RUBY_PLATFORM =~ /linux/
-      @@instance = Firewalls::Linux.new
-    else
-      raise BetterCap::Error, 'Unsupported operating system'
-    end
-
-    @@instance
-  end
-  # Clear the instance of the BetterCap::Firewalls object.
-  def self.clear
-    @@instance = nil
-  end
-end
-end
-end

data/lib/bettercap/factories/parser.rb

@@ -1,74 +0,0 @@
-# encoding: UTF-8
-=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'
-require 'bettercap/logger'
-
-module BetterCap
-module Factories
-# Factory class responsible for listing, parsing and creating BetterCap::Parsers
-# object instances.
-class Parser
-  @@path = File.dirname(__FILE__) + '/../sniffer/parsers/'
-
-  class << self
-    # Return a list of available parsers.
-    def available
-      avail = []
-      Dir.foreach( @@path ) do |file|
-        if file =~ /.rb/ and file != 'base.rb' and file != 'custom.rb'
-          avail << file.gsub('.rb','').upcase
-        end
-      end
-      avail
-    end
-
-    # Parse the +v+ command line argument and return a list of parser names.
-    # Will raise BetterCap::Error if one or more parser names are not valid.
-    def from_cmdline(v)
-      raise BetterCap::Error, "No parser names provided" if v.nil?
-
-      avail = available
-      list = v.split(',').collect(&:strip).collect(&:upcase).reject{ |c| c.empty? }
-      list.each do |parser|
-          raise BetterCap::Error, "Invalid parser name '#{parser}'." unless avail.include?(parser) or parser == '*'
-      end
-      list
-    end
-
-    # Return a list of BetterCap::Parsers instances by their +parsers+ names.
-    def load_by_names(parsers)
-      loaded = []
-      Dir.foreach( @@path ) do |file|
-        cname = file.gsub('.rb','').upcase
-        if file =~ /.rb/ and file != 'base.rb' and file != 'custom.rb' and ( parsers.include?(cname) or parsers == ['*'] )
-          Logger.debug "Loading parser #{cname} ..."
-
-          require_relative "#{@@path}#{file}"
-
-          loaded << BetterCap::Loader.load("BetterCap::Parsers::#{cname.capitalize}").new
-        end
-      end
-      loaded
-    end
-
-    # Load and return an instance of the BetterCap::Parsers::Custom parser
-    # given the +expression+ Regex object.
-    def load_custom(expression)
-      require_relative "#{@@path}custom.rb"
-      [ BetterCap::Parsers::Custom.new(expression) ]
-    end
-  end
-end
-end
-end

data/lib/bettercap/factories/spoofer.rb

@@ -1,53 +0,0 @@
-# encoding: UTF-8
-=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
-module Factories
-# Factory class responsible for listing, parsing and creating BetterCap::Spoofers
-# object instances.
-class Spoofer
-  class << self
-    # Return a list of available spoofers.
-    def available
-      avail = []
-      Dir.foreach( File.dirname(__FILE__) + '/../spoofers/') do |file|
-        if file =~ /.rb/ and file != 'base.rb'
-          avail << file.gsub('.rb','').upcase
-        end
-      end
-      avail
-    end
-
-    # Create an instance of a BetterCap::Spoofers object given its +name+.
-    # Will raise a BetterCap::Error if +name+ is not valid.
-    def get_by_name(name)
-      raise BetterCap::Error, "Invalid spoofer name '#{name}'!" unless available? name
-
-      name.downcase!
-
-      require_relative "../spoofers/#{name}"
-
-      BetterCap::Loader.load("BetterCap::Spoofers::#{name.capitalize}").new
-    end
-
-    private
-
-    # Return true if +name+ is a valid spoofer name, otherwise false.
-    def available?(name)
-      available.include?(name)
-    end
-  end
-end
-end
-end