Merge branch 'wchen-r7-pr5112_update' into aux-scanner-nessus

Author: root

lib/metasploit/framework/login_scanner/nessus.rb

@@ -34,9 +34,6 @@ def check_setup
         #   * :status [Metasploit::Model::Login::Status]
         #   * :proof [String] the HTTP response body
         def get_login_state(username, password)
-          # Prep the data needed for login
-          #protocol  = ssl ? 'https' : 'http'
-          #peer      = "#{host}:#{port}"
           login_uri = "#{uri}"
 
           res = send_request({
@@ -83,6 +80,13 @@ def attempt_login(credential)
           Result.new(result_opts)
         end
 
+        def set_sane_defaults
+          super
+          # nessus_rest_login has the same default in TARGETURI, but rspec doesn't check nessus_rest_login
+          # so we have to set the default here, too.
+          self.uri = '/session'
+        end
+
       end
     end
   end

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

@@ -21,7 +21,9 @@
     end
 
     let(:successful_auth_response) do
-      Rex::Proto::Http::Response.new(200, 'OK')
+      res = Rex::Proto::Http::Response.new(200, 'OK')
+      res.body = 'token'
+      res
     end
 
     let(:fail_auth_response) do
@@ -63,11 +65,19 @@
 
     describe '#get_login_state' do
       it 'sends a login request to /session' do
-        expect(http_scanner).to receive(:send_request).with(hash_including('uri'=>'/session'))
+        allow(http_scanner).to receive(:send_request).with(hash_including('uri'=>'/session')).and_return(response)
+        http_scanner.get_login_state(username, good_password)
       end
 
       it 'sends a login request containing the username and password' do
-        expect(http_scanner).to receive(:send_request).with(hash_including('data'=>"username=#{username}&password=#{password}"))
+        expected_hash = {
+          'vars_post' => {
+            "username" => username,
+            "password" => good_password
+          }
+        }
+        allow(http_scanner).to receive(:send_request).with(hash_including(expected_hash)).and_return(response)
+        http_scanner.get_login_state(username, good_password)
       end
 
       context 'when the credential is valid' do