bettercap 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ec69d1a1e157a94b36b3f9162d807a2dea9238
-  data.tar.gz: 616717ef0f681792c14ba6ff5dd4341462f175c2
+  metadata.gz: 851e88dcce552dfe264421c42fd1ad02c4ef0160
+  data.tar.gz: 25e6d2a981d6113e86c150f833405c417594d613
 SHA512:
-  metadata.gz: f0cfae6e9605ffe0226b3d5bb3a85dafb2d808fd9e1ca3f3f020961769b3ba10fb5d87c9c7747de0fa2e4c3fc3a7a03fd3c0eca3f4710f9b19c1ffd9e5171fdf
-  data.tar.gz: 62981206dccd1fbaa956db5f2316dfe29f2a5e05dd495334f740c408adaf64ab1eb64da925cebe171f16ba00691131135cb26c0f3cffaec1abd967882a341b56
+  metadata.gz: 1d58eeb378e71ed4ef0059f5380763a4559d3c7f17d80da9ef54c415b760cfe47e38f52a9ea2cd2ba282ff326e87441c0b863790fa5b5b5b07ac0dd282246f3d
+  data.tar.gz: d19bc791b7cedf8f64527a981f248dd9c5b35ce1c8937df7cf1878f97c1ca0c79722c91f7c914968e288a34c798c22b385d070daa9bea686861844a1904d4ab9

data/.gitignore

@@ -7,4 +7,6 @@ cert.crt
 cert.key
 cert.pem
 test_https_proxy.rb
-mkchangelog.rb
+test_chunked.rb
+mkchangelog.rb
+.tags*

data/README.md

