curb 0.8.4 → 1.3.5

data/tests/bug_curb_easy_post_with_string_no_content_length_header.rb

@@ -22,26 +22,15 @@ end
 Any insight you care to share would be helpful. Thanks.
 =end
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
-  def test_bug_workaround
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      assert_equal '15', req['Content-Length']
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
+  include BugTestServerSetupTeardown
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
+  def test_bug_workaround
     params = {:cat => "hat", :foo => "bar"}
 
     post_body = params.map{|f,k| "#{Curl::Easy.new.escape(f)}=#{Curl::Easy.new.escape(k)}"}.join('&')
-    c = Curl::Easy.http_post("http://127.0.0.1:9999/test",post_body) do |curl|
+    c = Curl::Easy.http_post("http://127.0.0.1:#{@port}/test",post_body) do |curl|
       curl.headers["User-Agent"] = "Curl/Ruby"
       curl.headers["X-Tender-Auth"] = "A Token"
       curl.headers["Accept"] = "application/vnd.tender-v1+json"
@@ -50,23 +39,12 @@ class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
       curl.enable_cookies = true
     end
 
-    server.shutdown
-    thread.join
   end
-  def test_bug
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      assert_equal '15', req['Content-Length']
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
+  def test_bug
     params = {:cat => "hat", :foo => "bar"}
 
-    c = Curl::Easy.http_post("http://127.0.0.1:9999/test") do |curl|
+    c = Curl::Easy.http_post("http://127.0.0.1:#{@port}/test") do |curl|
       curl.headers["User-Agent"] = "Curl/Ruby"
       curl.headers["X-Tender-Auth"] = "A Token"
       curl.headers["Accept"] = "application/vnd.tender-v1+json"
@@ -76,8 +54,6 @@ class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
       curl.follow_location = true
       curl.enable_cookies = true
     end
-
-    server.shutdown
-    thread.join
   end
+
 end

data/tests/bug_follow_redirect_288.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugFollowRedirect288 < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = unused_local_port
+    super
+    @server.mount_proc("/redirect_to_test") do|req,res|
+      res.set_redirect(WEBrick::HTTPStatus::TemporaryRedirect, "/test")
+    end
+  end
+
+  def test_follow_redirect_with_no_redirect
+
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/test")
+    did_call_redirect = false
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.perform
+
+    assert !did_call_redirect, "should reach this point redirect should not have been called"
+
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/test")
+    did_call_redirect = false
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.follow_location = true
+    c.perform
+
+    assert_equal 0, c.redirect_count
+    assert !did_call_redirect, "should reach this point redirect should not have been called"
+
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/redirect_to_test")
+    did_call_redirect = false
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.perform
+    assert_equal 307, c.response_code
+
+    assert did_call_redirect, "we should have called on_redirect"
+
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/redirect_to_test")
+    did_call_redirect = false
+    c.follow_location = true
+    # NOTE: while this API is not supported by libcurl e.g. there is no redirect function callback in libcurl we could 
+    # add support in ruby for this by executing this callback if redirect_count is greater than 0 at the end of a request in curb_multi.c
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.perform
+    assert_equal 1, c.redirect_count
+    assert_equal 200, c.response_code
+
+    assert did_call_redirect, "we should have called on_redirect"
+
+    c.url = "http://127.0.0.1:#{@port}/test"
+    c.perform
+    assert_equal 0, c.redirect_count
+    assert_equal 200, c.response_code
+
+    puts "checking for raise support"
+    did_raise = false
+    begin
+      c = Curl::Easy.new("http://127.0.0.1:#{@port}/redirect_to_test")
+      did_call_redirect = false
+      c.on_redirect do|x|
+        raise "raise"
+        did_call_redirect = true
+      end
+      c.perform
+    rescue => e
+      did_raise = true
+    end
+    assert_equal 307, c.response_code
+    assert did_raise
+
+  end
+
+end

data/tests/bug_instance_post_differs_from_class_post.rb

@@ -35,15 +35,13 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
   end
 
   def do_test
-    c = Curl::Easy.http_post('https://www.google.com/accounts/ServiceLoginAuth',
-                Curl::PostField.content('ltmpl','m_blanco'))
+    c = Curl::Easy.http_post('https://www.google.com/accounts/ServiceLoginAuth', Curl::PostField.content('ltmpl','m_blanco'))
     body_c, header_c = c.body_str, c.header_str
    
     sleep 2
 
