bettercap 1.1.9 → 1.1.10

data/lib/bettercap/update_checker.rb

@@ -15,6 +15,7 @@ require 'bettercap/logger'
 require 'net/http'
 require 'json'
 
+module BetterCap
 class UpdateChecker
   def self.check
     ver = self.get_latest_version
@@ -51,3 +52,4 @@ class UpdateChecker
     return json['version']
   end
 end
+end

data/lib/bettercap/version.rb

@@ -10,6 +10,6 @@ This project is released under the GPL 3 license.
 
 =end
 module BetterCap
-  VERSION = '1.1.9'
+  VERSION = '1.1.10'
   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.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,20 +66,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A complete, modular, portable and easily extensible MITM framework.
 email: evilsocket@gmail.com
 executables:
@@ -91,16 +77,15 @@ files:
 - LICENSE.md
 - README.md
 - TODO.md
-- Rakefile
 - lib/bettercap/banner
 - lib/bettercap/base/ifirewall.rb
 - lib/bettercap/base/ispoofer.rb
 - lib/bettercap/context.rb
-- lib/bettercap/discovery/arp.rb
-- lib/bettercap/discovery/base.rb
-- lib/bettercap/discovery/icmp.rb
-- lib/bettercap/discovery/udp.rb
-- lib/bettercap/discovery.rb
+- lib/bettercap/discovery/agents/arp.rb
+- lib/bettercap/discovery/agents/base.rb
+- lib/bettercap/discovery/agents/icmp.rb
+- lib/bettercap/discovery/agents/udp.rb
+- lib/bettercap/discovery/discovery.rb
 - lib/bettercap/error.rb
 - lib/bettercap/factories/firewall_factory.rb
 - lib/bettercap/factories/parser_factory.rb
@@ -124,6 +109,7 @@ files:
 - lib/bettercap/proxy/thread_pool.rb
 - lib/bettercap/shell.rb
 - lib/bettercap/sniffer/parsers/base.rb
+- lib/bettercap/sniffer/parsers/custom.rb
 - lib/bettercap/sniffer/parsers/ftp.rb
 - lib/bettercap/sniffer/parsers/httpauth.rb
 - lib/bettercap/sniffer/parsers/https.rb
@@ -140,24 +126,6 @@ files:
 - lib/bettercap/version.rb
 - lib/bettercap.rb
 - bin/bettercap
-- test/factories/firewall_factory_test.rb
-- test/factories/parser_factory_test.rb
-- test/factories/spoofer_factory_test.rb
-- test/firewalls/linux_firewall_test.rb
-- test/firewalls/osx_firewall_test.rb
-- test/helpers/mock_shell.rb
-- test/logger_test.rb
-- test/network_test.rb
-- test/pcap/ftp.pcap
-- test/pcap/http.pcap
-- test/pcap/packets.pcap
-- test/proxy/response_test.rb
-- test/shell_test.rb
-- test/sniffer/parsers/base_parser_test.rb
-- test/sniffer/parsers/ftp_parser_test.rb
-- test/sniffer/parsers/url_parser_test.rb
-- test/target_test.rb
-- test/test_helper.rb
 homepage: http://github.com/evilsocket/bettercap
 licenses:
 - GPL3

data/Rakefile

@@ -1,7 +0,0 @@
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.libs << 'lib/bettercap'
-  t.pattern = "test/**/*_test.rb"
-end

data/test/factories/firewall_factory_test.rb

@@ -1,54 +0,0 @@
-require 'minitest/autorun'
-require 'factories/firewall_factory'
-
-class FirewallFactoryTest < MiniTest::Test
-  # TODO: Fix the tests for the Mac and Linux firewall initialization. Right now
-  # they are being created in a way which executes a shell command, causing
-  # tests to fail.
-
-  # def test_mac_firewall
-  #   FirewallFactory.clear_firewall
-  #
-  #   override_ruby_platform('darwin') do
-  #     firewall = FirewallFactory.get_firewall
-  #     assert_equal firewall.class, OSXFirewall
-  #   end
-  # end
-
-  # def test_linux_firewall
-  #   FirewallFactory.clear_firewall
-  #
-  #   override_ruby_platform('linux') do
-  #     firewall = FirewallFactory.get_firewall
-  #     assert_equal firewall.class, LinuxFirewall
-  #   end
-  # end
-
-  def test_unknown_firewall
-    FirewallFactory.clear_firewall
-
-    override_ruby_platform('ms') do
-      assert_raises BetterCap::Error do
-        FirewallFactory.get_firewall
-      end
-    end
-  end
-
-  private
-
-  def override_ruby_platform(platform)
-    actual_platform = RUBY_PLATFORM
-
-    begin
-      redefine_const :RUBY_PLATFORM, platform
-      yield
-    ensure
-      redefine_const :RUBY_PLATFORM, actual_platform
-    end
-  end
-
-  def redefine_const(const, value)
-    Object.send(:remove_const, const) if Object.const_defined?(const)
-    Object.const_set(const, value)
-  end
-end

