curb 1.3.4 → 1.3.6

data/tests/tc_curl_protocols.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
 class TestCurbCurlProtocols < Test::Unit::TestCase
   include TestServerMethods
 
@@ -8,6 +10,11 @@ class TestCurbCurlProtocols < Test::Unit::TestCase
     server_setup
   end
 
+  def teardown
+    Curl.__send__(:clear_safe!) if Curl.respond_to?(:clear_safe!, true)
+    super
+  end
+
   def test_protocol_allowed
     @easy.set :url, "http://127.0.0.1:9129/this_file_does_not_exist.html"
     @easy.perform
@@ -34,4 +41,348 @@ class TestCurbCurlProtocols < Test::Unit::TestCase
       @easy.perform
     end
   end
+
+  def test_protocols_str_setopt_supported
+    omit('CURLOPT_PROTOCOLS_STR not supported by this libcurl') unless Curl.const_defined?(:CURLOPT_PROTOCOLS_STR)
+
+    @easy.set :protocols_str, 'http,https'
+    @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_redir_protocols_str_setopt_supported
+    omit('CURLOPT_REDIR_PROTOCOLS_STR not supported by this libcurl') unless Curl.const_defined?(:CURLOPT_REDIR_PROTOCOLS_STR)
+
+    @easy.set :url, TestServlet.url + "/redirect"
+    @easy.set :redir_protocols_str, 'https'
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      @easy.perform
+    end
+  end
+
+  def test_allowed_protocols_denies_file_protocol
+    easy = Curl::Easy.new($TEST_URL)
+    easy.allowed_protocols = [:http, :https]
+
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      easy.perform
+    end
+  end
+
+  def test_safe_http_denies_file_protocol
+    easy = Curl::Easy.new($TEST_URL)
+    easy.safe_http!
+
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      easy.perform
+    end
+  end
+
+  def test_safe_http_override_is_cleared_by_close
+    easy = Curl::Easy.new($TEST_URL)
+    easy.safe_http!
+    easy.close
+    easy.url = $TEST_URL
+
+    easy.perform
+
+    assert_match(/TESTMODEL/, easy.body_str)
+  end
+
+  def test_safe_get_denies_file_protocol
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      Curl.safe_get($TEST_URL)
+    end
+  end
+
+  def test_safe_get_reapplies_protocols_after_user_block
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      Curl.safe_get($TEST_URL) do |easy|
+        easy.allowed_protocols = [:file]
+      end
+    end
+  end
+
+  def test_safe_get_allows_http_protocol
+    easy = Curl.safe_get(TestServlet.url)
+
+    assert_equal 200, easy.response_code
+    assert_match(/GET/, easy.body_str)
+  end
+
+  def test_safe_bang_denies_file_protocol_for_easy_perform
+    Curl.safe!
+    easy = Curl::Easy.new($TEST_URL)
+
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      easy.perform
+    end
+  end
+
+  def test_safe_bang_denies_file_protocol_for_shortcut_helpers
+    Curl.safe!
+
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      Curl.get($TEST_URL)
+    end
+  end
+
+  def test_safe_bang_reapplies_protocols_after_shortcut_block
+    Curl.safe!
+
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      Curl.get($TEST_URL) do |easy|
+        easy.allowed_protocols = [:file]
+      end
+    end
+  end
+
+  def test_safe_bang_allows_configured_protocols
+    Curl.safe! do |config|
+      config.protocols = [:http, :file]
+    end
+
+    easy = Curl::Easy.new($TEST_URL)
+    easy.perform
+
+    assert_match(/DO NOT REMOVE THIS COMMENT/, easy.body_str)
+  end
+
+  def test_safe_get_remains_http_safe_with_broader_global_policy
+    Curl.safe! do |config|
+      config.protocols = [:http, :file]
+    end
+
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      Curl.safe_get($TEST_URL)
+    end
+  end
+
+  def test_safe_bang_allows_http_protocol
+    Curl.safe!
+    easy = Curl.get(TestServlet.url)
+
+    assert_equal 200, easy.response_code
+    assert_match(/GET/, easy.body_str)
+  end
+
+  def test_safe_bang_applies_to_multi_perform
+    Curl.safe!
+    easy = Curl::Easy.new($TEST_URL)
+    multi = Curl::Multi.new
+
+    multi.add(easy)
+    multi.perform
+
+    assert_equal Curl::Err::UnsupportedProtocolError, Curl::Easy.error(easy.last_result).first
+  ensure
+    multi.close if defined?(multi) && multi
+  end
+
+  def test_safe_http_denies_file_redirect
+    with_file_redirect_server do |url|
+      easy = Curl::Easy.new(url)
+      easy.follow_location = true
+      easy.safe_http!
+
+      assert_raises Curl::Err::UnsupportedProtocolError do
+        easy.perform
+      end
+    end
+  end
+
+  def test_safe_bang_denies_file_redirect
+    with_file_redirect_server do |url|
+      Curl.safe!
+
+      easy = Curl::Easy.new(url)
+      easy.follow_location = true
+
+      assert_raises Curl::Err::UnsupportedProtocolError do
+        easy.perform
+      end
+    end
+  end
+
+  def test_safe_http_allows_http_to_https_redirect
+    with_http_https_redirect_servers(:http, :https) do |url|
+      easy = Curl::Easy.new(url)
+      easy.follow_location = true
+      easy.ssl_verify_peer = false
+      easy.ssl_verify_host = false
+      easy.safe_http!
+
+      easy.perform
+
+      assert_equal 200, easy.response_code
+      assert_equal 'https target', easy.body_str
+    end
+  end
+
+  def test_safe_http_allows_https_to_http_redirect
+    with_http_https_redirect_servers(:https, :http) do |url|
+      easy = Curl::Easy.new(url)
+      easy.follow_location = true
+      easy.ssl_verify_peer = false
+      easy.ssl_verify_host = false
+      easy.safe_http!
+
+      easy.perform
+
+      assert_equal 200, easy.response_code
+      assert_equal 'http target', easy.body_str
+    end
+  end
+
+  def test_safe_http_honors_redirect_limit
+    with_redirect_loop_server do |url, hits|
+      easy = Curl::Easy.new(url)
+      easy.follow_location = true
+      easy.max_redirects = 2
+      easy.safe_http!
+
+      assert_raises Curl::Err::TooManyRedirectsError do
+        easy.perform
+      end
+
+      assert_operator hits[:loop], :>=, 2
+    end
+  end
+
+  private
+
+  def with_file_redirect_server
+    port_socket = TCPServer.new('127.0.0.1', 0)
+    port = port_socket.addr[1]
+    port_socket.close
+
+    server = WEBrick::HTTPServer.new(:Port => port, :Logger => WEBRICK_TEST_LOG, :AccessLog => [])
+    server.mount_proc('/redirect-file') do |_req, res|
+      res.status = 302
+      res['Location'] = $TEST_URL
+      res.body = 'redirect'
+    end
+
+    thread = Thread.new(server) { |srv| srv.start }
+    wait_for_server_ready(port, thread: thread)
+
+    yield "http://127.0.0.1:#{port}/redirect-file"
+  ensure
+    server.shutdown if defined?(server) && server
+    thread.join(server_shutdown_timeout) if defined?(thread) && thread
+    if defined?(thread) && thread&.alive?
+      thread.kill
+      thread.join(server_shutdown_timeout)
+    end
+  end
+
+  def with_redirect_loop_server
+    port_socket = TCPServer.new('127.0.0.1', 0)
+    port = port_socket.addr[1]
+    port_socket.close
+
+    hits = Hash.new(0)
+    server = WEBrick::HTTPServer.new(:Port => port, :Logger => WEBRICK_TEST_LOG, :AccessLog => [])
+    server.mount_proc('/loop') do |_req, res|
+      hits[:loop] += 1
+      res.status = 302
+      res['Location'] = '/loop'
+      res.body = 'redirect'
+    end
+
+    thread = Thread.new(server) { |srv| srv.start }
+    wait_for_server_ready(port, thread: thread)
+
+    yield "http://127.0.0.1:#{port}/loop", hits
+  ensure
+    server.shutdown if defined?(server) && server
+    thread.join(server_shutdown_timeout) if defined?(thread) && thread
+    if defined?(thread) && thread&.alive?
+      thread.kill
+      thread.join(server_shutdown_timeout)
+    end
+  end
+
+  def with_http_https_redirect_servers(initial_scheme, target_scheme)
+    require 'webrick/https'
+    require 'openssl'
+
+    omit('HTTPS redirect fixtures require OpenSSL') unless defined?(OpenSSL::PKey::RSA)
+
+    initial_server = nil
+    target_server = nil
+    initial_thread = nil
+    target_thread = nil
+
+    initial_port = unused_redirect_port
+    target_port = unused_redirect_port
+    target_server = redirect_matrix_server(target_scheme, target_port)
+    target_server.mount_proc('/target') do |_req, res|
+      res['Content-Type'] = 'text/plain'
+      res.body = "#{target_scheme} target"
+    end
+
+    target_thread = Thread.new(target_server) { |srv| srv.start }
+    wait_for_server_ready(target_port, thread: target_thread)
+
+    initial_server = redirect_matrix_server(initial_scheme, initial_port)
+    initial_server.mount_proc('/redirect') do |_req, res|
+      res.status = 302
+      res['Location'] = "#{target_scheme}://127.0.0.1:#{target_port}/target"
+      res.body = 'redirect'
+    end
+
+    initial_thread = Thread.new(initial_server) { |srv| srv.start }
+    wait_for_server_ready(initial_port, thread: initial_thread)
+
+    yield "#{initial_scheme}://127.0.0.1:#{initial_port}/redirect"
+  ensure
+    initial_server.shutdown if initial_server
+    target_server.shutdown if target_server
+    initial_thread.join(server_shutdown_timeout) if initial_thread
+    target_thread.join(server_shutdown_timeout) if target_thread
+    [initial_thread, target_thread].compact.each do |thread|
+      next unless thread.alive?
+
+      thread.kill
+      thread.join(server_shutdown_timeout)
+    end
+  end
+
+  def redirect_matrix_server(scheme, port)
+    options = {:BindAddress => '127.0.0.1', :Port => port, :Logger => WEBRICK_TEST_LOG, :AccessLog => []}
+    return WEBrick::HTTPServer.new(options) if scheme == :http
+
+    cert, key = redirect_matrix_certificate
+    WEBrick::HTTPServer.new(options.merge(:SSLEnable => true, :SSLCertificate => cert, :SSLPrivateKey => key))
+  end
+
+  def redirect_matrix_certificate
+    key = OpenSSL::PKey::RSA.new(2048)
+    cert = OpenSSL::X509::Certificate.new
+    cert.version = 2
+    cert.serial = 1
+    cert.subject = OpenSSL::X509::Name.parse('/CN=127.0.0.1')
+    cert.issuer = cert.subject
+    cert.public_key = key.public_key
+    cert.not_before = Time.now - 60
+    cert.not_after = Time.now + 3600
+
+    extensions = OpenSSL::X509::ExtensionFactory.new
+    extensions.subject_certificate = cert
+    extensions.issuer_certificate = cert
+    cert.add_extension(extensions.create_extension('basicConstraints', 'CA:FALSE', true))
+    cert.add_extension(extensions.create_extension('subjectAltName', 'IP:127.0.0.1', false))
+    cert.sign(key, OpenSSL::Digest::SHA256.new)
+
+    [cert, key]
+  end
+
+  def unused_redirect_port
+    socket = TCPServer.new('127.0.0.1', 0)
+    socket.addr[1]
+  ensure
+    socket.close if socket
+  end
 end