@@ -1,7 +1,5 @@
 ![logo](http://www.bettercap.org/assets/img/navbar-logo.png)
 
-Copyleft of Simone '[evilsocket](https://twitter.com/evilsocket)' Margaritelli*.  
-
 http://www.bettercap.org/
 
 [![Gem Version](https://badge.fury.io/rb/bettercap.svg)](http://badge.fury.io/rb/bettercap) [![Code Climate](https://codeclimate.com/github/evilsocket/bettercap/badges/gpa.svg)](https://codeclimate.com/github/evilsocket/bettercap)
@@ -10,32 +8,38 @@ http://www.bettercap.org/
 **bettercap** is a complete, modular, portable and easily extensible **MITM** tool and framework with every kind of diagnostic
 and offensive feature you could need in order to perform a man in the middle attack.
 
-HOW TO INSTALL
-===
+Contact me at:
+
+- Twitter: [@evilsocket](https://twitter.com/evilsocket)
+- Email: evilsocket@gmail.com
+
+Before submitting issues, please read the relevant [section](http://www.bettercap.org/docs/contribute/) in the documentation.
+
+Installation
+============
 
 **Stable Release ( GEM )**
-    
+
     gem install bettercap
-    
+
 **From Source**
-    
+
     git clone https://github.com/evilsocket/bettercap
     cd bettercap
     gem build bettercap.gemspec
     sudo gem install bettercap*.gem
 
-DEPENDS
-===
+Dependencies
+============
 
 All dependencies will be automatically installed through the GEM system, in some case you might need to install some system
 dependency in order to make everything work:
 
     sudo apt-get install ruby-dev libpcap-dev
-   
-This should solve issues such as [this one](https://github.com/evilsocket/bettercap/issues/22).
 
+This should solve issues such as [this one](https://github.com/evilsocket/bettercap/issues/22).
 
-EXAMPLES & INSTRUCTIONS
-===
+Documentation and Examples
+============
 
-Please refer to the [official website](http://bettercap.org).
+Please refer to the [official website](http://www.bettercap.org/docs/).

data/TODO.md

@@ -3,15 +3,22 @@ This is a list of TODOs I use to keep track of tasks and upcoming features.
 ---
 
 - [x] Implement `--ignore ADDR,ADDR,ADDR` option to filter out specific addresses from the targets list.
+- [x] HTTP 1.1 chunked response support.
+- [x] Ip address to hostname resolution.
+- [ ] Implement event-driven core plugin infrastructure ( for webui, etc ).
+- [ ] Implement web-ui core plugin.
 - [ ] Rewrite proxy class using [em-proxy](https://github.com/igrigorik/em-proxy) library.
-- [ ] [Active packet filtering/injection/etc](https://github.com/evilsocket/bettercap/issues/75) ( maybe using [this](https://github.com/gdelugre/ruby-nfqueue) ).
-- [ ] *BSD Support.
 - [ ] HTTP/2 Support.
+- [ ] IPV6 Support.
+
+**Platform Specific**
+
+- [ ] *BSD Support.
+- [ ] Windows Support? ( OMG PLZ NO! )
+- [ ] GNU/Linux [Active packet filtering/injection/etc](https://github.com/evilsocket/bettercap/issues/75) ( maybe using [this](https://github.com/gdelugre/ruby-nfqueue) ).
 
 **Maybe**
 
 - [ ] ICMP Redirect ? ( only half duplex and filtered by many firewalls anyway ... dunno ).
 - [ ] DNS Spoofing ( not sure if it actually makes any sense ).
-- [ ] Windows Support? ( OMG PLZ NO! )
-- [ ] Output/actions as json for UI integration?
 - [ ] sslstrip ( not really sure, currently is quite useless )

data/bettercap.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency( 'colorize', '~> 0.7.5' )
   gem.add_dependency( 'packetfu', '~> 1.1.10' )
   gem.add_dependency( 'pcaprub', '~> 0.12.0' )
+  gem.add_dependency( 'network_interface', '~> 0.0.1' )
 
   gem.add_development_dependency( 'minitest' )
 

data/bin/bettercap

@@ -23,149 +23,149 @@ begin
   OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} [options]"
     opts.version = BetterCap::VERSION
-    
+
 		opts.on( '-G', '--gateway ADDRESS', 'Manually specify the gateway address, if not specified the current gateway will be retrieved and used. ' ) do |v|
-      ctx.options[:gateway] = v
+      ctx.options.gateway = v
     end
 
-    opts.on( '-I', '--interface IFACE', 'Network interface name - default: ' + ctx.options[:iface].to_s ) do |v|
-      ctx.options[:iface] = v
+    opts.on( '-I', '--interface IFACE', 'Network interface name - default: ' + ctx.options.iface.to_s ) do |v|
+      ctx.options.iface = v
     end
 
-    opts.on( '-S', '--spoofer NAME', 'Spoofer module to use, available: ' + SpooferFactory.available.join(', ') + ' - default: ' + ctx.options[:spoofer] ) do |v|
-      ctx.options[:spoofer] = v
+    opts.on( '-S', '--spoofer NAME', 'Spoofer module to use, available: ' + SpooferFactory.available.join(', ') + ' - default: ' + ctx.options.spoofer ) do |v|
+      ctx.options.spoofer = v
     end
 
     opts.on( '-T', '--target ADDRESS1,ADDRESS2', 'Target IP addresses, if not specified the whole subnet will be targeted.' ) do |v|
-      ctx.options[:target] = v
+      ctx.options.target = v
     end
 
     opts.on( '--ignore ADDRESS1,ADDRESS2', 'Ignore these addresses if found while searching for targets.' ) do |v|
-      ctx.options[:ignore] = v
+      ctx.options.ignore = v
     end
 
     opts.on( '-O', '--log LOG_FILE', 'Log all messages into a file, if not specified the log messages will be only print into the shell.' ) do |v|
-      ctx.options[:logfile] = v
+      ctx.options.logfile = v
     end
 
     opts.on( '-D', '--debug', 'Enable debug logging.' ) do
-      ctx.options[:debug] = true
+      ctx.options.debug = true
     end
 
     opts.on( '-L', '--local', 'Parse packets coming from/to the address of this computer ( NOTE: Will set -X to true ), default to false.' ) do
-      ctx.options[:local] = true
-      ctx.options[:sniffer] = true
+      ctx.options.local = true
+      ctx.options.sniffer = true
     end
 
     opts.on( '-X', '--sniffer', 'Enable sniffer.' ) do
-      ctx.options[:sniffer] = true
+      ctx.options.sniffer = true
     end
 
     opts.on( '--sniffer-source FILE', 'Load packets from the specified PCAP file instead of the interface ( will enable sniffer ).' ) do |v|
-      ctx.options[:sniffer] = true
-      ctx.options[:sniffer_src] = File.expand_path v
+      ctx.options.sniffer = true
+      ctx.options.sniffer_src = File.expand_path v
     end
 
     opts.on( '--sniffer-pcap FILE', 'Save all packets to the specified PCAP file ( will enable sniffer ).' ) do |v|
-      ctx.options[:sniffer] = true
-      ctx.options[:sniffer_pcap] = File.expand_path v
+      ctx.options.sniffer = true
+      ctx.options.sniffer_pcap = File.expand_path v
     end
 
     opts.on( '--sniffer-filter EXPRESSION', 'Configure the sniffer to use this BPF filter ( will enable sniffer ).' ) do |v|
-      ctx.options[:sniffer] = true
-      ctx.options[:sniffer_filter] = v
+      ctx.options.sniffer = true
+      ctx.options.sniffer_filter = v
     end
 
     opts.on( '-P', '--parsers PARSERS', 'Comma separated list of packet parsers to enable, "*" for all ( NOTE: Will set -X to true ), available: ' + ParserFactory.available.join(', ') + ' - default: *' ) do |v|
-      ctx.options[:sniffer] = true
-      ctx.options[:parsers] = ParserFactory.from_cmdline(v)
+      ctx.options.sniffer = true
+      ctx.options.parsers = ParserFactory.from_cmdline(v)
     end
 
     opts.on( '--no-discovery', 'Do not actively search for hosts, just use the current ARP cache, default to false.' ) do
-      ctx.options[:arpcache] = true
+      ctx.options.arpcache = true
     end
 
     opts.on( '--no-spoofing', 'Disable spoofing, alias for --spoofer NONE.' ) do
-      ctx.options[:spoofer] = 'NONE'
+      ctx.options.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
-      ctx.options[:half_duplex] = true
+      ctx.options.half_duplex = true
     end
 
     opts.on( '--proxy', 'Enable HTTP proxy and redirects all HTTP requests to it, default to false.' ) do
-      ctx.options[:proxy] = true
+      ctx.options.proxy = true
     end
 
     opts.on( '--proxy-https', 'Enable HTTPS proxy and redirects all HTTPS requests to it, default to false.' ) do
-      ctx.options[:proxy] = true
-      ctx.options[:proxy_https] = true
+      ctx.options.proxy = true
+      ctx.options.proxy_https = true
     end
 
-    opts.on( '--proxy-port PORT', 'Set HTTP proxy port, default to ' + ctx.options[:proxy_port].to_s + ' .' ) do |v|
-      ctx.options[:proxy] = true
-      ctx.options[:proxy_port] = v.to_i
+    opts.on( '--proxy-port PORT', 'Set HTTP proxy port, default to ' + ctx.options.proxy_port.to_s + ' .' ) do |v|
+      ctx.options.proxy = true
+      ctx.options.proxy_port = v.to_i
     end
 
-    opts.on( '--proxy-https-port PORT', 'Set HTTPS proxy port, default to ' + ctx.options[:proxy_https_port].to_s + ' .' ) do |v|
-      ctx.options[:proxy] = true
-      ctx.options[:proxy_https] = true
-      ctx.options[:proxy_https_port] = v.to_i
+    opts.on( '--proxy-https-port PORT', 'Set HTTPS proxy port, default to ' + ctx.options.proxy_https_port.to_s + ' .' ) do |v|
+      ctx.options.proxy = true
+      ctx.options.proxy_https = true
+      ctx.options.proxy_https_port = v.to_i
     end
 
     opts.on( '--proxy-pem FILE', 'Use a custom PEM certificate file for the HTTPS proxy.' ) do |v|
-      ctx.options[:proxy] = true
-      ctx.options[:proxy_https] = true
-      ctx.options[:proxy_pem_file] = File.expand_path v
+      ctx.options.proxy = true
+      ctx.options.proxy_https = true
+      ctx.options.proxy_pem_file = File.expand_path v
     end
 
     opts.on( '--proxy-module MODULE', 'Ruby proxy module to load.' ) do |v|
-      ctx.options[:proxy] = true
-      ctx.options[:proxy_module] = File.expand_path v
+      ctx.options.proxy = true
+      ctx.options.proxy_module = File.expand_path v
     end
 
     opts.on( '--custom-proxy ADDRESS', 'Use a custom HTTP upstream proxy instead of the builtin one.' ) do |v|
-      ctx.options[:custom_proxy] = v
+      ctx.options.custom_proxy = v
     end
 
-    opts.on( '--custom-proxy-port PORT', 'Specify a port for the custom HTTP upstream proxy, default to ' + ctx.options[:custom_proxy_port].to_s + ' .' ) do |v|
-      ctx.options[:custom_proxy_port] = v.to_i
+    opts.on( '--custom-proxy-port PORT', 'Specify a port for the custom HTTP upstream proxy, default to ' + ctx.options.custom_proxy_port.to_s + ' .' ) do |v|
+      ctx.options.custom_proxy_port = v.to_i
     end
 
     opts.on( '--custom-https-proxy ADDRESS', 'Use a custom HTTPS upstream proxy instead of the builtin one.' ) do |v|
-      ctx.options[:custom_https_proxy] = v
+      ctx.options.custom_https_proxy = v
     end
 
-    opts.on( '--custom-https-proxy-port PORT', 'Specify a port for the custom HTTPS upstream proxy, default to ' + ctx.options[:custom_https_proxy_port].to_s + ' .' ) do |v|
-      ctx.options[:custom_https_proxy_port] = v.to_i
+    opts.on( '--custom-https-proxy-port PORT', 'Specify a port for the custom HTTPS upstream proxy, default to ' + ctx.options.custom_https_proxy_port.to_s + ' .' ) do |v|
+      ctx.options.custom_https_proxy_port = v.to_i
     end
 
     opts.on( '--httpd', 'Enable HTTP server, default to false.' ) do
-      ctx.options[:httpd] = true
+      ctx.options.httpd = true
     end
 
-    opts.on( '--httpd-port PORT', 'Set HTTP server port, default to ' + ctx.options[:httpd_port].to_s +  '.' ) do |v|
-      ctx.options[:httpd] = true
-      ctx.options[:httpd_port] = v.to_i
+    opts.on( '--httpd-port PORT', 'Set HTTP server port, default to ' + ctx.options.httpd_port.to_s +  '.' ) do |v|
+      ctx.options.httpd = true
+      ctx.options.httpd_port = v.to_i
     end
 
-    opts.on( '--httpd-path PATH', 'Set HTTP server path, default to ' + ctx.options[:httpd_path] +  '.' ) do |v|
-      ctx.options[:httpd] = true
-      ctx.options[:httpd_path] = v
+    opts.on( '--httpd-path PATH', 'Set HTTP server path, default to ' + ctx.options.httpd_path +  '.' ) do |v|
+      ctx.options.httpd = true
+      ctx.options.httpd_path = v
     end
 
     opts.on( '--check-updates', 'Will check if any update is available and then exit.' ) do
-      ctx.options[:check_updates] = true
+      ctx.options.check_updates = true
     end
 
     opts.on('-h', '--help', 'Display the available options.') do
       puts opts
-      puts "\nFor examples & instructions please visit " + "http://bettercap.org/features/".bold
+      puts "\nFor examples & docs please visit " + "http://bettercap.org/docs/".bold
       exit
     end
   end.parse!
 
-  if ctx.options[:check_updates]
+  if ctx.options.check_updates
     error_policy = lambda { |e|
       Logger.error("Could not check for udpates: #{e.message}")
     }
@@ -175,90 +175,53 @@ begin
   end
 
   raise BetterCap::Error, 'This software must run as root.' unless Process.uid == 0
-  raise BetterCap::Error, 'No default interface found, please specify one with the -I argument.' unless !ctx.options[:iface].nil?
+  raise BetterCap::Error, 'No default interface found, please specify one with the -I argument.' unless !ctx.options.iface.nil?
 
-  Logger.debug_enabled = true unless !ctx.options[:debug]
+  Logger.debug_enabled = true unless !ctx.options.debug
 
-  Logger.logfile = ctx.options[:logfile]
+  Logger.logfile = ctx.options.logfile
 
 
-  if !ctx.options[:gateway].nil?
-    raise BetterCap::Error, "Invalid gateway" if !Network.is_ip?(ctx.options[:gateway])
-    ctx.gateway = ctx.options[:gateway]
+  unless ctx.options.gateway.nil?
+    raise BetterCap::Error, "Invalid gateway" if !Network.is_ip?(ctx.options.gateway)
+    ctx.gateway = ctx.options.gateway
     Logger.info("Targetting manual gateway #{ctx.gateway}")
   end
-  
+
   ctx.update_network
 
-  if ctx.options[:target].nil?
-    Logger.info( "Targeting the whole subnet #{ctx.network.to_range} ..." ) unless \
-     ctx.options[:spoofer] == 'NONE' or ctx.options[:spoofer] == 'none'
+  if ctx.options.target.nil?
+    Logger.info( "Targeting the whole subnet #{ctx.network.to_range} ..." ) unless ctx.options.has_spoofer?
 
     ctx.start_discovery_thread
   else
-    targets = ctx.options[:target].split(",")
-    valid_targets = targets.select { |target| Network.is_ip?(target) }
-
-    raise BetterCap::Error, "Invalid target" if valid_targets.empty?
-
-    invalid_targets = targets - valid_targets
-    invalid_targets.each do |target|
-      Logger.warn "Invalid target #{target}"
-    end
-
-    ctx.targets = valid_targets.map { |target| Target.new(target) }
-  end
-
-  unless ctx.options[:ignore].nil?
-    ignore = ctx.options[:ignore].split(",")
-    valid = ignore.select { |target| Network.is_ip?(target) }
-
-    raise BetterCap::Error, "Invalid ignore addresses specified." if valid.empty?
-
-    invalid = ignore - valid
-    invalid.each do |target|
-      Logger.warn "Not a valid address: #{target}"
-    end
-
-    ctx.options[:ignore] = valid
-
-    Logger.warn "Ignoring #{valid.join(", ")} ."
+    ctx.targets = ctx.options.to_targets
   end
 
-  ctx.spoofer = []
-  spoofer_modules_names = ctx.options[:spoofer].split(",")
-  spoofer_modules_names.each do |module_name|
-    ctx.spoofer << SpooferFactory.get_by_name( module_name )
-    ctx.spoofer.last.start
+  ctx.spoofer = ctx.options.to_spoofers
+  ctx.spoofer.each do |spoofer|
+    spoofer.start
   end
 
-  if ctx.options[:proxy]
-    if ctx.options[:sniffer] and ( ctx.options[:parsers].include?'*' or ctx.options[:parsers].include?'URL' )
+  if ctx.options.proxy
+    if ctx.options.has_http_sniffer_enabled?
       Logger.warn "WARNING: Both HTTP transparent proxy and URL parser are enabled, you're gonna see duplicated logs."
     end
 
     ctx.create_proxies
   end
 
-  if ctx.options[:custom_proxy]
-    raise BetterCap::Error, 'Invalid custom HTTP upstream proxy address specified.' unless Network.is_ip? ctx.options[:custom_proxy]  
-  end
-
-  if ctx.options[:custom_https_proxy]
-    raise BetterCap::Error, 'Invalid custom HTTPS upstream proxy address specified.' unless Network.is_ip? ctx.options[:custom_https_proxy]  
-  end
-
   ctx.enable_port_redirection
-  
-  if ctx.options[:httpd]
-    ctx.httpd = HTTPD::Server.new( ctx.options[:httpd_port], ctx.options[:httpd_path] )
+
+  if ctx.options.httpd
+    ctx.httpd = HTTPD::Server.new( ctx.options.httpd_port, ctx.options.httpd_path )
     ctx.httpd.start
   end
 
-  if ctx.options[:sniffer]
+  if ctx.options.sniffer
     Sniffer.start ctx
   else
-    if ctx.options[:spoofer] != 'NONE' and ctx.options[:spoofer] != 'none'
+    unless ctx.options.has_spoofer?
       Logger.warn 'WARNING: Sniffer module was NOT enabled ( -X argument ), this will cause the MITM to run but no data to be collected.'
     end
 

data/lib/bettercap.rb

@@ -25,6 +25,7 @@ Object.send :remove_const, :Config rescue nil
 Config = RbConfig
 
 require 'bettercap/error'
+require 'bettercap/options'
 require 'bettercap/context'
 require 'bettercap/monkey/packetfu/utils'
 require 'bettercap/factories/firewall_factory'

data/lib/bettercap/context.rb

@@ -18,7 +18,7 @@ require 'json'
 
 class Context
   attr_accessor :options, :ifconfig, :network, :firewall, :gateway,
-                :targets, :spoofer, :proxy, :https_proxy, :httpd,
+                :targets, :spoofer, :httpd,
                 :certificate
 
   @@instance = nil
@@ -35,58 +35,18 @@ class Context
       Logger.debug e.message
     end
 
-    @options = {
-      gateway: nil,
-      iface: iface,
-      spoofer: 'ARP',
-      half_duplex: false,
-      target: nil,
-      logfile: nil,
-      debug: false,
-      arpcache: false,
-
-      ignore: nil,
-
-      sniffer: false,
-      sniffer_pcap: nil,
-      sniffer_filter: nil,
-      sniffer_src: nil,
-      parsers: ['*'],
-      local: false,
-
-      proxy: false,
-      proxy_https: false,
-      proxy_port: 8080,
-      proxy_https_port: 8083,
-      proxy_pem_file: nil,
-      proxy_module: nil,
-
-      custom_proxy: nil,
-      custom_proxy_port: 8080,
-
-      custom_https_proxy: nil,
-      custom_https_proxy_port: 8083,
-
-      httpd: false,
-      httpd_port: 8081,
-      httpd_path: './',
-
-      check_updates: false
-    }
-
-    @ifconfig        = nil
-    @network         = nil
-    @firewall        = nil
-    @gateway         = nil
-    @targets         = []
-    @proxy_processor = nil
-    @proxy           = nil
-    @https_proxy     = nil
-    @spoofer         = nil
-    @httpd           = nil
-    @certificate     = nil
-    @redirections    = []
-
+    @options           = Options.new iface
+    @ifconfig          = nil
+    @network           = nil
+    @firewall          = nil
+    @gateway           = nil
+    @targets           = []
+    @proxy_processor   = nil
+    @spoofer           = nil
+    @httpd             = nil
+    @certificate       = nil
+    @proxies           = []
+    @redirections      = []
     @discovery_running = false
     @discovery_thread  = nil
   end
@@ -122,25 +82,34 @@ class Context
 
   def update_network
     @firewall = FirewallFactory.get_firewall
-    @ifconfig = PacketFu::Utils.ifconfig @options[:iface]
+    @ifconfig = PacketFu::Utils.ifconfig @options.iface
     @network  = @ifconfig[:ip4_obj]
     @gateway  = Network.get_gateway if @gateway.nil?
 
-    raise BetterCap::Error, "Could not determine IPv4 address of '#{@options[:iface]}' interface." unless !@network.nil?
+    raise BetterCap::Error, "Could not determine IPv4 address of '#{@options.iface}' interface." unless !@network.nil?
 
     Logger.debug "network=#{@network} gateway=#{@gateway} local_ip=#{@ifconfig[:ip_saddr]}"
     Logger.debug "IFCONFIG: #{@ifconfig.inspect}"
   end
 
+  def find_target ip, mac
+    @targets.each do |target|
+      if target.ip == ip && ( mac.nil? || target.mac == mac )
+        return target
+      end
+    end
+    nil
+  end
+
   def start_discovery_thread
     @discovery_running = true
     @discovery_thread = Thread.new {
-      Logger.info( 'Network discovery thread started.' ) unless @options[:arpcache]
+      Logger.info( 'Network discovery thread started.' ) unless @options.arpcache
 
       while @discovery_running
         empty_list = false
 
-        if @targets.empty? and !@options[:arpcache]
+        if @targets.empty? and @options.should_discover_hosts?
           empty_list = true
           Logger.info 'Searching for alive targets ...'
         else
@@ -155,7 +124,7 @@ class Context
 
         @targets = Network.get_alive_targets self
 
-        if empty_list and !@options[:arpcache]
+        if empty_list and @options.should_discover_hosts?
           Logger.info "Collected #{@targets.size} total targets."
           @targets.each do |target|
             Logger.info "  #{target}"
@@ -169,7 +138,7 @@ class Context
     @discovery_running = false
 
     if @discovery_thread != nil
-      Logger.info( 'Stopping network discovery thread ...' ) unless @options[:arpcache]
+      Logger.info( 'Stopping network discovery thread ...' ) unless @options.arpcache
 
       begin
         @discovery_thread.exit
@@ -179,44 +148,11 @@ class Context
   end
 
   def enable_port_redirection
-    @redirections = []
-    
-    if @options[:proxy]
-      @redirections << Redirection.new( @options[:iface], 
-                                        'TCP',
-                                        80,
-                                        @ifconfig[:ip_saddr], 
-                                        @options[:proxy_port] )
-    end
-
-    if @options[:proxy_https]
-      @redirections << Redirection.new( @options[:iface], 
-                                        'TCP',
-                                        443,
-                                        @ifconfig[:ip_saddr], 
-                                        @options[:proxy_https_port] )
-    end
-
-    if @options[:custom_proxy]
-      @redirections << Redirection.new( @options[:iface], 
-                                        'TCP',
-                                        80,
-                                        @options[:custom_proxy], 
-                                        @options[:custom_proxy_port] )            
-    end
-
-    if @options[:custom_https_proxy]
-      @redirections << Redirection.new( @options[:iface], 
-                                        'TCP',
-                                        443,
-                                        @options[:custom_https_proxy], 
-                                        @options[:custom_https_proxy_port] )            
-    end
-
+    @redirections = @options.to_redirections @ifconfig
     @redirections.each do |r|
       Logger.warn "Redirecting #{r.protocol} traffic from port #{r.src_port} to #{r.dst_address}:#{r.dst_port}"
 
-      @firewall.add_port_redirection( r.interface, r.protocol, r.src_port, r.dst_address, r.dst_port )      
+      @firewall.add_port_redirection( r.interface, r.protocol, r.src_port, r.dst_address, r.dst_port )
     end
   end
 
@@ -224,19 +160,19 @@ class Context
     @redirections.each do |r|
       Logger.debug "Removing #{r.protocol} port redirect from port #{r.src_port} to #{r.dst_address}:#{r.dst_port}"
 
-      @firewall.del_port_redirection( r.interface, r.protocol, r.src_port, r.dst_address, r.dst_port )      
+      @firewall.del_port_redirection( r.interface, r.protocol, r.src_port, r.dst_address, r.dst_port )
     end
 
     @redirections = []
   end
 
   def create_proxies
-    if not @options[:proxy_module].nil?
-      require @options[:proxy_module]
+    if @options.has_proxy_module?
+      require @options.proxy_module
 
       Proxy::Module.register_modules
 
-      raise BetterCap::Error, "#{@options[:proxy_module]} is not a valid bettercap proxy module." unless !Proxy::Module.modules.empty?
+      raise BetterCap::Error, "#{@options.proxy_module} is not a valid bettercap proxy module." unless !Proxy::Module.modules.empty?
     end
 
     @proxy_processor = Proc.new do |request,response|
@@ -262,44 +198,42 @@ class Context
     end
 
     # create HTTP proxy
-    @proxy = Proxy::Proxy.new( @ifconfig[:ip_saddr], @options[:proxy_port], false, @proxy_processor )
-    @proxy.start
-
+    @proxies << Proxy::Proxy.new( @ifconfig[:ip_saddr], @options.proxy_port, false, @proxy_processor )
     # create HTTPS proxy
-    if @options[:proxy_https]
+    if @options.proxy_https
       # We're not acting as a normal HTTPS proxy, thus we're not
       # able to handle CONNECT requests, thus we don't know the
       # hostname the client is going to connect to.
       # We can only use a self signed certificate.
-      if @options[:proxy_pem_file].nil?
+      if @options.proxy_pem_file.nil?
         @certificate = Proxy::CertStore.get_selfsigned
       else
-        @certificate = Proxy::CertStore.from_file @options[:proxy_pem_file]
+        @certificate = Proxy::CertStore.from_file @options.proxy_pem_file
       end
 
-      @https_proxy = Proxy::Proxy.new( @ifconfig[:ip_saddr], @options[:proxy_https_port], true, @proxy_processor )
-      @https_proxy.start
+      @proxies << Proxy::Proxy.new( @ifconfig[:ip_saddr], @options.proxy_https_port, true, @proxy_processor )
+    end
+
+    @proxies.each do |proxy|
+      proxy.start
     end
   end
 
   def finalize
     stop_discovery_thread
 
-    if !@spoofer.nil? and @spoofer.length != 0 
+    if !@spoofer.nil? and @spoofer.length != 0
       @spoofer.each do |itr|
         itr.stop
       end
     end
 
-    if !@proxy.nil?
-      @proxy.stop
-      if !@https_proxy.nil?
-        @https_proxy.stop
-      end
+    @proxies.each do |proxy|
+      proxy.stop
     end
-    
+
     disable_port_redirection
-    
+
     if !@firewall.nil?
       @firewall.restore
     end