data/test/factories/parser_factory_test.rb

@@ -1,36 +0,0 @@
-require 'minitest/autorun'
-require 'factories/parser_factory'
-
-class ParserFactoryTest < MiniTest::Test
-  def test_getting_available_parsers
-    available_parsers = ParserFactory.available
-    assert available_parsers.include?('FTP')
-  end
-
-  def test_successful_cmdline_parser_name
-    parsers = ParserFactory.from_cmdline('ftp,https')
-    assert_equal parsers, ['FTP', 'HTTPS']
-  end
-
-  def test_failed_cmdline_parser_name
-    assert_raises BetterCap::Error do
-      ParserFactory.from_cmdline 'unknown'
-    end
-  end
-
-  def test_no_cmdline_parser_provided
-    assert_raises BetterCap::Error do
-      ParserFactory.from_cmdline nil
-    end
-  end
-
-  def test_successfully_loading_parsers
-    loaded = ParserFactory.load_by_names 'FTP'
-    assert_equal loaded.first.class, FtpParser
-  end
-
-  def test_unsuccessfully_loading_parsers
-    loaded = ParserFactory.load_by_names 'unknown'
-    assert_empty loaded
-  end
-end

data/test/factories/spoofer_factory_test.rb

@@ -1,15 +0,0 @@
-require 'minitest/autorun'
-require 'factories/spoofer_factory'
-
-class SpooferFactoryTest < MiniTest::Test
-  def test_getting_available_parsers
-    spoofers = SpooferFactory.available
-    assert spoofers.include?('ARP')
-  end
-
-  def test_unsuccessful_name
-    assert_raises BetterCap::Error do
-      SpooferFactory.get_by_name 'unknown'
-    end
-  end
-end

data/test/firewalls/linux_firewall_test.rb

@@ -1,72 +0,0 @@
-require 'minitest/autorun'
-require 'test_helper'
-require 'firewalls/linux'
-require 'helpers/mock_shell'
-
-class OSXFirewallTest < MiniTest::Test
-  def test_enabling_forwarding
-    firewall = stubbed_firewall(LinuxFirewall).new
-    result = firewall.enable_forwarding true
-
-    assert_equal result, 'echo 1 > /proc/sys/net/ipv4/ip_forward'
-  end
-
-  def test_disabling_forwarding
-    firewall = stubbed_firewall(LinuxFirewall).new
-    result = firewall.enable_forwarding false
-
-    assert_equal result, 'echo 0 > /proc/sys/net/ipv4/ip_forward'
-  end
-
-  def test_enabling_icmp_broadcast
-    firewall = stubbed_firewall(LinuxFirewall).new
-    result = firewall.enable_icmp_bcast true
-
-    assert_equal result, 'echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts'
-  end
-
-  def test_disabling_icmp_broadcast
-    firewall = stubbed_firewall(LinuxFirewall).new
-    result = firewall.enable_icmp_bcast false
-
-    assert_equal result, 'echo 0 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts'
-  end
-
-  def test_whether_forwarding_is_enabled
-    expected_output = '1'
-    MockShell.stub :execute, expected_output do
-
-      firewall = stubbed_firewall(LinuxFirewall).new
-      result = firewall.forwarding_enabled?
-
-      assert result
-
-    end
-  end
-
-  def test_whether_forwarding_is_disabled
-    expected_output = '0'
-    MockShell.stub :execute, expected_output do
-
-      firewall = stubbed_firewall(LinuxFirewall).new
-      result = firewall.forwarding_enabled?
-
-      refute result
-
-    end
-  end
-
-  def test_enabling_the_firewall
-    firewall = stubbed_firewall(LinuxFirewall).new
-    result = firewall.enable true
-
-    assert_equal result, 'pfctl -e >/dev/null 2>&1'
-  end
-
-  def test_disabling_the_firewall
-    firewall = stubbed_firewall(LinuxFirewall).new
-    result = firewall.enable false
-
-    assert_equal result, 'pfctl -d >/dev/null 2>&1'
-  end
-end

data/test/firewalls/osx_firewall_test.rb

