yawast 0.5.0.beta3 → 0.5.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4708466ef6ca5c2b60d7bc65c8d0b7e140f13ef
-  data.tar.gz: ce469cdfc381a00bae37220c150fbf1424f84bb2
+  metadata.gz: 400253733c35a69633bfa93c996cd7eb2fed21b5
+  data.tar.gz: 453abac414cc6af0f4efb1b952189a1457887e33
 SHA512:
-  metadata.gz: 2790493be0d96156111fe4dd65e86fd77492e2887861af9e255b0cf28103502270f3c9cdea85586b2a926fab8aa6ad5c96ce5905f84262ce308ecee45afcdda0
-  data.tar.gz: 8cad9004d6af28d5bc0851000e94c53eee474389f67f3eb5f58d251449fadd71e762af2ff593582ff2f5972ca2ba44fcc7635f6410d5b3841a6ade6b55d1a184
+  metadata.gz: 899b87c5677b6fbf4bcd6fde0d6249064a0844c11a4a53f7567da47cb08aec289dcdaa7ca525a544cced1249b7c7e584a4c0f632e716351a1c364d6489bc0626
+  data.tar.gz: 83b67f387e7364708c1b49f7f6c7d900466f6e438ae6b14ae5a223d57dcb737f6874dd9e16c1183cc60958a43fa20dbc6689b4549c75b23634c21d116c1f2b6a

data/CHANGELOG.md

@@ -7,7 +7,6 @@
 * [#86](https://github.com/adamcaudill/yawast/issues/86) - Add check for Tomcat Manager & common passwords
 * [#87](https://github.com/adamcaudill/yawast/issues/87) - Tomcat version detection via invalid HTTP verb
 * [#88](https://github.com/adamcaudill/yawast/issues/88) - Add IP Network Info via [api.iptoasn.com](https://api.iptoasn.com/)
-* [#89](https://github.com/adamcaudill/yawast/issues/89) - Add IP Location Info
 * [#90](https://github.com/adamcaudill/yawast/issues/90) - Add HSTS Preload check via [HSTSPreload.com](https://hstspreload.com/)
 * [#91](https://github.com/adamcaudill/yawast/issues/91) - Enhanced file search
 * [#96](https://github.com/adamcaudill/yawast/issues/96) - Scan for known SRV DNS Records
@@ -15,6 +14,7 @@
 * [#76](https://github.com/adamcaudill/yawast/issues/76) - Bug: Handle error for OpenSSL version support error
 * [#98](https://github.com/adamcaudill/yawast/issues/98) - Bug: SWEET32 Test Fails if 3DES Not Support By Latest Server Supported TLS Version
 * [#99](https://github.com/adamcaudill/yawast/issues/99) - Bug: Cloudflare SWEET32 False Positive
+* [#101](https://github.com/adamcaudill/yawast/issues/101) - Bug: SWEET32 False Negative
 * Various code and other improvements.
 
 ## 0.4.0 - 2016-11-03

data/lib/scanner/core.rb

@@ -120,7 +120,7 @@ module Yawast
         begin
           Yawast::Shared::Http.head(@uri)
         rescue => e
-          Yawast::Utilities.puts_error "Fatal Connection Error (#{e.class}: #{e.message})"
+          Yawast::Utilities.puts_error "Fatal Connection Error: Unable to complete HEAD request from '#{@uri}' (#{e.class}: #{e.message})"
           exit 1
         end
       end

data/lib/scanner/plugins/dns/generic.rb

@@ -27,7 +27,6 @@ module Yawast
                     else
                       #show network info
                       Yawast::Utilities.puts_info "\t\t\t#{get_network_info(ip.address)}"
-                      get_network_location_info ip
 
                       puts "\t\t\thttps://www.shodan.io/host/#{ip.address}"
                       puts "\t\t\thttps://censys.io/ipv4/#{ip.address}"
@@ -52,7 +51,6 @@ module Yawast
                     else
                       #show network info
                       Yawast::Utilities.puts_info "\t\t\t#{get_network_info(ip.address)}"
-                      get_network_location_info ip
 
                       puts "\t\t\thttps://www.shodan.io/host/#{ip.address.to_s.downcase}"
                     end
@@ -164,6 +162,11 @@ module Yawast
             @netinfo = Hash.new if @netinfo == nil
             return @netinfo[ip] if @netinfo[ip] != nil
 
+            #check to see if this has failed, if so, skip it. We do this to avoid repeated timeouts if outbound
+            #connections are blocked.
+            @netinfo_failed = false if @netinfo_failed == nil
+            return 'Network Information disabled due to prior failure' if @netinfo_failed
+
             begin
               network_info = JSON.parse(Net::HTTP.get(URI("https://api.iptoasn.com/v1/as/ip/#{ip}")))
 
@@ -172,22 +175,10 @@ module Yawast
 
               return ret
             rescue => e
+              @netinfo_failed = true
               return "Error: getting network information failed (#{e.message})"
             end
           end
-
-          def self.get_network_location_info(ip)
-            begin
-              info = JSON.parse(Net::HTTP.get(URI("https://freegeoip.net/json/#{ip.address}")))
-              location = [info['city'], info['region_name'], info['country_code']].reject { |c| c.empty? }.join(', ')
-
-              if location != nil && !location.empty?
-                Yawast::Utilities.puts_info "\t\t\t#{location}"
-              end
-            rescue => e
-              Yawast::Utilities.puts_error "Error getting location information: #{e.message}"
-            end
-          end
         end
       end
     end

data/lib/scanner/plugins/ssl/sweet32.rb

@@ -48,11 +48,13 @@ module Yawast
               end
 
               req.start do |http|
+                #cache the number of hits
+                hits = http.instance_variable_get(:@ssl_context).session_cache_stats[:cache_hits]
                 10000.times do |i|
                   http.head(uri.path, headers)
 
                   # hack to detect transparent disconnects
-                  if http.instance_variable_get(:@ssl_context).session_cache_stats[:cache_hits] != 0
+                  if http.instance_variable_get(:@ssl_context).session_cache_stats[:cache_hits] != hits
                     raise 'TLS Reconnected'
                   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Yawast
-  VERSION = '0.5.0.beta3'
+  VERSION = '0.5.0.beta4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yawast
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta3
+  version: 0.5.0.beta4
 platform: ruby
 authors:
 - Adam Caudill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ssllabs