patron 0.13.1 → 0.13.4

data/spec/session_ssl_spec.rb

@@ -6,6 +6,14 @@ require 'fileutils'
 
 describe Patron::Session do
 
+  def yaml_load(str)
+    if RUBY_VERSION >= '3.1.0'
+      YAML::safe_load(str, permitted_classes: [OpenStruct])
+    else
+      YAML::load(str)
+    end
+  end
+
   before(:each) do
     @session = Patron::Session.new
     @session.base_url = "https://localhost:9043"
@@ -14,7 +22,7 @@ describe Patron::Session do
 
   it "should retrieve a url with :get" do
     response = @session.get("/test")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "GET"
   end
 
@@ -22,7 +30,7 @@ describe Patron::Session do
     tmpfile = "/tmp/patron_test.yaml"
     response = @session.get_file "/test", tmpfile
     expect(response.body).to be_nil
-    body = YAML::load_file(tmpfile)
+    body = yaml_load(File.open(tmpfile).read)
     expect(body.request_method).to be == "GET"
     FileUtils.rm tmpfile
   end
@@ -32,15 +40,14 @@ describe Patron::Session do
   it "should download content in a forked subprocess" do
     # To trigger the bug, we need to perform a request in the master process first
     tmpfile = "/tmp/patron_test.yaml"
-    @session.get_file "/test2", tmpfile
-    File.unlink(tmpfile)
+    @session.get_file "/test", tmpfile
+    FileUtils.rm tmpfile
     
     # and this one segfaults
     pid = fork do
-      tmpfile = "/tmp/patron_test.yaml"
       response = @session.get_file "/test", tmpfile
       expect(response.body).to be_nil
-      body = YAML::load_file(tmpfile)
+      body = yaml_load(File.open(tmpfile).read)
       expect(body.request_method).to be == "GET"
       FileUtils.rm tmpfile
     end
@@ -59,14 +66,14 @@ describe Patron::Session do
 
   it "should include custom headers in a request" do
     response = @session.get("/test", {"User-Agent" => "PatronTest"})
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.header["user-agent"]).to be == ["PatronTest"]
   end
 
   it "should merge custom headers with session headers" do
     @session.headers["X-Test"] = "Testing"
     response = @session.get("/test", {"User-Agent" => "PatronTest"})
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.header["user-agent"]).to be == ["PatronTest"]
     expect(body.header["x-test"]).to be == ["Testing"]
   end
@@ -81,7 +88,7 @@ describe Patron::Session do
   it "should follow redirects by default" do
     @session.max_redirects = 1
     response = @session.get("/redirect")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(response.status).to be == 200
     expect(body.path).to be == "/test"
   end
@@ -108,26 +115,26 @@ describe Patron::Session do
 
   it "should send a delete request with :delete" do
     response = @session.delete("/test")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "DELETE"
   end
 
   it "should send a COPY request with :copy" do
     response = @session.copy("/test", "/test2")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "COPY"
   end
 
   it "should include a Destination header in COPY requests" do
     response = @session.copy("/test", "/test2")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.header['destination'].first).to be == "/test2"
   end
 
   it "should upload data with :get" do
     data = "upload data"
     response = @session.request(:get, "/test", {}, :data => data)
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "GET"
     expect(body.header['content-length']).to be == [data.size.to_s]
   end
@@ -135,7 +142,7 @@ describe Patron::Session do
   it "should upload data with :put" do
     data = "upload data"
     response = @session.put("/test", data)
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "PUT"
     expect(body.header['content-length']).to be == [data.size.to_s]
   end
@@ -146,7 +153,7 @@ describe Patron::Session do
 
   it "should upload a file with :put" do
     response = @session.put_file("/test", "LICENSE")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "PUT"
   end
 
@@ -156,14 +163,14 @@ describe Patron::Session do
 
   it "should use chunked encoding when uploading a file with :put" do
     response = @session.put_file("/test", "LICENSE")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.header['transfer-encoding'].first).to be == "chunked"
   end
 
   it "should upload data with :post" do
     data = "upload data"
     response = @session.post("/test", data)
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "POST"
     expect(body.header['content-length']).to be == [data.size.to_s]
   end
@@ -171,7 +178,7 @@ describe Patron::Session do
   it "should post a hash of arguments as a urlencoded form" do
     data = {:foo => 123, 'baz' => '++hello world++'}
     response = @session.post("/testpost", data)
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body['content_type']).to be == "application/x-www-form-urlencoded"
     expect(body['body']).to match(/baz=%2B%2Bhello%20world%2B%2B/)
     expect(body['body']).to match(/foo=123/)
