fix up specs

a whole bunch of spec changes needed for
these changes.

alos the axis2 spec was actually testing the winrm
class due to copypasta error.

Author: David Maloney

lib/metasploit/framework/login_scanner/axis2.rb

@@ -20,6 +20,9 @@ def attempt_login(credential)
             host, port, {}, ssl, ssl_version
           )
 
+          result_opts = {
+              credential: credential
+          }
           begin
             http_client.connect
             body = "userName=#{Rex::Text.uri_encode(credential.public)}&password=#{Rex::Text.uri_encode(credential.private)}&submit=+Login+"
@@ -29,13 +32,18 @@ def attempt_login(credential)
               'data' => body,
             )
             response = http_client.send_recv(request)
-          end
 
-          if response && response.code == 200 && response.body.include?("upload")
-            Result.new(status: :success, credential: credential, proof: response)
-          else
-            Result.new(status: :failed, credential: credential, proof: response)
+            if response && response.code == 200 && response.body.include?("upload")
+              result_opts.merge!(status: :success, proof: response)
+            else
+              result_opts.merge!(status: :failed, proof: response)
+            end
+          rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
+            result_opts.merge!(status: :connection_error)
           end
+
+          Result.new(result_opts)
+
         end
 
         # (see Base#set_sane_defaults)

lib/metasploit/framework/login_scanner/base.rb

@@ -137,13 +137,13 @@ def scan!
 
                 if result.success?
                   consecutive_error_count = 0
-                  break if stop_on_success
+                  return nil if stop_on_success
                 else
                   if result.status == :connection_error
                     consecutive_error_count += 1
                     total_error_count += 1
-                    break if consecutive_error_count >= 3
-                    break if total_error_count >= 10
+                    return nil if consecutive_error_count >= 3
+                    return nil if total_error_count >= 10
                   end
                 end
               end

spec/lib/metasploit/framework/login_scanner/afp_spec.rb

@@ -6,7 +6,7 @@
 
   subject(:scanner) { described_class.new }
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
 
   it { should respond_to :login_timeout }

spec/lib/metasploit/framework/login_scanner/axis2_spec.rb

@@ -1,10 +1,10 @@
 
 require 'spec_helper'
-require 'metasploit/framework/login_scanner/winrm'
+require 'metasploit/framework/login_scanner/axis2'
 
-describe Metasploit::Framework::LoginScanner::WinRM do
+describe Metasploit::Framework::LoginScanner::Axis2 do
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
   it_behaves_like 'Metasploit::Framework::LoginScanner::HTTP'
 

spec/lib/metasploit/framework/login_scanner/db2_spec.rb

@@ -9,7 +9,7 @@
   }
   subject(:login_scanner) { described_class.new }
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', true
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
 
   context '#attempt_login' do

spec/lib/metasploit/framework/login_scanner/ftp_spec.rb

@@ -45,7 +45,7 @@
     described_class.new
   }
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
 
 

spec/lib/metasploit/framework/login_scanner/http_spec.rb

@@ -4,7 +4,7 @@
 
 describe Metasploit::Framework::LoginScanner::HTTP do
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
   it_behaves_like 'Metasploit::Framework::LoginScanner::HTTP'
 

spec/lib/metasploit/framework/login_scanner/mssql_spec.rb

@@ -32,7 +32,7 @@
 
   subject(:login_scanner) { described_class.new }
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', true
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
   it_behaves_like 'Metasploit::Framework::LoginScanner::NTLM'
 

spec/lib/metasploit/framework/login_scanner/mysql_spec.rb

@@ -30,7 +30,7 @@
 
   subject(:login_scanner) { described_class.new }
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
 
   context '#attempt_login' do

spec/lib/metasploit/framework/login_scanner/pop3_spec.rb

@@ -4,7 +4,7 @@
 describe Metasploit::Framework::LoginScanner::POP3 do
   subject(:scanner) { described_class.new }
 
-  it_behaves_like 'Metasploit::Framework::LoginScanner::Base'
+  it_behaves_like 'Metasploit::Framework::LoginScanner::Base', false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'
 
   context "#attempt_login" do