Land rapid7#7565

h00die · h00die · commit cd01b0768279 · 2016-11-18T13:29:39.000-05:00
Lands print_bad and vprint_bad from todb-r7
diff --git a/lib/metasploit/framework/login_scanner/telnet.rb b/lib/metasploit/framework/login_scanner/telnet.rb
@@ -133,6 +133,8 @@ def print_error(message)
           @parent.print_error(message)
         end
 
+        alias_method :print_bad, :print_error
+
       end
     end
   end
diff --git a/lib/msf/core/auxiliary/auth_brute.rb b/lib/msf/core/auxiliary/auth_brute.rb
@@ -667,6 +667,8 @@ def vprint_error(msg='')
     print_brute :level => :verror, :legacy_msg => msg
   end
 
+  alias_method :vprint_bad, :vprint_error
+
   # Legacy vprint
   def vprint_good(msg='')
     print_brute :level => :vgood, :legacy_msg => msg
diff --git a/lib/msf/core/auxiliary/web/http.rb b/lib/msf/core/auxiliary/web/http.rb
@@ -326,5 +326,7 @@ def print_error( message )
     @parent.print_error message
   end
 
+  alias_method :print_bad, :print_error
+
 end
 end
diff --git a/lib/msf/core/module/ui/message.rb b/lib/msf/core/module/ui/message.rb
@@ -8,6 +8,8 @@ def print_error(msg='')
     super(print_prefix + msg)
   end
 
+  alias_method :print_bad, :print_error
+
   def print_good(msg='')
     super(print_prefix + msg)
   end
diff --git a/lib/msf/core/module/ui/message/verbose.rb b/lib/msf/core/module/ui/message/verbose.rb
@@ -4,6 +4,8 @@ def vprint_error(msg='')
     print_error(msg) if datastore['VERBOSE'] || (!framework.nil? && framework.datastore['VERBOSE'])
   end
 
+  alias_method :vprint_bad, :vprint_error
+
   # Verbose version of #print_good
   def vprint_good(msg='')
     print_good(msg) if datastore['VERBOSE'] || (!framework.nil? && framework.datastore['VERBOSE'])
diff --git a/lib/msf/core/payload/apk.rb b/lib/msf/core/payload/apk.rb
@@ -19,6 +19,8 @@ def print_error(msg='')
     $stderr.puts "[-] #{msg}"
   end
 
+  alias_method :print_bad, :print_error
+
   def usage
     print_error "Usage: #{$0} -x [target.apk] [msfvenom options]\n"
     print_error "e.g. #{$0} -x messenger.apk -p android/meterpreter/reverse_https LHOST=192.168.1.1 LPORT=8443\n"
diff --git a/lib/msf/core/plugin.rb b/lib/msf/core/plugin.rb
@@ -112,6 +112,8 @@ def print_error(msg='')
     output.print_error(msg) if (output)
   end
 
+  alias_method :print_bad, :print_error
+
   #
   # Prints a 'good' message.
   #
diff --git a/lib/rex/script/base.rb b/lib/rex/script/base.rb
@@ -9,6 +9,7 @@ def print_line(msg); end
     def print_status(msg); end
     def print_good(msg); end
     def print_error(msg); end
+    alias_method :print_bad, :print_error
     def print_warning(msg); end
   end
 
diff --git a/lib/rex/ui/output.rb b/lib/rex/ui/output.rb
@@ -24,6 +24,8 @@ class Output
   def print_error(msg='')
   end
 
+  alias_method :print_bad, :print_error
+
   #
   # Prints a 'good' message.
   #
diff --git a/lib/rex/ui/subscriber.rb b/lib/rex/ui/subscriber.rb
@@ -46,6 +46,8 @@ def print_error(msg='')
       end
     end
 
+    alias_method :print_bad, :print_error
+
     #
     # Wraps user_output.print_good
     #
diff --git a/lib/rex/ui/text/bidirectional_pipe.rb b/lib/rex/ui/text/bidirectional_pipe.rb
@@ -80,6 +80,8 @@ def print_error(msg='')
     print_line('[-] ' + msg)
   end
 
+  alias_method :print_bad, :print_error
+
   def print_line(msg='')
     print(msg + "\n")
   end
diff --git a/lib/rex/ui/text/dispatcher_shell.rb b/lib/rex/ui/text/dispatcher_shell.rb
@@ -61,6 +61,8 @@ def print_error(msg = '')
       shell.print_error(msg)
     end
 
+    alias_method :print_bad, :print_error
+
     #
     # Wraps shell.print_status
     #