data/tests/tc_fiber_scheduler.rb

@@ -15,10 +15,11 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
   include TestServerMethods
 
   class RecordingScheduler
-    attr_reader :io_wait_events
+    attr_reader :io_wait_events, :io_select_calls
 
     def initialize
       @io_wait_events = []
+      @io_select_calls = 0
     end
 
     def fiber(&block)
@@ -31,7 +32,7 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
 
       readers = (events & IO::READABLE) != 0 ? [io] : nil
       writers = (events & IO::WRITABLE) != 0 ? [io] : nil
-      readable, writable = IO.select(readers, writers, nil, timeout)
+      readable, writable = blocking_io { IO.select(readers, writers, nil, timeout) }
 
       ready = 0
       ready |= IO::READABLE if readable && !readable.empty?
@@ -39,6 +40,11 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
       ready.zero? ? false : ready
     end
 
+    def io_select(readers, writers, excepts, timeout = nil)
+      @io_select_calls += 1
+      blocking_io { IO.select(readers, writers, excepts, timeout) }
+    end
+
     def kernel_sleep(duration = nil)
       sleep(duration || 0)
     end
@@ -56,6 +62,16 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
 
     def fiber_interrupt(*)
     end
+
+    private
+
+    def blocking_io(&block)
+      if Fiber.respond_to?(:blocking)
+        Fiber.blocking(&block)
+      else
+        block.call
+      end
+    end
   end
 
   ITERS = 4
