curb 0.9.11 → 1.0.5

data/tests/tc_curl_multi.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'set'
 
 class TestCurbCurlMulti < Test::Unit::TestCase
   def teardown
@@ -9,20 +10,58 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   # for https://github.com/taf2/curb/issues/277
   # must connect to an external
   def test_connection_keepalive
-    # 0123456 default & reserved RubyVM. It will probably include 7 from Dir.glob
-    lsof=`/usr/bin/which lsof`.strip
-    open_fds = lambda do 
-      `#{lsof} -p #{Process.pid} | egrep "TCP|UDP" | wc -l`.strip.to_i
+    # this test fails with libcurl 7.22.0. I didn't investigate, but it may be related
+    # to CURLOPT_MAXCONNECTS bug fixed in 7.30.0:
+    # https://github.com/curl/curl/commit/e87e76e2dc108efb1cae87df496416f49c55fca0
+    omit("Skip, libcurl too old (< 7.22.0)") if Curl::CURL_VERSION.split('.')[1].to_i <= 22
+
+    @server.shutdown if @server
+    @test_thread.kill if @test_thread
+    @server = nil
+    File.unlink(locked_file)
+    Curl::Multi.autoclose = true
+    assert Curl::Multi.autoclose
+# XXX: thought maybe we can clean house here to have the full suite pass in osx... but for now running this test in isolate does pass
+#      additionally, if ss allows this to pass on linux without requesting google i think this is a good trade off... leaving some of the thoughts below
+#      in hopes that coming back to this later will find it and remember how to fix it
+#    types = Set.new
+#    close_types = Set.new([TCPServer,TCPSocket,Socket,Curl::Multi, Curl::Easy,WEBrick::Log])
+#    ObjectSpace.each_object {|o|
+#      if o.respond_to?(:close)
+#        types << o.class
+#      end
+#      if close_types.include?(o.class)
+#        o.close
+#      end
+#    }
+    #puts "unique types: #{types.to_a.join("\n")}"
+    GC.start # cleanup FDs left over from other tests
+    server_setup
+    GC.start # cleanup FDs left over from other tests
+
+    if `which ss`.strip.size == 0
+      # osx need lsof still :(
+      open_fds = lambda do
+        out = `/usr/sbin/lsof -p #{Process.pid} | egrep "TCP|UDP"`# | egrep ':#{TestServlet.port} ' | egrep ESTABLISHED`# | wc -l`.strip.to_i
+        #puts out.lines.join("\n")
+        out.lines.size
+      end
+    else
+      ss = `which ss`.strip
+      open_fds = lambda do
+        `#{ss} -n4 state established dport = :#{TestServlet.port} | wc -l`.strip.to_i
+      end
     end
+    Curl::Multi.autoclose = false
     before_open = open_fds.call
+    #puts "before_open: #{before_open.inspect}"
     assert !Curl::Multi.autoclose
     multi = Curl::Multi.new
     multi.max_connects = 1 # limit to 1 connection within the multi handle
 
     did_complete = false
     5.times do |n|
