bettercap 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f4c77bd2bccc140b9a3671bd93d8db8c9b396ed
-  data.tar.gz: 15ecce5e711f0aa850ea01bc990d662d12653e7a
+  metadata.gz: 41e3ec675b769d7ac29357593472c14af387f440
+  data.tar.gz: a0a7fdf3060cf8179dd1bb9baa59d2e54658bf88
 SHA512:
-  metadata.gz: 1d90461987e6333dd563de4e2ea721d13ddaf22ebe914a38c03b569ec3fe159351f5367f81f89fd69eb83932fcb4e899127c503b3b21546985cf924700bd5659
-  data.tar.gz: ed7f74e1fabed25df2c1764e6fbe4530f08ec9354952611eb6fde8539a84ef58fd0164a7a844793135f06388e029c53b305c82d68eec0ed53419347240d63e93
+  metadata.gz: afb795ebe9f9ece60e02235d60519814f49483078cf9898b6755ee8e2d68409d3f420905bca98325749f329624665777b06e6183758fbff200cc9de963701fee
+  data.tar.gz: 389117b84b7c6c2bc3b63a9479ed9a5c3a375c7eac5c2afbf53a9394f3a2b898e4f5879ff07c146e2c372686c6ebb1b32a8da5d030a401664d88d2fe6bc3fa4f

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

@@ -31,7 +31,6 @@ module PacketFu
   class Utils
     def self.ifconfig(iface='eth0')
       ret = {}
-      iface = iface.to_s.scan(/[0-9A-Za-z]/).join
 
       BetterCap::Logger.debug "ifconfig #{iface}"
 

data/lib/bettercap/options/options.rb

@@ -103,13 +103,21 @@ class Options
 
     if @proxies.proxy
       @proxies.http_ports.each do |port|
-        redirections << redir( iface.ip, port, @proxies.proxy_port )
+        if @proxies.proxy_upstream_address.nil?
+          redirections << redir( iface.ip, port, @proxies.proxy_port )
+        else
+          redirections << redir_single( @proxies.proxy_upstream_address, iface.ip, port, @proxies.proxy_port )
+        end
       end
     end
 
     if @proxies.proxy_https
       @proxies.https_ports.each do |port|
-        redirections << redir( iface.ip, port, @proxies.proxy_https_port )
+        if @proxies.proxy_upstream_address.nil?
+          redirections << redir( iface.ip, port, @proxies.proxy_https_port )
+        else
+          redirections << redir_single( @proxies.proxy_upstream_address, iface.ip, port, @proxies.proxy_port )
+        end
       end
     end
 

data/lib/bettercap/options/proxy_options.rb

@@ -18,6 +18,8 @@ class ProxyOptions
   attr_accessor :proxy
   # If true, HTTPS transparent proxy will be enabled.
   attr_accessor :proxy_https
+  # If set, only this address will be redirected to the HTTP(S) proxiy.
+  attr_accessor :proxy_upstream_address
   # HTTP proxy port.
   attr_accessor :proxy_port
   # List of HTTP ports, [ 80 ] by default.
@@ -32,6 +34,8 @@ class ProxyOptions
   attr_accessor :proxy_module
   # If true, sslstrip is enabled.
   attr_accessor :sslstrip
+  # If true, direct connections to the IP of this machine will be allowed.
+  attr_accessor :allow_local_connections
   # If true, TCP proxy will be enabled.
   attr_accessor :tcp_proxy
   # TCP proxy local port.
@@ -58,11 +62,13 @@ class ProxyOptions
     @https_ports = [ 443 ]
     @proxy = false
     @proxy_https = false
+    @proxy_upstream_address = nil
     @proxy_port = 8080
     @proxy_https_port = 8083
     @proxy_pem_file = nil
     @proxy_module = nil
     @sslstrip = true
+    @allow_local_connections = false
 
     @tcp_proxy = false
     @tcp_proxy_port = 2222
@@ -144,6 +150,11 @@ class ProxyOptions
       @proxy_port = v.to_i
     end
 
+    opts.on( '--allow-local-connections', "Allow direct connections to the proxy instance, default to #{@allow_local_connections.to_s.yellow}." ) do |v|
+      @proxy = true
+      @allow_local_connections = true
+    end
+
     opts.on( '--no-sslstrip', 'Disable SSLStrip.' ) do
       @proxy    = true
       @sslstrip = false
@@ -159,6 +170,11 @@ class ProxyOptions
       @proxy      = true
     end
 
+    opts.on( '--proxy-upstream-address ADDRESS', 'If set, only requests coming from this server address will be redirected to the HTTP/HTTPS proxies.' ) do |v|
+      v, _ = validate_address v
+      @proxy_upstream_address = v
+    end
+
     opts.separator ""
     opts.separator "  HTTPS:"
     opts.separator ""

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

@@ -26,6 +26,7 @@ class Proxy
     @is_https      = is_https
     @type          = is_https ? 'HTTPS' : 'HTTP'
     @upstream_port = is_https ? 443 : 80
+    @allow_local   = Context.get.options.proxies.allow_local_connections
     @server        = nil
     @sslserver     = nil
     @main_thread   = nil
@@ -148,7 +149,7 @@ class Proxy
       if @streamer.was_stripped?( request, client )
         @streamer.handle( request, client )
       # someone is having fun with us =)
-      elsif is_self_request? request
+      elsif !@allow_local and is_self_request? request
         @streamer.rickroll( client )
       # handle request
       else

data/lib/bettercap/proxy/thread_pool.rb

@@ -3,9 +3,9 @@
 
 BETTERCAP
 
-Author : Simone 'evilsocket' Margaritelli
-Email  : evilsocket@gmail.com
-Blog   : http://www.evilsocket.net/
+Some code copyright (c) 2005, Zed Shaw
+Copyright (c) 2011, Evan Phoenix
+Copyright (c) 2015, Simone Margaritelli
 
 This project is released under the GPL 3 license.
 
@@ -14,7 +14,6 @@ This project is released under the GPL 3 license.
 module BetterCap
 module Proxy
 # Thread pool class used by the BetterCap::Proxy::*.
-# Tnx to Puma ThreadPool!
 class ThreadPool
 
   # Maintain a minimum of +min+ and maximum of +max+ threads

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.3'
+  VERSION = '1.5.4'
   # 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.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize