added yard docs

lib/metasploit/framework/login_scanner/http.rb

@@ -244,8 +244,7 @@ module Metasploit
 
           begin
             cli.connect
-            # Send CGI compatible request by default
-            req = opts[:cgi] ? cli.request_cgi(opts) : cli.request_raw(opts)
+            req = cli.request_cgi(opts)
 
             # Authenticate by default
             res = if opts['authenticate'].nil? || opts['authenticate']

lib/metasploit/framework/login_scanner/mybook_live.rb

@@ -38,8 +38,8 @@ module Metasploit
               'method' => method,
               'uri' => uri,
               'vars_post' => {
-                 'data%5BLogin%5D%5Bowner_name%5D' => 'admin',
-                 'data%5BLogin%5D%5Bowner_passwd%5D' => cred
+                'data[Login][owner_name]' => 'admin',
+                'data[Login][owner_passwd]' => cred
               }
             })
 

lib/rex/proto/http/client.rb

@@ -232,16 +232,16 @@ class Client
   # @return (see #read_response)
   def _send_recv(req, t = -1, persist = false)
     @pipeline = persist
+    subscriber.on_request(req)
     if req.respond_to?(:opts) && req.opts['ntlm_transform_request'] && self.ntlm_client
       req = req.opts['ntlm_transform_request'].call(self.ntlm_client, req)
     elsif req.respond_to?(:opts) && req.opts['krb_transform_request'] && self.krb_encryptor
       req = req.opts['krb_transform_request'].call(self.krb_encryptor, req)
     end
-    subscriber.on_request(req)
+    
     send_request(req, t)
 
     res = read_response(t, :original_request => req)
-    subscriber.on_response(res)
     if req.respond_to?(:opts) && req.opts['ntlm_transform_response'] && self.ntlm_client
       req.opts['ntlm_transform_response'].call(self.ntlm_client, res)
     elsif req.respond_to?(:opts) && req.opts['krb_transform_response'] && self.krb_encryptor
@@ -249,6 +249,7 @@ class Client
     end
     res.request = req.to_s if res
     res.peerinfo = peerinfo if res
+    subscriber.on_response(res)
     res
   end
 
@@ -796,7 +797,7 @@ class Client
   # When parsing the request, thunk off the first response from the server, since junk
   attr_accessor :junk_pipeline
 
-  # HTTP subscriber
+  # @return [Rex::Proto::Http::HttpSubscriber] The HTTP subscriber
   attr_accessor :subscriber
 
 protected

lib/rex/proto/http/http_logger_subscriber.rb

@@ -14,6 +14,7 @@ class HttpLoggerSubscriber < HttpSubscriber
     @logger = logger
   end
 
+  # (see Rex::Proto::Http::HttpSubscriber#on_request)
   def on_request(request)
     if @logger.datastore['HttpTrace']
       http_trace_colors = @logger.datastore['HttpTraceColors'].blank? ? 'red/blu' : @logger.datastore['HttpTraceColors'] # Set the default colors if none were provided.
@@ -26,7 +27,8 @@ class HttpLoggerSubscriber < HttpSubscriber
       @logger.print_line("%clr#{request_color}#{request}%clr")
     end
   end
-  
+
+  # (see Rex::Proto::HttpSubscriber#on_response)
   def on_response(response)
     if @logger.datastore['HttpTrace']
       http_trace_colors = @logger.datastore['HttpTraceColors'].blank? ? 'red/blu' : @logger.datastore['HttpTraceColors'] # Set the default colors if none were provided.

lib/rex/proto/http/http_subscriber.rb

@@ -9,9 +9,11 @@ module Proto
 module Http
 
 class HttpSubscriber
+  # @param request [Rex::Proto::Http::ClientRequest]
   def on_request(request)
   end
 
+  # @param response [Rex::Proto::Http::Response]
   def on_response(response)
   end
 end