-      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
-      easy = Curl::Easy.new("http://google.com/") do |curl|
+      easy = Curl::Easy.new(TestServlet.url) do |curl|
         curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
         curl.on_complete {
           did_complete = true
@@ -34,18 +73,21 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     multi.perform
     assert did_complete
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 1, "with max connections set to 1 at this point the connection to google should still be open"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    # ruby process may keep a connection alive 
+    assert (after_open - before_open) < 3, "with max connections set to 1 at this point the connection to google should still be open"
+    assert (after_open - before_open) > 0, "with max connections set to 1 at this point the connection to google should still be open"
     multi.close
 
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 0, "after closing the multi handle all connections should be closed"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 0, (after_open - before_open), "after closing the multi handle all connections should be closed"
 
     Curl::Multi.autoclose = true
     multi = Curl::Multi.new
     did_complete = false
     5.times do |n|
-      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
-      easy = Curl::Easy.new("http://google.com/") do |curl|
+      easy = Curl::Easy.new(TestServlet.url) do |curl|
         curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
         curl.on_complete {
           did_complete = true
@@ -57,7 +99,8 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     multi.perform
     assert did_complete
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 0, "auto close the connections"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 0, (after_open - before_open), "auto close the connections"
   ensure
     Curl::Multi.autoclose = false # restore default
   end
@@ -118,6 +161,44 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
   end
 
+  def test_multi_easy_get
+    n = 1
+    urls = []
+    n.times { urls << $TEST_URL }
+    Curl::Multi.get(urls, {timeout: 5}) {|easy|
+      assert_match(/file:/, easy.last_effective_url)
+    }
+  end
+
+  def test_multi_easy_get_with_error
+    begin
+      did_raise = false
+      n = 3
+      urls = []
+      n.times { urls << $TEST_URL }
+      error_line_number_should_be = nil
+      Curl::Multi.get(urls, {timeout: 5}) {|easy|
+        # if we got this right the error will be reported to be on the line below our error_line_number_should_be
+        error_line_number_should_be = __LINE__
+        raise 
+      }
+
+    rescue Curl::Err::AbortedByCallbackError => e
+      did_raise = true
+      in_file = e.backtrace.detect {|err| err.match?(File.basename(__FILE__)) }
+      in_file_stack = e.backtrace.select {|err| err.match?(File.basename(__FILE__)) }
+      assert_match(__FILE__, in_file)
+      in_file.gsub!(__FILE__)
+      parts = in_file.split(':')
+      parts.shift
+      line_no = parts.shift.to_i
+      assert_equal error_line_number_should_be+1, line_no.to_i
+    end
+
+    assert did_raise, "we should have raised an exception"
+
+  end
+
   # NOTE: if this test runs slowly on Mac OSX, it is probably due to the use of a port install curl+ssl+ares install
   # on my MacBook, this causes curl_easy_init to take nearly 0.01 seconds / * 100 below is 1 second too many!
   def test_n_requests
@@ -439,7 +520,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       { :url => TestServlet.url, :method => :get }
     ]
     Curl::Multi.http(urls, {:pipeline => true}) do|easy, code, method|
-      assert_equal nil, code
+      assert_equal 200, code
       case method
       when :post
         assert_match(/POST/, easy.body_str)
@@ -453,20 +534,20 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   end
 
   def test_multi_easy_http_with_max_connects
-        urls = [
+    urls = [
       { :url => TestServlet.url + '?q=1', :method => :get },
       { :url => TestServlet.url + '?q=2', :method => :get },
       { :url => TestServlet.url + '?q=3', :method => :get }
     ]
     Curl::Multi.http(urls, {:pipeline => true, :max_connects => 1}) do|easy, code, method|
-      assert_equal nil, code
+      assert_equal 200, code
       case method
       when :post
-        assert_match(/POST/, easy.body_str)
+        assert_match(/POST/, easy.body)
       when :get
-        assert_match(/GET/, easy.body_str)
+        assert_match(/GET/, easy.body)
       when :put
-        assert_match(/PUT/, easy.body_str)
+        assert_match(/PUT/, easy.body)
       end
     end
   end

data/tests/tc_curl_protocols.rb

@@ -0,0 +1,37 @@
+class TestCurbCurlProtocols < Test::Unit::TestCase
+  include TestServerMethods
+
+  def setup
+    @easy = Curl::Easy.new
+    @easy.set :protocols, Curl::CURLPROTO_HTTP | Curl::CURLPROTO_HTTPS
+    @easy.follow_location = true
+    server_setup
+  end
+
+  def test_protocol_allowed
+    @easy.set :url, "http://127.0.0.1:9129/this_file_does_not_exist.html"
+    @easy.perform
+    assert_equal 404, @easy.response_code
+  end
+
+  def test_protocol_denied
+    @easy.set :url, "gopher://google.com/"
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      @easy.perform
+    end
+  end
+
+  def test_redir_protocol_allowed
+    @easy.set :url, TestServlet.url + "/redirect"
+    @easy.set :redir_protocols, Curl::CURLPROTO_HTTP
+    @easy.perform
+  end
+
+  def test_redir_protocol_denied
+    @easy.set :url, TestServlet.url + "/redirect"
+    @easy.set :redir_protocols, Curl::CURLPROTO_HTTPS
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      @easy.perform
+    end
+  end
+end

data/tests/timeout.rb

@@ -17,9 +17,13 @@ class TestCurbTimeouts < Test::Unit::TestCase
   def test_overall_timeout_on_dead_transfer
     curl = Curl::Easy.new(wait_url(2))
     curl.timeout = 1
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation timed out after/,
+      exception.message
+    )
   end
 
   def test_overall_timeout_ms_on_dead_transfer
@@ -44,16 +48,20 @@ class TestCurbTimeouts < Test::Unit::TestCase
     curl = Curl::Easy.new(serve_url(100, 2, 3))
     curl.timeout = 1
     # transfer is aborted despite data being exchanged
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation timed out after/,
+      exception.message
+    )
   end
   
   def test_low_speed_time_on_slow_transfer
     curl = Curl::Easy.new(serve_url(100, 1, 3))
     curl.low_speed_time = 2
     # use default low_speed_limit of 1