@@ -208,9 +224,11 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
     end
 
     assert_equal 200, result
-    assert_operator scheduler.io_wait_events.length, :>=, 1
-    assert scheduler.io_wait_events.all? { |events| events.is_a?(Integer) }
-    assert scheduler.io_wait_events.any? { |events| (events & (IO::READABLE | IO::WRITABLE)) != 0 }
+    assert_operator scheduler.io_wait_events.length + scheduler.io_select_calls, :>=, 1
+    unless scheduler.io_wait_events.empty?
+      assert scheduler.io_wait_events.all? { |events| events.is_a?(Integer) }
+      assert scheduler.io_wait_events.any? { |events| (events & (IO::READABLE | IO::WRITABLE)) != 0 }
+    end
   end
 
   def test_multi_reuse_after_scheduler_perform
@@ -431,6 +449,47 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
     end
   end
 
+  def test_easy_perform_isolates_public_network_policy_block_under_scheduler
+    if skip_no_async
+      return
+    end
+
+    with_ephemeral_http_server do |port, hits|
+      results = {}
+      details = {}
+
+      async_run do |top|
+        blocked = top.async do
+          easy = Curl::Easy.new("http://127.0.0.1:#{port}/fast")
+          easy.network_policy = :public
+          easy.perform
+          results[:blocked] = :returned
+        rescue => e
+          results[:blocked] = e
+          details[:blocked_error] = easy.unsafe_destination_error if defined?(easy) && easy
+        end
+
+        successful = top.async do
+          easy = Curl::Easy.new("http://127.0.0.1:#{port}/slow")
+          easy.perform
+          results[:successful] = easy.response_code
+        rescue => e
+          results[:successful] = e
+        end
+
+        blocked.wait
+        successful.wait
+      end
+
+      assert_equal 200, results[:successful], "scheduler peer without public policy should return normally"
+      assert_kind_of Curl::Err::UnsafeDestinationError, results[:blocked]
+      assert_match(/127\.0\.0\.1/, results[:blocked].message)
+      assert_match(/127\.0\.0\.1/, details[:blocked_error])
+      assert_equal 0, hits[:fast], "blocked public-policy peer should not reach the server"
+      assert_equal 1, hits[:slow]
+    end
+  end
+
   def test_drain_scheduler_pending_does_not_drop_work_rejected_during_deferred_abort
     state = Curl.scheduler_state
     easy = Curl::Easy.new("http://127.0.0.1:#{@port}/test")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
 bindir: bin
 cert_chain: []
