typhoeus 0.1.14 → 0.1.15

data/lib/typhoeus/easy.rb

@@ -17,11 +17,22 @@ module Typhoeus
       :CURLOPT_NOSIGNAL       => 99,
       :CURLOPT_HTTPHEADER     => 10023,
       :CURLOPT_FOLLOWLOCATION => 52,
-      :CURLOPT_MAXREDIRS      => 68
+      :CURLOPT_MAXREDIRS      => 68,
+      :CURLOPT_HTTPAUTH       => 107,
+      :CURLOPT_USERPWD        => 10000 + 5,
+      :CURLOPT_VERBOSE        => 41
     }
     INFO_VALUES = {
       :CURLINFO_RESPONSE_CODE => 2097154,
-      :CURLINFO_TOTAL_TIME    => 3145731
+      :CURLINFO_TOTAL_TIME    => 3145731,
+      :CURLINFO_HTTPAUTH_AVAIL => 0x200000 + 23
+    }
+    AUTH_TYPES = {
+      :CURLAUTH_BASIC         => 1,
+      :CURLAUTH_DIGEST        => 2,
+      :CURLAUTH_GSSNEGOTIATE  => 4,
+      :CURLAUTH_NTLM          => 8,
+      :CURLAUTH_DIGEST_IE     => 16
     }
     
     def initialize
@@ -34,6 +45,19 @@ module Typhoeus
       @headers = hash
     end
     
+    def auth=(authinfo)
+      set_option(OPTION_VALUES[:CURLOPT_USERPWD], "#{authinfo[:username]}:#{authinfo[:password]}")
+      set_option(OPTION_VALUES[:CURLOPT_HTTPAUTH], authinfo[:method]) if authinfo[:method]
+    end
+    
+    def auth_methods
+      get_info_long(INFO_VALUES[:CURLINFO_HTTPAUTH_AVAIL])
+    end
+    
+    def verbose=(boolean)
+      set_option(OPTION_VALUES[:CURLOPT_VERBOSE], !!boolean ? 1 : 0)
+    end
+    
     def total_time_taken
       get_info_double(INFO_VALUES[:CURLINFO_TOTAL_TIME])
     end

data/spec/servers/app.rb

@@ -25,6 +25,29 @@ get '/bad_redirect' do
   redirect '/bad_redirect'
 end
 
+get '/auth_basic/:username/:password' do
+  @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+  # Check that we've got a basic auth, and that it's credentials match the ones
+  # provided in the request
+  if @auth.provided? && @auth.basic? && @auth.credentials == [ params[:username], params[:password] ]
+    # auth is valid - confirm it
+    true
+  else
+    # invalid auth - request the authentication
+    response['WWW-Authenticate'] = %(Basic realm="Testing HTTP Auth")
+    throw(:halt, [401, "Not authorized\n"])
+  end
+end
+
+get '/auth_ntlm' do
+  # we're just checking for the existence if NTLM auth header here. It's validation
+  # is too troublesome and really doesn't bother is much, it's up to libcurl to make
+  # it valid
+  is_ntlm_auth = /^NTLM/ =~ request.env['HTTP_AUTHORIZATION']
+  true if is_ntlm_auth
+  throw(:halt, [401, "Not authorized\n"]) if !is_ntlm_auth
+end
+
 get '/**' do
   sleep params["delay"].to_i if params.has_key?("delay")
   request.env.merge!(:body => request.body.read).to_json

data/spec/typhoeus/easy_spec.rb

@@ -61,6 +61,35 @@ describe Typhoeus::Easy do
     end
   end
   
+  describe "authentication" do
+    it "should allow to set username and password" do
+      e = Typhoeus::Easy.new
+      username, password = 'foo', 'bar'
+      e.auth = { :username => username, :password => password }
+      e.url = "http://localhost:3001/auth_basic/#{username}/#{password}"
+      e.method = :get
+      e.perform
+      e.response_code.should == 200
+    end
+    
+    it "should allow to query auth methods support by the server" do
+      e = Typhoeus::Easy.new
+      e.url = "http://localhost:3001/auth_basic/foo/bar"
+      e.method = :get
+      e.perform
+      e.auth_methods.should == Typhoeus::Easy::AUTH_TYPES[:CURLAUTH_BASIC]
+    end
+
+    it "should allow to set authentication method" do
+      e = Typhoeus::Easy.new
+      e.auth = { :username => 'username', :password => 'password', :method => Typhoeus::Easy::AUTH_TYPES[:CURLAUTH_NTLM] }
+      e.url = "http://localhost:3001/auth_ntlm"
+      e.method = :get
+      e.perform
+      e.response_code.should == 200
+    end
+  end
+  
   describe "get" do
     it "should perform a get" do
       easy = Typhoeus::Easy.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Paul Dix