Land rapid7#7900, missed userpass_file on CredentialCollection.empty?

Author: wchen-r7

lib/metasploit/framework/credential_collection.rb

@@ -207,8 +207,8 @@ def each
 
   # Returns true when #each will have no results to iterate
   def empty?
-    hasUser = username.present? || user_file.present? || !additional_publics.empty?
-    hasPass = password.present? || pass_file.present? || !additional_privates.empty? || blank_passwords
+    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)
   end
 

spec/lib/metasploit/framework/credential_collection_spec.rb

@@ -141,6 +141,15 @@
   end
 
   describe "#empty?" do
+    context "when only :userpass_file is set" do
+      let(:username) { nil }
+      let(:password) { nil }
+      let(:userpass_file) { "test_file" }
+      specify do
+        expect(collection.empty?).to eq false
+      end
+    end
+
     context "when :username is set" do
       context "and :password is set" do
         specify do