bettercap 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee074bcf0415b99ad835ac61a8a72e94237ac34
-  data.tar.gz: c600e478177e4019e6745e7951c24ec0dc9b4778
+  metadata.gz: 448814ea9165cb85842e789e96fa88f80a0a7215
+  data.tar.gz: 11bb1d92babeea5b728c99acbe57a00a5bd3e2fb
 SHA512:
-  metadata.gz: bc7511b21557af365f5a3df0d9c6711387035fbc9964804791bd18b22f65ea33455c88d197c9fd8ad20592a30aada450f3f61dfa680458bfa85f6a852dada595
-  data.tar.gz: a314b465b7c55533559679e43eb4ce6ab5a20387001434e3e7c1a7909df55a2fd76cde2242c150902fe4b35488eb2108979fb8e3506b091c548ee3bde509cb29
+  metadata.gz: b265f32b2d0f9873fd349084e348f6cc869addf8a11f78197e831ef8c79186d6a64adb52a720c4b6367c7b03bacc57ab13fca653b05f8a2e7ac09cca47f7b58e
+  data.tar.gz: fbf10090bf70ab35efdf586a22e95d88e6cf5027ed1f7a6be3be776d0fc6f65b0a0966f68dc9afecedb5c3182917dc3b9fdb0c72f07ccf708f9dda7750b4914c

data/bin/bettercap

@@ -57,8 +57,15 @@ rescue Exception => e
   BetterCap::Logger.error "Backtrace         :\n\n    #{e.backtrace.join("\n    ")}\n"
 
 ensure
+  # handle double ctrl+c nicely
+  trap("INT") { }
+
   # Make sure all the messages on the logger queue are printed.
-  BetterCap::Logger.wait!
+  begin
+    BetterCap::Logger.wait!
+  rescue; end
 
-  ctx.finalize unless ctx.nil?
+  begin
+    ctx.finalize unless ctx.nil?
+  rescue; end
 end

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

@@ -58,6 +58,9 @@ 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" )
+
     key = Digest::SHA256.hexdigest( "#{hostname}_#{port}" )
 
     @lock.synchronize {

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

@@ -287,7 +287,8 @@ class Strip
           if link[0].end_with?('\\')
             link[0][-1] = '/'
           end
-          links << StrippedObject.process( link[0] )
+          normalized, stripped = StrippedObject.process( link[0] )
+          links << [ link[0], stripped ]
         end
       end
     # handle errors due to binary content

data/lib/bettercap/spoofers/base.rb

@@ -122,7 +122,7 @@ private
       if target.mac.nil?
         hw = Network.get_hw_address( @ctx, target.ip )
         if hw.nil?
-          Logger.warn "Couldn't determine target #{target.ip} MAC address!"
+          Logger.debug "Couldn't determine target #{target.ip} MAC address!"
           next
         else
           target.mac = hw
@@ -132,7 +132,7 @@ private
       elsif target.ip_refresh
         ip = Network.get_ip_address( @ctx, target.mac )
         if ip.nil?
-          Logger.warn "Couldn't determine target #{target.mac} IP address!"
+          Logger.debug "Couldn't determine target #{target.mac} IP address!"
           next
         else
           doprint = ( target.ip.nil? or target.ip != ip )

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.6'
+  VERSION = '1.5.7'
   # 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.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize