Make SIP note, service and print output more similar

Author: jhart-r7

lib/msf/core/exploit/sip.rb

@@ -16,7 +16,9 @@ def report_response(response, rhost, proto, desired_headers = %w(User-Agent Serv
         return false
       end
 
-      # Do header extraction as necessary
+      # Extracted headers, stored as a hash where the key is the header name
+      # and the value is a list of all values seen for the header, covering the
+      # case where the same header value is seen multiple times
       extracted_headers = {}
       unless desired_headers.nil? || desired_headers.empty?
         desired_headers.each do |desired_header|
@@ -32,13 +34,17 @@ def report_response(response, rhost, proto, desired_headers = %w(User-Agent Serv
         'message' => options_response.message
       }
 
+      # compact the header values, append the header information to the
+      # fingerprint hash
       extracted_headers.each_pair do |k,v|
-        fprint['header_' + k.gsub('-', '_').downcase] = v.join(',')
+        value = v.join(',')
+        extracted_headers[k] = value
+        fprint['header_' + k.gsub('-', '_').downcase] = value
       end
 
       # Create a summary of the response
       status = options_response.status_line.dup
-      unless extracted_headers.keys.length == 0
+      unless extracted_headers.keys.empty?
         status << ": #{extracted_headers}"
       end