Land rapid7#7939, Override empty? for the weird ones

Author: jmartin-tech

lib/metasploit/framework/community_string_collection.rb

@@ -59,6 +59,10 @@ def each
         end
       end
 
+      def empty?
+        prepended_creds.empty? && !pass_file.present? && !password.present?
+      end
+
       # Add {Credential credentials} that will be yielded by {#each}
       #
       # @see prepended_creds

lib/metasploit/framework/credential_collection.rb

@@ -207,9 +207,15 @@ def each
 
   # Returns true when #each will have no results to iterate
   def empty?
-    hasUser = username.present? || user_file.present? || userpass_file.present? || !additional_publics.empty?
-    hasPass = password.present? || pass_file.present? || userpass_file.present? ||!additional_privates.empty? || blank_passwords
-    prepended_creds.empty? && !hasUser || (hasUser && !hasPass)
+    prepended_creds.empty? && !has_users? || (has_users? && !has_privates?)
+  end
+
+  def has_users?
+    username.present? || user_file.present? || userpass_file.present? || !additional_publics.empty?
+  end
+
+  def has_privates?
+    password.present? || pass_file.present? || userpass_file.present? || !additional_privates.empty? || blank_passwords
   end
 
   private

modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb

@@ -265,6 +265,11 @@ def initialize(opts={})
       valid!
     end
 
+    # Override CredentialCollection#has_privates?
+    def has_privates?
+      !@key_data.empty?
+    end
+
     def realm
       nil
     end