Land rapid7#3529 - Handle Rex::AddressInUse exception

Author: wchen-r7

lib/rex/post/meterpreter/ui/console.rb

@@ -106,6 +106,8 @@ def run_command(dispatcher, method, arguments)
       log_error("Operation timed out.")
     rescue RequestError => info
       log_error(info.to_s)
+    rescue Rex::AddressInUse => e
+      log_error(e.message)
     rescue ::Errno::EPIPE, ::OpenSSL::SSL::SSLError, ::IOError
       self.client.kill
     rescue  ::Exception => e

spec/lib/rex/post/meterpreter/ui/console.rb

@@ -0,0 +1,27 @@
+# -*- coding:binary -*-
+require 'spec_helper'
+
+require 'rex/post/meterpreter/ui/console'
+
+describe Rex::Post::Meterpreter::Ui::Console do
+
+  subject(:console) do
+    Rex::Post::Meterpreter::Ui::Console.new(nil)
+  end
+
+  describe "#run_command" do
+    let(:dispatcher) do
+      double
+    end
+
+    it "logs error when Rex::AddressInUse is raised" do
+      allow(dispatcher).to receive(:cmd_address_in_use) do
+        raise Rex::AddressInUse, "0.0.0.0:80"
+      end
+
+      expect(subject).to receive(:log_error).with("The address is already in use (0.0.0.0:80).")
+      subject.run_command(dispatcher, "address_in_use", nil)
+    end
+  end
+
+end