-    c.http_post('https://www.google.com/accounts/ServiceLoginAuth',
-                Curl::PostField.content('ltmpl','m_blanco'))
-    body_i, header_i = c.body_str, c.header_str
+    c.http_post('https://www.google.com/accounts/ServiceLoginAuth', Curl::PostField.content('ltmpl','m_blanco'))
+    body_i, header_i = c.body, c.head
 
     # timestamps will differ, just check first bit. We wont get here if
     # the bug bites anyway...

data/tests/bug_issue102.rb

@@ -4,7 +4,7 @@ class BugIssue102 < Test::Unit::TestCase
 
   def test_interface
     test = "https://api.twitter.com/1/users/show.json?screen_name=TwitterAPI&include_entities=true"
-    ip = "192.168.1.61"
+    ip = "0.0.0.0"
 
     c = Curl::Easy.new do |curl|
       curl.url = test

data/tests/bug_issue_noproxy.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugIssueNoproxy < Test::Unit::TestCase
+  def test_noproxy_option_support
+    # Test that CURLOPT_NOPROXY constant is defined
+    assert Curl.const_defined?(:CURLOPT_NOPROXY), "CURLOPT_NOPROXY constant should be defined"
+    
+    # Test basic noproxy setting using setopt
+    c = Curl::Easy.new('https://google.com')
+    
+    # This should not raise an error
+    assert_nothing_raised do
+      c.setopt(Curl::CURLOPT_NOPROXY, "localhost,127.0.0.1")
+    end
+    
+    # Test using the convenience method if it exists
+    if c.respond_to?(:noproxy=)
+      assert_nothing_raised do
+        c.noproxy = "localhost,127.0.0.1"
+      end
+      
+      # Test getter if it exists
+      if c.respond_to?(:noproxy)
+        assert_equal "localhost,127.0.0.1", c.noproxy
+      end
+    end
+  end
+  
+  def test_noproxy_with_set_method
+    c = Curl::Easy.new('https://google.com')
+    
+    # The issue specifically mentions using the set method
+    # This currently raises TypeError as reported in the issue
+    assert_nothing_raised(TypeError) do
+      c.set(:noproxy, "localhost,127.0.0.1")
+    end
+  end
+  
+  def test_noproxy_empty_string
+    c = Curl::Easy.new('https://google.com')
+    
+    # Test setting empty string to override environment variables
+    assert_nothing_raised do
+      c.setopt(Curl::CURLOPT_NOPROXY, "")
+    end
+  end
+  
+  def test_noproxy_nil_value
+    c = Curl::Easy.new('https://google.com')
+    
+    # Test setting nil to reset
+    assert_nothing_raised do
+      c.setopt(Curl::CURLOPT_NOPROXY, nil)
+    end
+  end
+end

data/tests/bug_issue_post_redirect.rb

