ethon 0.9.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5b8550d86c3b12a213c5f44bc47575cc155b57f
-  data.tar.gz: 9c23490c1d3184612dea6e1e88a293a7444f65a6
+SHA256:
+  metadata.gz: 558abec878f87a7e13113e513faf1dc5970cfcc12d3b0a8d4faaec50e847e1c9
+  data.tar.gz: 979dbda54e8b12f1a93fee6bb16db05c1960719f44c7d2152e5d9aaddd783d4e
 SHA512:
-  metadata.gz: 8dfc9939d7232e54526cd3aebcda6a8c058d0620efcd50204e6e9d9b19c40484a4ee117a1b64761f5bdefd130ea0842a169dc5ddb108f6b73ddb325748db5e74
-  data.tar.gz: 4abc8b70ff4da5bce7edf2e7ea75c22bab080ea68f211618bc350bad55ab8df1ad7e1dd8f304dcdb85a21499b524f7ff40d064e7a42ad7175b1b787f7e0a576a
+  metadata.gz: 63339cb7a38df43138df7fb52c88d8764d7b1f04bea134781338a676a6a567e8850b9ef24f5db1268a126f9d43b31f6d0ecc6b1441bd8bb6ef7572e7d2c366bd
+  data.tar.gz: f516c95eb23a3dd70d4ee25e76bd100d2cb5d2cf38fd8d626c584c2b71e9307084b0d07598d01c595447c5b241b50a58259aca7da29cdc65db404ebf9fb622f7

data/.github/workflows/ruby.yml

