yawast 0.6.0.beta5 → 0.6.0.beta6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.4
+ruby-2.4.1

data/CHANGELOG.md

@@ -11,6 +11,7 @@
 * [#120](https://github.com/adamcaudill/yawast/issues/120) - Add Docker support
 * [#122](https://github.com/adamcaudill/yawast/issues/122) - SSL Labs API v3
 * [#125](https://github.com/adamcaudill/yawast/issues/125) - Add new search paths for Struts Sample Files
+* [#129](https://github.com/adamcaudill/yawast/issues/129) - Bug: DNS Info fails if MX record points to a domain without records
 
 ## 0.5.2 - 2017-07-13
 

data/bin/yawast

@@ -56,6 +56,7 @@ command :ssl do |c|
   c.option '--nociphers', 'Disables check for supported ciphers (only with --internalssl)'
   c.option '--internalssl', 'Disable SSL Labs integration'
   c.option '--tdessessioncount', 'Counts the number of messages that can be sent in a single session'
+  c.option '--nodns', 'Disable DNS checks'
 
   c.action do |args, options|
     Yawast::Commands::Ssl.process(args, options)

data/lib/commands/dns.rb

@@ -6,7 +6,7 @@ module Yawast
 
         Yawast.header
 
-        puts "Scanning: #{@uri}"
+        puts "Scanning: #{uri}"
         puts
 
         Yawast::Scanner::Plugins::DNS::Generic.dns_info uri, options

data/lib/resources/common_file.txt

@@ -13987,6 +13987,7 @@ wp-email.php
 wp-fbuser.php
 wp-feed.php
 wp-forum.phps
+wp-includes/js/swfupload/swfupload.swf
 wp-includes/js/tinymce/plugins/wpview/diff.php
 wp-json
 wp-json/wp/v2/posts

data/lib/scanner/core.rb

@@ -14,13 +14,13 @@ module Yawast
 
           print_header
 
-          ssl_redirect = check_for_ssl_redirect
+          ssl_redirect = Yawast::Scanner::Plugins::SSL::SSL.check_for_ssl_redirect @uri
           if ssl_redirect
             @uri = ssl_redirect
             puts "Server redirects to TLS: Scanning: #{@uri}"
           end
 
-          Yawast.set_openssl_options
+          Yawast::Scanner::Plugins::SSL::SSL.set_openssl_options
 
           unless options.nodns
             Yawast::Scanner::Plugins::DNS::Generic.dns_info @uri, options
@@ -50,7 +50,7 @@ module Yawast
           #process the 'scan' stuff that goes beyond 'head'
           unless options.head
             # connection details for SSL
-            Yawast::Scanner::Generic.ssl_connection_info @uri
+            Yawast::Scanner::Plugins::SSL::SSL.ssl_connection_info @uri
 
             # server specific checks
             Yawast::Scanner::Plugins::Servers::Apache.check_all(@uri)
@@ -88,28 +88,6 @@ module Yawast
         Yawast::Scanner::Cms.get_generator(body)
       end
 
-      def self.check_for_ssl_redirect
-        #check to see if the site redirects to SSL by default
-        if @uri.scheme != 'https'
-          head = Yawast::Shared::Http.head(@uri)
-
-          if head['Location'] != nil
-            begin
-              location = URI.parse(head['Location'])
-
-              if location.scheme == 'https'
-                #we run this through extract_uri as it performs a few checks we need
-                return Yawast::Shared::Uri.extract_uri location.to_s
-              end
-            rescue
-              #we don't care if this fails
-            end
-          end
-        end
-
-        return nil
-      end
-
       def self.check_ssl(uri, options, head)
         setup(uri, options)
 

data/lib/scanner/generic.rb

@@ -205,31 +205,6 @@ module Yawast
           end
         end
       end
-
-      def self.ssl_connection_info(uri)
-        begin
-          # we only care if this is https
-          if uri.scheme == 'https'
-            # setup the connection
-            socket = TCPSocket.new(uri.host, uri.port)
-
-            ctx = OpenSSL::SSL::SSLContext.new
-            ctx.ciphers = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers]
-
-            ssl = OpenSSL::SSL::SSLSocket.new(socket, ctx)
-            ssl.hostname = uri.host
-            ssl.connect
-
-            # this provides a bunch of useful info, that's already formatted
-            #  instead of building this manually, we'll let OpenSSL do the work
-            puts ssl.session.to_text
-
-            puts
-          end
-        rescue => e
-          Yawast::Utilities.puts_error "SSL Information: Error Getting Details: #{e.message}"
-        end
-      end
     end
 
     #Custom class to allow using the PROPFIND verb

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

@@ -77,9 +77,13 @@ module Yawast
                 mx = resv.getresources(uri.host, Resolv::DNS::Resource::IN::MX)
                 unless mx.empty?
                   mx.each do |rec|
-                    ip = resv.getaddress rec.exchange
+                    begin
+                      ip = resv.getaddress rec.exchange
 
-                    Yawast::Utilities.puts_info "\t\tMX: #{rec.exchange} (#{rec.preference}) - #{ip} (#{get_network_info(ip.to_s)})"
+                      Yawast::Utilities.puts_info "\t\tMX: #{rec.exchange} (#{rec.preference}) - #{ip} (#{get_network_info(ip.to_s)})"
+                    rescue => e
+                      Yawast::Utilities.puts_error "\t\tMX: #{rec.exchange} (#{rec.preference}) - Error: #{e.message})"
+                    end
                   end
                 end
 
@@ -88,9 +92,13 @@ module Yawast
                   mx = resv.getresources(root_domain, Resolv::DNS::Resource::IN::MX)
                   unless mx.empty?
                     mx.each do |rec|
-                      ip = resv.getaddress rec.exchange
+                      begin
+                        ip = resv.getaddress rec.exchange
 
-                      Yawast::Utilities.puts_info "\t\tMX (#{root_domain}): #{rec.exchange} (#{rec.preference}) - #{ip} (#{get_network_info(ip.to_s)})"
+                        Yawast::Utilities.puts_info "\t\tMX (#{root_domain}): #{rec.exchange} (#{rec.preference}) - #{ip} (#{get_network_info(ip.to_s)})"
+                      rescue => e
+                        Yawast::Utilities.puts_error "\t\tMX (#{root_domain}): #{rec.exchange} (#{rec.preference}) - Error: #{e.message})"
+                      end
                     end
                   end
                 end
@@ -113,8 +121,10 @@ module Yawast
                 end
               end
 
-              #get the CAA info
-              Yawast::Scanner::Plugins::DNS::CAA.caa_info uri
+              #get the CAA info - unless it's an IP
+              unless IPAddress.valid? uri.host
+                Yawast::Scanner::Plugins::DNS::CAA.caa_info uri
+              end
 
               puts
             rescue => e

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

@@ -48,6 +48,61 @@ module Yawast
               Yawast::Utilities.puts_error "Error getting HSTS preload information: #{e.message}"
             end
           end
+
+          def self.set_openssl_options
+            #change certain defaults, to make things work better
+            #we prefer RSA, to avoid issues with small DH keys
+            OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers] = 'RSA:ALL:COMPLEMENTOFALL'
+            OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+            OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_ALL
+          end
+
+          def self.check_for_ssl_redirect(uri)
+            #check to see if the site redirects to SSL by default
+            if uri.scheme != 'https'
+              head = Yawast::Shared::Http.head(uri)
+
+              if head['Location'] != nil
+                begin
+                  location = URI.parse(head['Location'])
+
+                  if location.scheme == 'https'
+                    #we run this through extract_uri as it performs a few checks we need
+                    return Yawast::Shared::Uri.extract_uri location.to_s
+                  end
+                rescue
+                  #we don't care if this fails
+                end
+              end
+            end
+
+            return nil
+          end
+
+          def self.ssl_connection_info(uri)
+            begin
+              # we only care if this is https
+              if uri.scheme == 'https'
+                # setup the connection
+                socket = TCPSocket.new(uri.host, uri.port)
+
+                ctx = OpenSSL::SSL::SSLContext.new
+                ctx.ciphers = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers]
+
+                ssl = OpenSSL::SSL::SSLSocket.new(socket, ctx)
+                ssl.hostname = uri.host
+                ssl.connect
+
+                # this provides a bunch of useful info, that's already formatted
+                #  instead of building this manually, we'll let OpenSSL do the work
+                puts ssl.session.to_text
+
+                puts
+              end
+            rescue => e
+              Yawast::Utilities.puts_error "SSL Information: Error Getting Details: #{e.message}"
+            end
+          end
         end
       end
     end

data/lib/scanner/ssl_labs.rb

@@ -5,7 +5,6 @@ require 'json'
 
 module Yawast
   module Scanner
-    # noinspection RubyResolve
     class SslLabs
       def self.info(uri, tdes_session_count)
         puts 'Beginning SSL Labs scan (this could take a minute or two)'
@@ -227,16 +226,51 @@ module Yawast
         ep['details']['certChains'].each do |chain|
           path_count = 0
 
+          # build list of trust paths
+          trust_paths = Hash.new
           chain['trustPaths'].each do |path|
+            trusts = nil
+            # in practice, it seems there is only only per path, but just in case
+            path['trust'].each do |trust|
+              if trust['isTrusted']
+                trust_line = "#{trust['rootStore']} (trusted)"
+              else
+                trust_line = "#{trust['rootStore']} (#{trust['trustErrorMessage']})"
+              end
+
+              if trusts == nil
+                trusts = trust_line
+              else
+                trusts += " #{trust_line}"
+              end
+            end
+
+            # build the hash and add the list of roots
+            if trust_paths.has_key? path['certIds']
+              trust_paths[path['certIds']] += " #{trusts}"
+            else
+              trust_paths[path['certIds']] = trusts
+            end
+          end
+
+          # process each of the trust paths
+          trust_paths.each_key do |key|
             path_count += 1
             puts "\t\t  Path #{path_count}:"
+            puts "\t\t   Root Stores: #{trust_paths[key]}"
 
-            path['certIds'].each do |path_cert|
+            key.each do |path_cert|
               body['certs'].each do |c|
                 if c['id'] == path_cert
                   Yawast::Utilities.puts_info "\t\t\t#{c['subject']}"
                   Yawast::Utilities.puts_info "\t\t\t  Signature: #{c['sigAlg']}  Key: #{c['keyAlg']}-#{c['keySize']}"
                   Yawast::Utilities.puts_info "\t\t\t  https://crt.sh/?q=#{c['sha1Hash']}"
+
+                  if chain['certIds'].find_index(c['sha256Hash']) != nil
+                    Yawast::Utilities.puts_info "\t\t\t  (provided by server)"
+                  end
+
+                  puts
                 end
               end
             end
@@ -420,9 +454,10 @@ module Yawast
           when 2
             Yawast::Utilities.puts_vuln "\t\t\tTicketbleed (CVE-2016-9244): Vulnerable"
           else
-            Yawast::Utilities.puts_error "\t\t\tOpenSSL CCS (CVE-2014-0224): Unknown Response #{ep['details']['ticketbleed']}"
+            Yawast::Utilities.puts_error "\t\t\tTicketbleed (CVE-2016-9244): Unknown Response #{ep['details']['ticketbleed']}"
         end
 
+
         case ep['details']['openSslCcs']
           when -1
             Yawast::Utilities.puts_error "\t\t\tOpenSSL CCS (CVE-2014-0224): Test Failed"
@@ -451,6 +486,23 @@ module Yawast
             Yawast::Utilities.puts_error "\t\t\tOpenSSL Padding Oracle (CVE-2016-2107): Unknown Response #{ep['details']['openSSLLuckyMinus20']}"
         end
 
+        case ep['details']['bleichenbacher']
+          when -1
+            Yawast::Utilities.puts_error "\t\t\tROBOT: Test Failed"
+          when 0
+            Yawast::Utilities.puts_error "\t\t\tROBOT: Test Failed (Unknown)"
+          when 1
+            Yawast::Utilities.puts_info "\t\t\tROBOT: No"
+          when 2
+            Yawast::Utilities.puts_warn "\t\t\tROBOT: Not Exploitable"
+          when 3
+            Yawast::Utilities.puts_vuln "\t\t\tROBOT: Exploitable"
+          when nil
+            # if it's null, we don't care
+          else
+            Yawast::Utilities.puts_error "\t\t\tROBOT: Unknown Response #{ep['details']['bleichenbacher']}"
+        end
+
         if ep['details']['forwardSecrecy'] & (1<<2) != 0
           Yawast::Utilities.puts_info "\t\t\tForward Secrecy: Yes (all simulated clients)"
         elsif ep['details']['forwardSecrecy'] & (1<<1) != 0

data/lib/shared/http.rb

@@ -5,7 +5,7 @@ module Yawast
   module Shared
     class Http
       def self.setup(proxy, cookie)
-        if proxy != nil && proxy.include?(':')
+        if !proxy.nil? && proxy.include?(':')
           @proxy_host, @proxy_port = proxy.split(':')
           @proxy = true
 
@@ -15,7 +15,7 @@ module Yawast
         end
 
         @cookie = cookie
-        puts "Using Cookie: #{@cookie}" if @cookie != nil
+        puts "Using Cookie: #{@cookie}" unless @cookie.nil?
       end
 
       def self.head(uri)
@@ -24,8 +24,8 @@ module Yawast
           req.use_ssl = uri.scheme == 'https'
           req.head(uri, get_headers)
         rescue
-          #if we get here, the HEAD failed - but GET may work
-          #so we silently fail back to using GET instead
+          # if we get here, the HEAD failed - but GET may work
+          # so we silently fail back to using GET instead
           req = get_http(uri)
           req.use_ssl = uri.scheme == 'https'
           res = req.request_get(uri, get_headers)
@@ -42,7 +42,7 @@ module Yawast
           res = req.request_get(uri, get_headers(headers))
           body = res.read_body
         rescue
-          #do nothing for now
+          # do nothing for now
         end
 
         body
@@ -54,10 +54,10 @@ module Yawast
         begin
           req = get_http(uri)
           req.use_ssl = uri.scheme == 'https'
-          res = req.request_get(uri, { 'User-Agent' => "YAWAST/#{Yawast::VERSION}" })
+          res = req.request_get(uri, 'User-Agent' => "YAWAST/#{Yawast::VERSION}")
           body = res.read_body
         rescue
-          #do nothing for now
+          # do nothing for now
         end
 
         JSON.parse body
@@ -69,7 +69,7 @@ module Yawast
           req.use_ssl = uri.scheme == 'https'
           res = req.request_put(uri, body, get_headers(headers))
         rescue
-          #do nothing for now
+          # do nothing for now
         end
 
         res.read_body
@@ -102,7 +102,7 @@ module Yawast
         end
 
         if Yawast::Shared::Http.get_status_code(fake_uri) != '404'
-          #crazy 404 handling
+          # crazy 404 handling
           return false
         end
 
@@ -117,9 +117,7 @@ module Yawast
           headers = { 'User-Agent' => HTTP_UA, 'Cookie' => @cookie }
         end
 
-        if extra_headers != nil
-          headers.merge! extra_headers
-        end
+        headers.merge! extra_headers unless extra_headers.nil?
 
         headers
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Yawast
-  VERSION = '0.6.0.beta5'
+  VERSION = '0.6.0.beta6'
 end

data/lib/yawast.rb

@@ -53,14 +53,6 @@ module Yawast
     puts ''
   end
 
-  def self.set_openssl_options
-    #change certain defaults, to make things work better
-    #we prefer RSA, to avoid issues with small DH keys
-    OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers] = 'RSA:ALL:COMPLEMENTOFALL'
-    OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
-    OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_ALL
-  end
-
   STDOUT.sync = true
 
   trap 'SIGINT' do