@@ -0,0 +1,93 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'json'
+
+class BugIssuePostRedirect < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = 9998
+    super
+    # Mount a POST endpoint that returns a redirect
+    @server.mount_proc("/post_redirect") do |req, res|
+      if req.request_method == "POST"
+        res.status = 302
+        res['Location'] = "http://127.0.0.1:#{@port}/redirected"
+        res.body = "Redirecting..."
+      else
+        res.status = 405
+        res.body = "Method not allowed"
+      end
+    end
+
+    # Mount the redirect target
+    @server.mount_proc("/redirected") do |req, res|
+      res.status = 200
+      res['Content-Type'] = "text/plain"
+      res.body = "You have been redirected"
+    end
+  end
+
+  def test_post_with_max_redirects_zero_should_not_follow_redirect
+    # Test case replicating the issue: POST with max_redirects=0 and follow_location=false
+    # should NOT trigger on_redirect callback or follow the redirect
+    
+    redirect_called = false
+    
+    handle = Curl::Easy.new("http://127.0.0.1:#{@port}/post_redirect") do |curl|
+      curl.max_redirects = 0
+      curl.follow_location = false
+      curl.on_redirect do |easy|
+        redirect_called = true
+      end
+      curl.headers['Content-Type'] = 'application/json'
+      curl.post_body = {test: "data"}.to_json
+    end
+    
+    handle.http(:POST)
+    
+    # The response should be the redirect response (302)
+    assert_equal 302, handle.response_code
+    assert_match(/Redirecting/, handle.body_str)
+    
+    # on_redirect should NOT be called when follow_location is false
+    assert !redirect_called, "on_redirect callback should not be called when follow_location is false"
+  end
+
+  def test_post_with_follow_location_true_triggers_redirect
+    # Test that on_redirect IS called when follow_location is true
+    redirect_called = false
+    
+    handle = Curl::Easy.new("http://127.0.0.1:#{@port}/post_redirect") do |curl|
+      curl.follow_location = true
+      curl.on_redirect do |easy|
+        redirect_called = true
+      end
+      curl.headers['Content-Type'] = 'application/json'
+      curl.post_body = {test: "data"}.to_json
+    end
+    
+    handle.http(:POST)
+    
+    # Should follow the redirect and get the final response
+    assert_equal 200, handle.response_code
+    assert_match(/You have been redirected/, handle.body_str)
+    
+    # on_redirect SHOULD be called when follow_location is true
+    assert redirect_called, "on_redirect callback should be called when follow_location is true"
+  end
+
+  def test_curl_post_class_method_respects_redirect_settings
+    # Test that Curl.post (class method) respects redirect settings
+    # According to the issue, this works correctly
+    
+    response = Curl.post("http://127.0.0.1:#{@port}/post_redirect", {test: "data"}.to_json) do |curl|
+      curl.max_redirects = 0
+      curl.follow_location = false
+      curl.headers['Content-Type'] = 'application/json'
+    end
+    
+    # Should get the redirect response, not follow it
+    assert_equal 302, response.response_code
+    assert_match(/Redirecting/, response.body_str)
+  end
+end

data/tests/bug_issue_spnego.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugIssueSpnego < Test::Unit::TestCase
+  def test_spnego_detection_works
+    # The fix for issue #227 ensures that Curl.spnego? checks for both
+    # CURL_VERSION_SPNEGO (newer libcurl) and CURL_VERSION_GSSNEGOTIATE (older libcurl)
+    # 
+    # We can't test that it returns true because that depends on how libcurl
+    # was compiled on the system. We can only test that:
+    # 1. The method exists and works
+    # 2. If CURLAUTH_GSSNEGOTIATE is available, we can use it
+    
+    # Check if CURLAUTH_GSSNEGOTIATE is available
+    if Curl.const_defined?(:CURLAUTH_GSSNEGOTIATE) && Curl.const_get(:CURLAUTH_GSSNEGOTIATE) != 0
+      # Test that we can use GSSNEGOTIATE auth type
+      c = Curl::Easy.new('http://example.com')
+      assert_nothing_raised do
+        c.http_auth_types = Curl::CURLAUTH_GSSNEGOTIATE
+      end
+      
+      # The fix ensures spnego? won't incorrectly return false when 
+      # older libcurl versions have GSSNEGOTIATE support
+      # (The actual return value depends on system libcurl compilation)
+    end
+    
+    # The important fix is that the method now checks both constants
+    # This test passes if no exceptions are raised
+    assert true, "SPNEGO detection is working correctly"
+  end
+  
+  def test_spnego_method_exists
+    # The method should always exist
+    assert Curl.respond_to?(:spnego?), "Curl should respond to spnego?"
+  end
+  
+  def test_spnego_returns_boolean
+    # The method should return a boolean
+    result = Curl.spnego?
+    assert [true, false].include?(result), "Curl.spnego? should return true or false, got #{result.inspect}"
+  end
+end

data/tests/bug_multi_segfault.rb

@@ -3,6 +3,7 @@
 # irb: multi = Curl::Multi.new
 # irb: exit
 # <main>:47140: [BUG] Bus Error
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','ext'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 require 'curb'

data/tests/bug_raise_on_callback.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugRaiseOnCallback < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = unused_local_port
+    super
+  end
+
+  def test_on_complte
+    url = "http://127.0.0.1:#{@port}/test"
+    c = Curl::Easy.new(url)
+    did_raise = false
+    begin
+      c.on_complete do|x|
+        assert_equal url, x.url
+        raise "error complete" # this will get swallowed
+      end
+      c.perform
+    rescue => e
+      did_raise = true
+    end
+    assert did_raise, "we want to raise an exception if the ruby callbacks raise"
+
+  end
+
+end
+
+#test_on_debug