@@ -1,72 +0,0 @@
-require 'minitest/autorun'
-require 'test_helper'
-require 'firewalls/osx'
-require 'helpers/mock_shell'
-
-class OSXFirewallTest < MiniTest::Test
-  def test_enabling_forwarding
-    firewall = stubbed_firewall(OSXFirewall).new
-    result = firewall.enable_forwarding true
-
-    assert_equal result, 'sysctl -w net.inet.ip.forwarding=1'
-  end
-
-  def test_disabling_forwarding
-    firewall = stubbed_firewall(OSXFirewall).new
-    result = firewall.enable_forwarding false
-
-    assert_equal result, 'sysctl -w net.inet.ip.forwarding=0'
-  end
-
-  def test_enabling_icmp_broadcast
-    firewall = stubbed_firewall(OSXFirewall).new
-    result = firewall.enable_icmp_bcast true
-
-    assert_equal result, 'sysctl -w net.inet.icmp.bmcastecho=1'
-  end
-
-  def test_disabling_icmp_broadcast
-    firewall = stubbed_firewall(OSXFirewall).new
-    result = firewall.enable_icmp_bcast false
-
-    assert_equal result, 'sysctl -w net.inet.icmp.bmcastecho=0'
-  end
-
-  def test_whether_forwarding_is_enabled
-    expected_output = 'net.inet.ip.forwarding: 1'
-    MockShell.stub :execute, expected_output do
-
-      firewall = stubbed_firewall(OSXFirewall).new
-      result = firewall.forwarding_enabled?
-
-      assert result
-
-    end
-  end
-
-  def test_whether_forwarding_is_disabled
-    expected_output = 'net.inet.ip.forwarding: 0'
-    MockShell.stub :execute, expected_output do
-
-      firewall = stubbed_firewall(OSXFirewall).new
-      result = firewall.forwarding_enabled?
-
-      refute result
-
-    end
-  end
-
-  def test_enabling_the_firewall
-    firewall = stubbed_firewall(OSXFirewall).new
-    result = firewall.enable true
-
-    assert_equal result, 'pfctl -e >/dev/null 2>&1'
-  end
-
-  def test_disabling_the_firewall
-    firewall = stubbed_firewall(OSXFirewall).new
-    result = firewall.enable false
-
-    assert_equal result, 'pfctl -d >/dev/null 2>&1'
-  end
-end

data/test/helpers/mock_shell.rb

@@ -1,17 +0,0 @@
-module MockShell
-  class << self
-    # For easy testing, this method just returns back the command it is given.
-    # The real Shell class will return the output string.
-    def execute(command)
-      return command
-    end
-
-    def ifconfig(iface = '')
-      self.execute("LANG=en && ifconfig #{iface}")
-    end
-
-    def arp
-      self.execute('LANG=en && arp -a')
-    end
-  end
-end

data/test/logger_test.rb

@@ -1,12 +0,0 @@
-require 'minitest/autorun'
-require 'test_helper'
-require 'logger'
-
-class LoggerTest < MiniTest::Test
-  def test_writing_with_a_logfile
-    silence do |output|
-      Logger.raw 'Test log message'
-      assert_equal output.read, "Test log message\n"
-    end
-  end
-end

data/test/network_test.rb

@@ -1,14 +0,0 @@
-require 'minitest/autorun'
-require 'network'
-
-class NetworkTest < MiniTest::Test
-  def test_valid_ip_address
-    valid = Network.is_ip? '127.0.0.1'
-    assert valid
-  end
-
-  def test_invalid_ip_address
-    addresses = ['bad-ip', '255.255.255.255.255', '255.255', '999.999.999.999', 123]
-    addresses.each { |address| refute Network.is_ip?(address) }
-  end
-end

data/test/proxy/response_test.rb

@@ -1,56 +0,0 @@
-require 'minitest/autorun'
-require 'proxy/response'
-
-class TestProxyResponse < MiniTest::Test
-  def test_response_status_parsing
-    response = response_with_line 'HTTP/1.1 200 OK'
-    assert_equal response.headers, ['HTTP/1.1 200 OK']
-    assert_equal response.code, '200 OK'
-  end
-
-  def test_content_type_parsing
-    response = response_with_line 'Content-Type: text/xml'
-    assert_equal response.headers, ['Content-Type: text/xml']
-    assert_equal response.content_type, 'text/xml'
-  end
-
-  def test_content_length_parsing
-    response = response_with_line 'Content-Length: 1024'
-    assert_equal response.headers, ['Content-Length: 1024']
-    assert_equal response.content_length, 1024
-  end
-
-  def test_reaching_end_of_headers
-    response = response_with_line 'HTTP/1.1 200 OK'
-    refute response.headers_done
-
-    response << ''
-    assert response.headers_done
-  end
-
-  def test_parsing_response_body
-    body = 'This line goes into the body'
-
-    response = response_with_line 'HTTP/1.1 200 OK'
-    response << ''
-    response << body
-
-    assert_equal response.body, body
-  end
-
-  def test_textual
-    text_response = response_with_line 'Content-Type: text/xml'
-    image_response = response_with_line 'Content-Type: image/png'
-
-    assert text_response.textual?
-    refute image_response.textual?
-  end
-
-  private
-
-  def response_with_line(line)
-    response = Proxy::Response.new
-    response << line
-    response
-  end
-end