-date: 2026-05-12 00:00:00.000000000 Z
+date: 2026-06-17 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
@@ -42,6 +42,7 @@ files:
 - ext/extconf.rb
 - lib/curb.rb
 - lib/curl.rb
+- lib/curl/download.rb
 - lib/curl/easy.rb
 - lib/curl/multi.rb
 - tests/alltests.rb
@@ -56,6 +57,7 @@ files:
 - tests/bug_issue_post_redirect.rb
 - tests/bug_issue_spnego.rb
 - tests/bug_multi_segfault.rb
+- tests/bug_poison.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
 - tests/bug_raise_on_callback.rb
@@ -76,6 +78,7 @@ files:
 - tests/tc_curl_maxfilesize.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_native_coverage.rb
+- tests/tc_curl_network_policy.rb
 - tests/tc_curl_postfield.rb
 - tests/tc_curl_protocols.rb
 - tests/tc_fiber_scheduler.rb
@@ -107,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
@@ -123,6 +126,7 @@ test_files:
 - tests/bug_issue_post_redirect.rb
 - tests/bug_issue_spnego.rb
 - tests/bug_multi_segfault.rb
+- tests/bug_poison.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
 - tests/bug_raise_on_callback.rb
@@ -143,6 +147,7 @@ test_files:
 - tests/tc_curl_maxfilesize.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_native_coverage.rb
+- tests/tc_curl_network_policy.rb
 - tests/tc_curl_postfield.rb
 - tests/tc_curl_protocols.rb
 - tests/tc_fiber_scheduler.rb