Merge pull request rapid7#109 from rapid7/bug/MSP-10713/smb-error-code

Move error_name to InvalidPacket and check for nil

Author: dmaloney-r7

lib/rex/proto/smb/exceptions.rb

@@ -736,18 +736,18 @@ def initialize(*args)
     super(*args)
   end
 
-  def error_name
-    get_error(error_code)
-  end
-
   # returns an error string if it exists, otherwise just the error code
   def get_error(error)
     string = ''
-    if @@errors[error]
+    if error && @@errors[error]
       string = @@errors[error]
-    else
+    elsif error
       string = sprintf('0x%.8x',error)
+    else
+      string = "Unknown error"
     end
+
+    string
   end
 end
 
@@ -785,6 +785,10 @@ class InvalidPacket < Error
   attr_accessor :word_count
   attr_accessor :command
   attr_accessor :error_code
+
+  def error_name
+    get_error(error_code)
+  end
 end
 
 class InvalidWordCount < InvalidPacket

modules/auxiliary/scanner/smb/smb_login.rb

@@ -112,7 +112,7 @@ def run_host(ip)
         print_brute :level => :verror, :ip => ip, :msg => "Could not connect"
         :abort
       when :failed
-        print_brute :level => :verror, :ip => ip, :msg => "Failed: '#{result.credential}', #{result.proof.error_name}"
+        print_brute :level => :verror, :ip => ip, :msg => "Failed: '#{result.credential}', #{result.proof}"
         invalidate_login(
           address: ip,
           port: rport,