@@ -183,13 +190,13 @@ describe Patron::Session do
 
   it "should upload a file with :post" do
     response = @session.post_file("/test", "LICENSE")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "POST"
   end
 
   it "should upload a multipart with :post" do
     response = @session.post_multipart("/test", { :test_data => "123" }, { :test_file => "LICENSE" } )
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "POST"
   end
 
@@ -199,33 +206,19 @@ describe Patron::Session do
 
   it "should use chunked encoding when uploading a file with :post" do
     response = @session.post_file("/test", "LICENSE")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.header['transfer-encoding'].first).to be == "chunked"
   end
 
   it "should handle cookies if set" do
     @session.handle_cookies
     response = @session.get("/setcookie").body
-    expect(YAML::load(response).header['cookie'].first).to be == "session_id=foo123"
+    expect(yaml_load(response).header['cookie'].first).to be == "session_id=foo123"
   end
 
   it "should not handle cookies by default" do
     response = @session.get("/setcookie").body
-    expect(YAML::load(response).header).to_not include('cookie')
-  end
-
-  it "should ignore a wrong Content-Length when asked to" do
-    expect {
-      @session.ignore_content_length = true
-      @session.get("/wrongcontentlength")
-    }.to_not raise_error
-  end
-
-  it "should fail by default with a Content-Length too high" do
-    expect {
-      @session.ignore_content_length = nil
-      @session.get("/wrongcontentlength")
-    }.to raise_error(Patron::PartialFileError)
+    expect(yaml_load(response).header).to_not include('cookie')
   end
 
   it "should raise exception if cookie store is not writable or readable" do
@@ -254,14 +247,24 @@ describe Patron::Session do
 
   it "should work when insecure mode is off but certificate is supplied" do
     @session.insecure = nil
-    @session.cacert = 'spec/certs/cacert.pem'
+    @session.cacert = File.join(__dir__, 'support', 'certs', 'cacert.pem')
     response = @session.get("/test")
-    body = YAML::load(response.body)
+    body = yaml_load(response.body)
     expect(body.request_method).to be == "GET"
   end
 
+  it "should allow to specify insecure mode per-request" do
+    @session.insecure = false
+    expect {
+      @session.request(:get, "/test", {}, insecure: true)
+    }.not_to raise_error
+    expect {
+      @session.request(:get, "/test", {})
+    }.to raise_error(Patron::Error)
+  end
+
   it "should work with different SSL versions" do
-    ['SSLv3','TLSv1'].each do |version|
+    ['TLSv1_0','TLSv1_1'].each do |version|
       @session.ssl_version = version
       response = @session.get("/test")
       expect(response.status).to be == 200

data/spec/spec_helper.rb

@@ -18,5 +18,17 @@ $stderr.puts "Build against #{Patron.libcurl_version}"
 
 Dir['./spec/support/**/*.rb'].each { |fn| require fn }
 
-Thread.new { PatronTestServer.start(false, 9001) }
-Thread.new { PatronTestServer.start(true, 9043) }
+http_server = Fork.new { PatronTestServer.start(false, 9001) }
+
+sleep 0.1 # Don't interfere the start up output of two processes.
+
+https_server = Fork.new { PatronTestServer.start(true, 9043) }
+
+RSpec.configure do |c|
+  c.after(:suite) do
+    http_server.kill("TERM")
+    https_server.kill("TERM")
+    http_server.wait
+    https_server.wait
+  end
+end

data/spec/support/config.ru

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'ostruct'
+require 'zlib'
 
 ## HTTP test server for integration tests
 
@@ -25,7 +26,9 @@ Readback = Proc.new {|env|
   end
 
   fake_webrick_request_object = OpenStruct.new({
-    :path => req.fullpath,
+    :fullpath => req.fullpath,
+    :path => req.path,
+    :query_string => req.query_string,
     :request_method => req.request_method.to_s,
     :header => Hash[req_headers],
     :body => env['rack.input'].read,
@@ -38,16 +41,20 @@ Readback = Proc.new {|env|
 GzipServlet = Proc.new {|env|
   raise "Need to have the right Accept-Encoding: header" unless env['HTTP_ACCEPT_ENCODING']
   
-  body = Enumerator.new do |y|
-    z = Zlib::Deflate.new(Zlib::DEFAULT_COMPRESSION)
-    1024.times {
-      y.yield(z.deflate('Some highly compressible data'))
-    }
-    y.yield(z.finish.to_s)
-    y.yield(z.close.to_s)
+  body = []
+  content_length = 0
+  z = Zlib::Deflate.new(Zlib::DEFAULT_COMPRESSION)
+  1024.times do
+    chunk = z.deflate('Some highly compressible data')
+    content_length += chunk.bytesize
+    body << chunk
   end
+  fin = z.finish.to_s
+  body << fin
+  content_length += fin.bytesize
+  z.close
 
-  [200, {'Content-Encoding' => 'deflate', 'Vary' => 'Accept-Encoding'}, body]
+  [200, {'Content-Encoding' => 'deflate', 'Content-Length' => content_length.to_s, 'Vary' => 'Accept-Encoding'}, body]
 }
 
 TimeoutServlet = Proc.new {|env|
@@ -60,15 +67,16 @@ TimeoutServlet = Proc.new {|env|
 SlowServlet = Proc.new {|env|
   body = Enumerator.new do |y|
     y.yield 'x'
-    sleep 20
+    sleep 5
     y.yield 'rest of body'
   end
   [200, {'Content-Type' => 'text/plain'}, body]
 }
 
 RedirectServlet = Proc.new {|env|
+  url_scheme = env.fetch('rack.url_scheme')
   port = env.fetch('SERVER_PORT')
-  [301, {'Location' => "http://localhost:#{port}/test"}, []]
+  [301, {'Location' => "#{url_scheme}://localhost:#{port}/test"}, []]
 }
 
 EvilRedirectServlet = Proc.new {|env|
@@ -76,8 +84,8 @@ EvilRedirectServlet = Proc.new {|env|
 }
 
 BodyReadback = Proc.new {|env|
-  readback = {'method' => env['REQUEST_METHOD'], 'body' => env['rack.input'].read, 'content_type' => env.fetch('HTTP_CONTENT_TYPE')}
-  [200, {'Content-Type' => 'text/plain'}, [readback]]
+  readback = {'method' => env['REQUEST_METHOD'], 'body' => env['rack.input'].read, 'content_type' => env.fetch('CONTENT_TYPE')}
+  [200, {'Content-Type' => 'text/plain'}, [OpenStruct.new(readback).to_yaml]]
 }
 
 TestPatchBodyServlet = BodyReadback
@@ -94,7 +102,13 @@ RepetitiveHeaderServlet = Proc.new {|env|
 }
 
 PictureServlet = Proc.new {|env|
-  [200, {'Content-Type' => 'image/png'}, [File.read('./pic.png')]]
+  # Rack::File allows us to test Range support as well
+  env_with_adjusted_path = env.merge('PATH_INFO' => Rack::Utils.escape('/pic.png'))
+  Rack::File.new('./').call(env_with_adjusted_path)
+}
+
+RedirectToPictureServlet = Proc.new {|env|
+  [307, {'Location' => '/picture'}, []]
 }
 
 WrongContentLengthServlet = Proc.new {|env|
@@ -103,10 +117,11 @@ WrongContentLengthServlet = Proc.new {|env|
 
 # Serves a substantial amount of data
 LargeServlet = Proc.new {|env|
+  rng = Random.new
   len = 15 * 1024 * 1024
   body = Enumerator.new do |y|
     15.times do
-      y.yield(Random.new.bytes(1024 * 1024))
+      y.yield(rng.bytes(1024 * 1024))
     end
   end
   [200, {'Content-Type' => 'binary/octet-stream', 'Content-Length' => len.to_s}, body]
@@ -122,6 +137,7 @@ run Rack::URLMap.new({
   "/redirect" => RedirectServlet,
   "/evil-redirect" => EvilRedirectServlet,
   "/picture" => PictureServlet,
+  "/redirect-to-picture" => RedirectToPictureServlet,
   "/very-large" => LargeServlet,
   "/setcookie" => SetCookieServlet,
   "/repetitiveheader" => RepetitiveHeaderServlet,

data/spec/support/fork.rb

@@ -0,0 +1,70 @@
+require 'thread'
+
+class Fork
+  def initialize(&block)
+    @mu = Mutex.new
+    @cond = ConditionVariable.new
+    @pstate = nil
+    @pid = Process.fork(&block)
+    @killed = false
+
+    # Start monitoring the PID.
+    Thread.new { monitor }
+
+    # Kill the process anyway when the program exits.
+    ppid = Process.pid
+    at_exit do
+      if ppid == Process.pid # Make sure we are not inside another fork spawned by rspec example.
+        do_kill("KILL")
+      end
+    end
+  end
+
+  # Wait for process to exit.
+  def wait(timeout = nil)
+    @mu.synchronize do
+      next @pstate unless @pstate.nil?
+
+      @cond.wait(@mu, timeout)
+      @pstate
+    end
+  end
+
+  # Signal the process.
+  def kill(sig)
+    already_killed = @mu.synchronize do
+      old = @killed
+      @killed = true
+      old
+    end
+    signaled = do_kill(sig)
+    Thread.new { reaper } if signaled && !already_killed
+    signaled
+  end
+
+  private
+
+  # Signal the process.
+  def do_kill(sig)
+    Process.kill(sig, @pid)
+    true
+  rescue Errno::ESRCH # No such process
+    false
+  end
+
+  # Monitor the process state.
+  def monitor
+    _, pstate = Process.wait2(@pid)
+
+    @mu.synchronize do
+      @pstate = pstate
+      @cond.broadcast
+    end
+  end
+
+  # Wait 500 milliseconds and force terminate.
+  def reaper
+    pstate = wait(0.5)
+    do_kill("KILL") unless pstate
+  end
+end

data/spec/support/test_server.rb

@@ -3,18 +3,24 @@ require 'puma'
 require 'rack/handler/puma'
 
 class PatronTestServer
-  APP = Rack::Builder.new { eval(File.read(File.dirname(__FILE__) + '/config.ru')) }
+  APP = Rack::Builder.new { eval(File.read(File.join(__dir__, 'config.ru'))) }
 
   def self.start(ssl = false, port = 9001 )
+    # Reset the RSpec's SIGINT handler that does not really terminate after
+    # the first Ctrl+C pressed.
+    # Useful to terminate the forked process before Puma is actually started:
+    # it happens when running one particular example that does not need Puma
+    # so the specs are in fact finished before the Puma started.
+    Signal.trap('INT', 'EXIT')
     @ssl = ssl
-    keypath = File.expand_path(File.read(File.dirname(__FILE__) + '/../certs/privkey.pem'))
-    certpath = File.expand_path(File.read(File.dirname(__FILE__) + '/../certs/cacert.pem'))
+    keypath = File.join(__dir__, 'certs', 'privkey.pem')
+    certpath = File.join(__dir__, 'certs', 'cacert.pem')
 
     host = if ssl
-      'ssl://127.0.0.1:%d?key=%s&cert=%s' % [port, keypath, certpath]
+      'ssl://0.0.0.0:%d?key=%s&cert=%s' % [port, keypath, certpath]
     else
-      'tcp://127.0.0.1:%d' % port
+      '0.0.0.0'
     end
-    Rack::Handler::Puma.run(APP, {:Port => port.to_i, :Verbose => true, :Host => '0.0.0.0'})
+    Rack::Handler::Puma.run(APP, {:Port => port.to_i, :Verbose => true, :Host => host})
   end
 end

metadata

@@ -1,136 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: patron
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.4
 platform: ruby
 authors:
-- Phillip Toland
-autorequire: 
+- Aeryn Riley Dowling-Toland
 bindir: exe
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2025-02-27 00:00:00.000000000 Z
+dependencies: []
 description: Ruby HTTP client library based on libcurl
 email:
-- phil.toland@gmail.com
+- aeryn.toland@gmail.com
 executables: []
 extensions:
 - ext/patron/extconf.rb
 extra_rdoc_files: []
 files:
 - ".autotest"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -160,8 +48,6 @@ files:
 - pic.png
 - script/console
 - script/test_server
-- spec/certs/cacert.pem
-- spec/certs/privkey.pem
 - spec/header_parser_spec.rb
 - spec/patron_spec.rb
 - spec/request_spec.rb
@@ -175,17 +61,21 @@ files:
 - spec/session_spec.rb
 - spec/session_ssl_spec.rb
 - spec/spec_helper.rb
+- spec/support/certs/cacert.pem
+- spec/support/certs/privkey.pem
 - spec/support/config.ru
+- spec/support/fork.rb
 - spec/support/test_server.rb
 - spec/util_spec.rb
 homepage: https://github.com/toland/patron
-licenses: []
+licenses:
+- MIT
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |2
 
   Thank you for installing Patron. On OSX, make sure you are using libCURL with OpenSSL.
-  SecureTransport-based builds might cause crashes in forking environment.
+  SecureTransport-based builds might cause crashes in forking environments.
 
   For more info see https://github.com/curl/curl/issues/788
 rdoc_options: []
@@ -203,9 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.2.0
 requirements: []
-rubyforge_project: patron
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Patron HTTP Client
 test_files: []