Auth should use 'password' not 'pass'

Fixes #17

Author: andrewvc

examples/ha_proxy.conf

@@ -3,7 +3,11 @@ input {
     urls => {
       haproxy => {
         method => get
-        url => "http://A_Username:YourPassword@localhost:9201/haproxy?stats;csv"
+        url => "http://localhost:9201/haproxy?stats;csv"
+        auth => {
+          user => "myuser"
+          password => "mypass"
+        }
       }
     }
     request_timeout => 60

lib/logstash/inputs/http_poller.rb

@@ -23,7 +23,7 @@
 #         }
 #         auth => {
 #           user => "AzureDiamond"
-#           pass => "hunter2"
+#           password => "hunter2"
 #         }
 #       }
 #     }
@@ -89,7 +89,7 @@ def normalize_request(url_or_spec)
       url = spec.delete(:url)
 
       # We need these strings to be keywords!
-      spec[:auth] = {user: spec[:auth]["user"], pass: spec[:auth]["pass"]} if spec[:auth]
+      spec[:auth] = {user: spec[:auth]["user"], pass: spec[:auth]["password"]} if spec[:auth]
 
       res = [method, url, spec]
     else
@@ -112,7 +112,7 @@ def validate_request!(url_or_spec, request)
         raise LogStash::ConfigurationError, "Auth was specified, but 'user' was not!"
       end
       if !spec[:auth][:pass]
-        raise LogStash::ConfigurationError, "Auth was specified, but 'pass' was not!"
+        raise LogStash::ConfigurationError, "Auth was specified, but 'password' was not!"
       end
     end
 
@@ -136,6 +136,8 @@ def run_once(queue)
     # Some exceptions are only returned here! There is no callback,
     # for example, if there is a bad port number.
     # https://github.com/cheald/manticore/issues/22
+    # This issue is now fixed, but we'll leave this code in for older versions
+    # of manticore. Once the plugin ecosystem is more updated we can kill this.
     client.execute!.each_with_index do |resp, i|
       if resp.is_a?(java.lang.Exception) || resp.is_a?(StandardError)
         name = @requests.keys[i]
@@ -152,8 +154,8 @@ def request_async(queue, name, request)
     @logger.debug? && @logger.debug("Fetching URL", :name => name, :url => request)
     started = Time.now
 
-    method, request_opts = request
-    client.async.send(method, request_opts).
+    method, *request_opts = request
+    client.async.send(method, *request_opts).
       on_success {|response| handle_success(queue, name, request, response, Time.now - started)}.
       on_failure {|exception|
       handle_failure(queue, name, request, exception, Time.now - started)

spec/inputs/http_poller_spec.rb

@@ -111,20 +111,20 @@
           end
 
           context "with auth enabled, a path, but no user" do
-            let(:url) { {"method" => "get", "auth" => {"pass" => "bar"}} }
+            let(:url) { {"method" => "get", "auth" => {"password" => "bar"}} }
             it "should raise an error" do
               expect { normalized }.to raise_error(LogStash::ConfigurationError)
             end
           end
           context "with auth enabled correctly" do
-            let(:auth) { {"user" => "foo", "pass" => "bar"} }
+            let(:auth) { {"user" => "foo", "password" => "bar"} }
 
             it "should raise an error" do
               expect { normalized }.not_to raise_error
             end
 
             it "should properly set the auth parameter" do
-              expect(normalized[2][:auth]).to eql({:user => auth["user"], :pass => auth["pass"]})
+              expect(normalized[2][:auth]).to eql({:user => auth["user"], :pass => auth["password"]})
             end
           end
         end