Make the debug output more readable

Author: wchen-r7

lib/msf/core/exploit/http/client.rb

@@ -325,9 +325,23 @@ def send_request_raw(opts={}, timeout = 20)
     begin
       c = connect(opts)
       r = c.request_raw(opts)
-      print_line(r.to_s) if datastore['HttpTrace']
+
+      if datastore['HttpTrace']
+        print_line('#' * 20)
+        print_line('# Request:')
+        print_line('#' * 20)
+        print_line(r.to_s)
+      end
+
       res = c.send_recv(r, actual_timeout)
-      print_line(res.to_s) if datastore['HttpTrace']
+
+      if datastore['HttpTrace']
+        print_line('#' * 20)
+        print_line('# Response:')
+        print_line('#' * 20)
+        print_line(res.to_s)
+      end
+
       res
     rescue ::Errno::EPIPE, ::Timeout::Error => e
       print_line(e.message) if datastore['HttpTrace']
@@ -351,12 +365,28 @@ def send_request_cgi(opts={}, timeout = 20)
       actual_timeout =  opts[:timeout] || timeout
     end
 
+    print_line("*" * 20) if datastore['HttpTrace']
+
     begin
       c = connect(opts)
       r = c.request_cgi(opts)
-      print_line(r.to_s) if datastore['HttpTrace']
+
+      if datastore['HttpTrace']
+        print_line('#' * 20)
+        print_line('# Request:')
+        print_line('#' * 20)
+        print_line(r.to_s)
+      end
+
       res = c.send_recv(r, actual_timeout)
-      print_line(res.to_s) if datastore['HttpTrace']
+
+      if datastore['HttpTrace']
+        print_line('#' * 20)
+        print_line('# Response:')
+        print_line('#' * 20)
+        print_line(res.to_s)
+      end
+
       res
     rescue ::Errno::EPIPE, ::Timeout::Error => e
       print_line(e.message) if datastore['HttpTrace']