diff --git a/lib/rex/ui/text/output.rb b/lib/rex/ui/text/output.rb
@@ -52,6 +52,8 @@ def print_error(msg = '')
     print_line("%bld%red[-]%clr #{msg}")
   end
 
+  alias_method :print_bad, :print_error
+
   def print_good(msg = '')
     print_line("%bld%grn[+]%clr #{msg}")
   end
diff --git a/lib/rex/ui/text/shell.rb b/lib/rex/ui/text/shell.rb
@@ -278,6 +278,8 @@ def print_error(msg='')
     log_output(output.print_error(msg))
   end
 
+  alias_method :print_bad, :print_error
+
   #
   # Prints a status message to the output handle.
   #
diff --git a/spec/lib/msf/core/post/windows/mssql_spec.rb b/spec/lib/msf/core/post/windows/mssql_spec.rb
@@ -7,7 +7,8 @@
   let(:subject) do
     mod = double(Module.new)
     mod.extend described_class
-    stubs = [ :vprint_status, :print_status, :vprint_good, :print_good, :print_error, :print_warning ]
+    stubs = [ :vprint_status, :print_status, :vprint_good, :print_good,
+      :print_error, :vprint_error, :print_bad, :vprint_bad, :print_warning ]
     stubs.each { |meth| allow(mod).to receive(meth) }
     allow(mod).to receive(:service_info).and_return({})
     mod
diff --git a/spec/lib/msf/core/post/windows/runas_spec.rb b/spec/lib/msf/core/post/windows/runas_spec.rb
@@ -36,7 +36,8 @@
   let(:subject) do
     mod = double(Module.new)
     mod.extend described_class
-    stubs = [ :vprint_status, :print_status, :vprint_good, :print_good, :print_error ]
+    stubs = [ :vprint_status, :print_status, :vprint_good, :print_good,
+      :print_error, :vprint_error, :print_bad, :vprint_bad ]
     stubs.each { |meth| allow(mod).to receive(meth) }
     allow(mod).to receive_message_chain("session.railgun.kernel32").and_return(kernel32)
     allow(mod).to receive_message_chain("session.railgun.advapi32").and_return(advapi32)
diff --git a/spec/support/shared/contexts/msf/ui_driver.rb b/spec/support/shared/contexts/msf/ui_driver.rb
@@ -17,6 +17,10 @@
         @error ||= []
         @error.concat string.split("\n")
       end
+      allow(driver).to receive(:print_bad).with(kind_of(String)) do |string|
+        @error ||= []
+        @error.concat string.split("\n")
+      end
     }
   end
 end
diff --git a/spec/support/shared/examples/msf/module/ui/message.rb b/spec/support/shared/examples/msf/module/ui/message.rb
@@ -2,8 +2,9 @@
   it_should_behave_like 'Msf::Module::UI::Message::Verbose'
 
   it { is_expected.to respond_to :print_error }
+  it { is_expected.to respond_to :print_bad }
   it { is_expected.to respond_to :print_good }
   it { is_expected.to respond_to :print_prefix }
   it { is_expected.to respond_to :print_status }
   it { is_expected.to respond_to :print_warning }
-end
+end
diff --git a/spec/support/shared/examples/msf/module/ui/message/verbose.rb b/spec/support/shared/examples/msf/module/ui/message/verbose.rb
@@ -1,6 +1,7 @@
 RSpec.shared_examples_for 'Msf::Module::UI::Message::Verbose' do
   it { is_expected.to respond_to :vprint_error }
+  it { is_expected.to respond_to :vprint_bad }
   it { is_expected.to respond_to :vprint_good }
   it { is_expected.to respond_to :vprint_status }
   it { is_expected.to respond_to :vprint_warning }
-end
+end

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,8 @@ def print_error(msg='')`
`112`	`112`	`output.print_error(msg) if (output)`
`113`	`113`	`end`
`114`	`114`
	`115`	`+ alias_method :print_bad, :print_error`
	`116`	`+`
`115`	`117`	`#`
`116`	`118`	`# Prints a 'good' message.`
`117`	`119`	`#`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ class Output`
`24`	`24`	`def print_error(msg='')`
`25`	`25`	`end`
`26`	`26`
	`27`	`+ alias_method :print_bad, :print_error`
	`28`	`+`
`27`	`29`	`#`
`28`	`30`	`# Prints a 'good' message.`
`29`	`31`	`#`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ def print_error(msg='')`
`46`	`46`	`end`
`47`	`47`	`end`
`48`	`48`
	`49`	`+ alias_method :print_bad, :print_error`
	`50`	`+`
`49`	`51`	`#`
`50`	`52`	`# Wraps user_output.print_good`
`51`	`53`	`#`