@@ -0,0 +1,41 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, macos]
+        ruby-version: [2.5, 2.6, 2.7, 3.0, head, debug, truffleruby, truffleruby-head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install libcurl header
+      run: |
+        if ${{ matrix.os == 'macos' }}
+        then
+          brew install curl
+        else
+          sudo apt install -y libcurl4-openssl-dev
+        fi
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 .yardoc
 doc
 coverage
+.idea

data/CHANGELOG.md

@@ -2,7 +2,26 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.9.1...master)
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.12.0...master)
+
+## 0.12.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.11.0...v0.12.0)
+
+- Removed deprecated `CURLE_SSL_CACERT` pinned in curl v7.62.0 ([@arku](https://github.com/arku) in [#158](https://github.com/typhoeus/ethon/pull/158))
+
+
+## 0.11.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.10.1...v0.11.0)
+
+## 0.10.1
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.10.0...v0.10.1)
+
+## 0.10.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.9.1...v0.10.0)
 
 ## 0.9.1
 

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 gemspec
 
@@ -18,11 +19,20 @@ group :development, :test do
     gem "json"
   end
 
-  gem "mime-types", "~> 1.18"
+  if Gem.ruby_version >= Gem::Version.new("2.0.0")
+    gem "mime-types", "~> 1.18"
+  end
+
+  if Gem.ruby_version >= Gem::Version.new("2.2.0")
+    gem "mustermann"
+  elsif Gem.ruby_version >= Gem::Version.new("2.1.0")
+    gem "mustermann", "0.4.0"
+  elsif Gem.ruby_version >= Gem::Version.new("2.0.0")
+    gem "mustermann", "0.3.1"
+  end
 
-  unless ENV["CI"]
-    gem "guard-rspec", "~> 0.7"
-    gem "rb-fsevent", "~> 0.9.1"
+  if Gem.ruby_version >= Gem::Version.new("3.0.0")
+    gem "webrick"
   end
 end
 

data/Guardfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # vim:set filetype=ruby:
 guard(
   "rspec",

data/README.md

@@ -1,4 +1,7 @@
-#  Ethon [![Build Status](https://secure.travis-ci.org/typhoeus/ethon.png?branch=master)](http://travis-ci.org/typhoeus/ethon) [![Gem Version](https://badge.fury.io/rb/ethon.png)](http://badge.fury.io/rb/ethon)
+[![Gem Version](https://badge.fury.io/rb/ethon.svg)](https://badge.fury.io/rb/ethon)
+[![Build Status](https://github.com/typhoeus/ethon/workflows/Ruby/badge.svg)](https://github.com/typhoeus/ethon/actions/workflows/ruby.yml)
+
+#  Ethon
 
 In Greek mythology, Ethon, the son of Typhoeus and Echidna, is a gigantic eagle. So much for the history.
 In the modern world, Ethon is a very basic libcurl wrapper using ffi.

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler"
 Bundler.setup
 

data/ethon.gemspec

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
@@ -17,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.license = 'MIT'
 
-  s.add_dependency('ffi', ['>= 1.3.0'])
+  s.add_dependency('ffi', ['>= 1.15.0'])
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

data/lib/ethon.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 require 'logger'
 require 'ffi'
+require 'ffi/tools/const_generator'
 require 'thread'
 begin
   require 'mime/types/columnar'

data/lib/ethon/curl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/curls/codes'
 require 'ethon/curls/options'
 require 'ethon/curls/infos'

data/lib/ethon/curls/classes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     # :nodoc:
@@ -32,7 +33,7 @@ module Ethon
         def clear; self[:fd_count] = 0; end
       else
         # FD Set size.
-        FD_SETSIZE = ::Ethon::Libc.getdtablesize
+        FD_SETSIZE = ::Ethon::Libc.sysconf(:open_max)
         layout :fds_bits, [:long, FD_SETSIZE / ::FFI::Type::LONG.size]
 
         # :nodoc:

data/lib/ethon/curls/codes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls # :nodoc:
 
@@ -69,7 +70,6 @@ module Ethon
           :obsolete57,
           :ssl_certproblem,
           :ssl_cipher,
-          :ssl_cacert,
           :bad_content_encoding,
           :ldap_invalid_url,
           :filesize_exceeded,

data/lib/ethon/curls/constants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     # :nodoc:

data/lib/ethon/curls/form_options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 

data/lib/ethon/curls/functions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 
@@ -13,13 +14,8 @@ module Ethon
 
         base.attach_function :easy_init,                  :curl_easy_init,           [],                             :pointer
         base.attach_function :easy_cleanup,               :curl_easy_cleanup,        [:pointer],                     :void
-        base.attach_function :easy_getinfo,               :curl_easy_getinfo,        [:pointer, :info, :pointer],    :easy_code
-        base.attach_function :easy_setopt_ffipointer,     :curl_easy_setopt,         [:pointer, :easy_option, :pointer],  :easy_code
-        base.attach_function :easy_setopt_string,         :curl_easy_setopt,         [:pointer, :easy_option, :string],   :easy_code
-        base.attach_function :easy_setopt_long,           :curl_easy_setopt,         [:pointer, :easy_option, :long],     :easy_code
-        base.attach_function :easy_setopt_callback,       :curl_easy_setopt,         [:pointer, :easy_option, :callback], :easy_code
-        base.attach_function :easy_setopt_debug_callback, :curl_easy_setopt,         [:pointer, :easy_option, :debug_callback], :easy_code
-        base.attach_function :easy_setopt_off_t,          :curl_easy_setopt,         [:pointer, :easy_option, :int64],    :easy_code
+        base.attach_function :easy_getinfo,               :curl_easy_getinfo,        [:pointer, :info, :varargs],    :easy_code
+        base.attach_function :easy_setopt,                :curl_easy_setopt,         [:pointer, :easy_option, :varargs], :easy_code
         base.instance_variable_set(:@blocking, true)
         base.attach_function :easy_perform,               :curl_easy_perform,        [:pointer],                     :easy_code
         base.attach_function :easy_strerror,              :curl_easy_strerror,       [:easy_code],                   :string
@@ -39,11 +35,7 @@ module Ethon
         base.attach_function :multi_timeout,              :curl_multi_timeout,       [:pointer, :pointer],           :multi_code
         base.attach_function :multi_fdset,                :curl_multi_fdset,         [:pointer, Curl::FDSet.ptr, Curl::FDSet.ptr, Curl::FDSet.ptr, :pointer], :multi_code
         base.attach_function :multi_strerror,             :curl_multi_strerror,      [:int],                         :string
-        base.attach_function :multi_setopt_ffipointer,    :curl_multi_setopt,        [:pointer, :multi_option, :pointer],  :multi_code
-        base.attach_function :multi_setopt_string,        :curl_multi_setopt,        [:pointer, :multi_option, :string],   :multi_code
-        base.attach_function :multi_setopt_long,          :curl_multi_setopt,        [:pointer, :multi_option, :long],     :multi_code
-        base.attach_function :multi_setopt_callback,      :curl_multi_setopt,        [:pointer, :multi_option, :callback], :multi_code
-        base.attach_function :multi_setopt_off_t,         :curl_multi_setopt,        [:pointer, :multi_option, :int64],    :multi_code
+        base.attach_function :multi_setopt,               :curl_multi_setopt,        [:pointer, :multi_option, :varargs], :multi_code
 
         base.attach_function :version,                    :curl_version,             [],                             :string
         base.attach_function :version_info,               :curl_version_info,        [],                             Curl::VersionInfoData.ptr

data/lib/ethon/curls/infos.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 
@@ -106,7 +107,7 @@ module Ethon
       def get_info_string(option, handle)
         string_ptr = ::FFI::MemoryPointer.new(:pointer)
 
-        if easy_getinfo(handle, option, string_ptr) == :ok
+        if easy_getinfo(handle, option, :pointer, string_ptr) == :ok
           ptr=string_ptr.read_pointer
           ptr.null? ? nil : ptr.read_string
         end
@@ -124,7 +125,7 @@ module Ethon
       def get_info_long(option, handle)
         long_ptr = ::FFI::MemoryPointer.new(:long)
 
-        if easy_getinfo(handle, option, long_ptr) == :ok
+        if easy_getinfo(handle, option, :pointer, long_ptr) == :ok
           long_ptr.read_long
         end
       end
@@ -141,7 +142,7 @@ module Ethon
       def get_info_double(option, handle)
         double_ptr = ::FFI::MemoryPointer.new(:double)
 
-        if easy_getinfo(handle, option, double_ptr) == :ok
+        if easy_getinfo(handle, option, :pointer, double_ptr) == :ok
           double_ptr.read_double
         end
       end

data/lib/ethon/curls/messages.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 

data/lib/ethon/curls/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 
@@ -7,8 +8,7 @@ module Ethon
 
       OPTION_STRINGS = { :easy => 'easy_options', :multi => 'multi_options' }.freeze
       FOPTION_STRINGS = { :easy => 'EASY_OPTIONS', :multi => 'MULTI_OPTIONS' }.freeze
-      FTYPES = [:long, :string, :ffipointer, :callback, :debug_callback, :off_t]
-      FUNCS = Hash[*[:easy, :multi].zip([:easy, :multi].map { |t| Hash[*FTYPES.zip(FTYPES.map { |ft| "#{t}_setopt_#{ft}" }).flatten] }).flatten]
+      FUNCS = { :easy => 'easy_setopt', :multi => 'multi_setopt' }.freeze
       # Sets appropriate option for easy, depending on value type.
       def set_option(option, value, handle, type = :easy)
         type = type.to_sym unless type.is_a?(Symbol)
@@ -20,22 +20,22 @@ module Ethon
         when :none
           return if value.nil?
           value=1
-          func=:long
+          va_type=:long
         when :int
           return if value.nil?
-          func=:long
+          va_type=:long
           value=value.to_i
         when :bool
           return if value.nil?
-          func=:long
+          va_type=:long
           value=(value&&value!=0) ? 1 : 0
         when :time
           return if value.nil?
-          func=:long
+          va_type=:long
           value=value.to_i
         when :enum
           return if value.nil?
-          func=:long
+          va_type=:long
           value = case value
           when Symbol
             opthash[option][:opts][value]
@@ -46,7 +46,7 @@ module Ethon
           end.to_i
         when :bitmask
           return if value.nil?
-          func=:long
+          va_type=:long
           value = case value
           when Symbol
             opthash[option][:opts][value]
@@ -56,22 +56,22 @@ module Ethon
             value
           end.to_i
         when :string
-          func=:string
+          va_type=:string
           value=value.to_s unless value.nil?
         when :string_as_pointer
-          func = :ffipointer
+          va_type = :pointer
           s = ''
           s = value.to_s unless value.nil?
           value = FFI::MemoryPointer.new(:char, s.bytesize)
           value.put_bytes(0, s)
         when :string_escape_null
-          func=:string
+          va_type=:string
           value=Util.escape_zero_byte(value) unless value.nil?
         when :ffipointer
-          func=:ffipointer
+          va_type=:pointer
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? FFI::Pointer
         when :curl_slist
-          func=:ffipointer
+          va_type=:pointer
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? FFI::Pointer
         when :buffer
           raise NotImplementedError, "Ethon::Curls::Options option #{option} buffer type not implemented."
@@ -80,24 +80,26 @@ module Ethon
         when :cbdata
           raise NotImplementedError, "Ethon::Curls::Options option #{option} callback data type not implemented. Use Ruby closures."
         when :callback
-          func=:callback
+          va_type=:callback
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
         when :debug_callback
-          func=:debug_callback
+          va_type=:debug_callback
+          raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
+        when :progress_callback
+          va_type=:progress_callback
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
         when :off_t
           return if value.nil?
-          func=:off_t
+          va_type=:int64
           value=value.to_i
         end
 
-        if func==:long or func==:off_t then
-            bits=FFI.type_size(:long)*8 if func==:long
-            bits=FFI.type_size(:int64)*8 if func==:off_t
+        if va_type==:long or va_type==:int64 then
+            bits=FFI.type_size(va_type)*8
             tv=((value<0) ? value.abs-1 : value)
             raise Errors::InvalidValue.new(option,value) unless tv<(1<<bits)
         end
-        send(FUNCS[type][func], handle, opthash[option][:opt], value)
+        send(FUNCS[type], handle, opthash[option][:opt], va_type, value)
       end
 
       OPTION_TYPE_BASE = {
@@ -136,6 +138,7 @@ module Ethon
         :cbdata => :objectpoint,
         :callback => :functionpoint,
         :debug_callback => :functionpoint,
+        :progress_callback => :functionpoint,
         :off_t => :off_t,
       }
 
@@ -207,7 +210,7 @@ module Ethon
 
       option :multi, :socketfunction, :callback, 1
       option :multi, :socketdata, :cbdata, 2
-      option :multi, :pipelining, :bool, 3
+      option :multi, :pipelining, :int, 3
       option :multi, :timerfunction, :callback, 4
       option :multi, :timerdata, :cbdata, 5
       option :multi, :maxconnects, :int, 6
@@ -247,7 +250,8 @@ module Ethon
       option :easy, :opensocketdata, :cbdata, 164
       option :easy, :closesocketfunction, :callback, 208
       option :easy, :closesocketdata, :cbdata, 209
-      option :easy, :progressfunction, :callback, 56
+      option :easy, :path_as_is, :bool, 234
+      option :easy, :progressfunction, :progress_callback, 56
       option :easy, :progressdata, :cbdata, 57
       option :easy, :headerfunction, :callback, 79
       option :easy, :writeheader, :cbdata, 29
@@ -266,6 +270,8 @@ module Ethon
       option :easy, :chunk_data, :cbdata, 201
       option :easy, :fnmatch_function, :callback, 200
       option :easy, :fnmatch_data, :cbdata, 202
+      option :easy, :xferinfofunction, :progress_callback, 219
+      option :easy, :xferinfodata, :cbdata, 57
       ## ERROR OPTIONS
       option :easy, :errorbuffer, :buffer, 10, 256
       option :easy, :stderr, :dontuse_object, 37
@@ -286,6 +292,9 @@ module Ethon
       option :easy, :localportrange, :int, 140
       option :easy, :dns_cache_timeout, :int, 92
       option :easy, :dns_use_global_cache, :bool, 91 # Obsolete
+      option :easy, :dns_interface, :string, 221
+      option :easy, :dns_local_ip4, :string, 222
+      option :easy, :dns_shuffle_addresses, :bool, 275
       option :easy, :buffersize, :int, 98
       option :easy, :port, :int, 3
       option :easy, :tcp_nodelay, :bool, 121
@@ -335,7 +344,7 @@ module Ethon
       option :easy, :cookiesession, :bool, 96
       option :easy, :cookielist, :string, 135
       option :easy, :httpget, :bool, 80
-      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1]
+      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1, :httpv2_0]
       option :easy, :ignore_content_length, :bool, 136
       option :easy, :http_content_decoding, :bool, 158
       option :easy, :http_transfer_decoding, :bool, 157
@@ -411,6 +420,7 @@ module Ethon
       option :easy, :dns_servers, :string, 211
       option :easy, :accepttimeout_ms, :int, 212
       option :easy, :unix_socket_path, :string, 231
+      option :easy, :pipewait, :bool, 237
       option_alias :easy, :unix_socket_path, :unix_socket
       ## SSL and SECURITY OPTIONS
       option :easy, :sslcert, :string, 25
@@ -438,6 +448,8 @@ module Ethon
       option :easy, :krblevel, :string, 63
       option_alias :easy, :krblevel, :krb4level
       option :easy, :gssapi_delegation, :bitmask, 210, [:none, :policy_flag, :flag]
+      option :easy, :pinnedpublickey, :string, 230
+      option_alias :easy, :pinnedpublickey, :pinned_public_key
       ## SSH OPTIONS
       option :easy, :ssh_auth_types, :bitmask, 151, [:none, :publickey, :password, :host, :keyboard, :agent, {:any => [:all], :default => [:any]}]
       option :easy, :ssh_host_public_key_md5, :string, 162