-    assert true, curl.http_get
+    assert_equal true, curl.http_get
   end
   
   def test_low_speed_time_on_very_slow_transfer
@@ -63,18 +71,26 @@ class TestCurbTimeouts < Test::Unit::TestCase
     # XXX for some reason this test fails if low speed limit is not specified
     curl.low_speed_limit = 1
     # use default low_speed_limit of 1
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation too slow/,
+      exception.message
+    )
   end
   
   def test_low_speed_limit_on_slow_transfer
     curl = Curl::Easy.new(serve_url(10, 1, 3))
     curl.low_speed_time = 2
     curl.low_speed_limit = 1000
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation too slow/,
+      exception.message
+    )
   end
   
   def test_clearing_low_speed_time

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.5
 platform: ruby
 authors:
 - Ross Bamford
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies: []
 description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
   for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
@@ -50,12 +50,14 @@ files:
 - tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
 - tests/bug_issue277.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
+- tests/bug_raise_on_callback.rb
 - tests/bug_require_last_or_segfault.rb
 - tests/bugtests.rb
 - tests/helper.rb
@@ -70,6 +72,7 @@ files:
 - tests/tc_curl_maxfilesize.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
+- tests/tc_curl_protocols.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
@@ -95,36 +98,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
-- tests/tc_curl_multi.rb
 - tests/alltests.rb
-- tests/tc_curl_easy_setopt.rb
-- tests/tc_curl.rb
-- tests/bug_postfields_crash.rb
+- tests/bug_crash_on_debug.rb
 - tests/bug_crash_on_progress.rb
-- tests/helper.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/bug_follow_redirect_288.rb
+- tests/bug_instance_post_differs_from_class_post.rb
+- tests/bug_issue102.rb
 - tests/bug_issue277.rb
+- tests/bug_multi_segfault.rb
+- tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
+- tests/bug_raise_on_callback.rb
 - tests/bug_require_last_or_segfault.rb
-- tests/timeout.rb
-- tests/bug_crash_on_debug.rb
-- tests/unittests.rb
-- tests/bug_issue102.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_multi_segfault.rb
-- tests/bug_instance_post_differs_from_class_post.rb
+- tests/bugtests.rb
+- tests/helper.rb
+- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
-- tests/timeout_server.rb
+- tests/signals.rb
+- tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/mem_check.rb
-- tests/tc_curl_postfield.rb
-- tests/tc_curl_maxfilesize.rb
-- tests/bugtests.rb
 - tests/tc_curl_easy_resolve.rb
-- tests/signals.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/tc_curl_easy_setopt.rb
+- tests/tc_curl_maxfilesize.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/tc_curl_protocols.rb
+- tests/timeout.rb
+- tests/timeout_server.rb
+- tests/unittests.rb