ethon 0.5.7 → 0.5.8

data/CHANGELOG.md

@@ -2,7 +2,16 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.7...master)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.8...master)
+
+## 0.5.8
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.7...v0.5.8)
+
+Enhancements:
+
+* Add support for protocols and redir_protocols(
+  [libcurl SASL buffer overflow vulnerability](http://curl.haxx.se/docs/adv_20130206.html)).
 
 ## 0.5.7
 

data/lib/ethon/curl.rb

@@ -4,6 +4,7 @@ require 'ethon/curls/http_versions'
 require 'ethon/curls/infos'
 require 'ethon/curls/form_options'
 require 'ethon/curls/auth_types'
+require 'ethon/curls/protocols'
 require 'ethon/curls/proxy_types'
 require 'ethon/curls/ssl_versions'
 require 'ethon/curls/messages'
@@ -25,6 +26,7 @@ module Ethon
     extend Ethon::Curls::ProxyTypes
     extend Ethon::Curls::SslVersions
     extend Ethon::Curls::Messages
+    extend Ethon::Curls::Protocols
 
 
     require 'ethon/curls/constants'

data/lib/ethon/curls/auth_types.rb

@@ -12,12 +12,12 @@ module Ethon
       # @return [ Hash ] The auth types.
       def auth_types
         {
-          :basic =>       0x01,
-          :digest =>      0x02,
-          :gssnegotiate =>0x04,
-          :ntlm =>        0x08,
-          :digest_ie =>   0x10,
-          :auto =>        0x1f
+          :basic        => 0x01,
+          :digest       => 0x02,
+          :gssnegotiate => 0x04,
+          :ntlm         => 0x08,
+          :digest_ie    => 0x10,
+          :auto         => 0x1f
         }
       end
     end

data/lib/ethon/curls/constants.rb

@@ -38,6 +38,9 @@ module Ethon
     # :nodoc:
     Auth = enum(auth_types.to_a.flatten)
 
+    # :nodoc:
+    Protocols = enum(protocols.to_a.flatten)
+
     # :nodoc:
     Proxy = enum(proxy_types.to_a.flatten)
 

data/lib/ethon/curls/protocols.rb

@@ -0,0 +1,36 @@
+module Ethon
+  module Curls
+    module Protocols
+      def protocols
+        {
+          :http   => 0x00000001,
+          :https  => 0x00000002,
+          :ftp    => 0x00000004,
+          :ftps   => 0x00000008,
+          :scp    => 0x00000010,
+          :sftp   => 0x00000020,
+          :telnet => 0x00000040,
+          :ldap   => 0x00000080,
+          :ldaps  => 0x00000100,
+          :dict   => 0x00001200,
+          :file   => 0x00001400,
+          :tftp   => 0x00001800,
+          :imap   => 0x00011000,
+          :imaps  => 0x00012000,
+          :pop3   => 0x00014000,
+          :pop3s  => 0x00018000,
+          :smtp   => 0x00110000,
+          :smtps  => 0x00120000,
+          :rtsp   => 0x00140000,
+          :rtmp   => 0x00180000,
+          :rtmpt  => 0x02100000,
+          :rtmpe  => 0x02200000,
+          :rtmpte => 0x02400000,
+          :rtmps  => 0x02800000,
+          :rtmpts => 0x21000000,
+          :gopher => 0x22000000,
+        }
+      end
+    end
+  end
+end

data/lib/ethon/easy/options.rb

@@ -446,6 +446,42 @@ module Ethon
         Curl.set_option(:postfieldsize, value_for(value, :int), handle)
       end
 
+      # Pass a long that holds a bitmask of CURLPROTO_* defines. If used, this
+      # bitmask limits what protocols libcurl may use in the transfer. This
+      # allows you to have a libcurl built to support a wide range of protocols
+      # but still limit specific transfers to only be allowed to use a subset
+      # of them. By default libcurl will accept all protocols it supports. See
+      # also CURLOPT_REDIR_PROTOCOLS. (Added in 7.19.4)
+      #
+      # @example Set protocols option.
+      #   easy.protocols = :http
+      #
+      # @param [ Symbol ] value The value to set.
+      #
+      # @return [ void ]
+      def protocols=(value)
+        Curl.set_option(:protocols, value_for(value, :enum, :protocols), handle)
+      end
+
+      # Pass a long that holds a bitmask of CURLPROTO_* defines. If used, this
+      # bitmask limits what protocols libcurl may use in a transfer that it
+      # follows to in a redirect when CURLOPT_FOLLOWLOCATION is enabled. This
+      # allows you to limit specific transfers to only be allowed to use a
+      # subset of protocols in redirections. By default libcurl will allow all
+      # protocols except for FILE and SCP. This is a difference compared to
+      # pre-7.19.4 versions which unconditionally would follow to all protocols
+      # supported. (Added in 7.19.4)
+      #
+      # @example Set redir_protocols option.
+      #   easy.redir_protocols = :http
+      #
+      # @param [ Symbol ] value The value to set.
+      #
+      # @return [ void ]
+      def redir_protocols=(value)
+        Curl.set_option(:redir_protocols, value_for(value, :enum, :redir_protocols), handle)
+      end
+
       # Set HTTP proxy to use. The parameter should be a string to a zero
       # terminated string holding the host name or dotted IP address. To
       # specify port number in this string, append :[port] to the end of the
@@ -1069,6 +1105,10 @@ module Ethon
           Curl::HTTPVersion.to_h.fetch(value) do
             raise Errors::InvalidValue.new(option, value)
           end
+        elsif type == :enum && (option == :protocols || option == :redir_protocols)
+          Curl::Protocols.to_h.fetch(value) do
+            raise Errors::InvalidValue.new(option, value)
+          end
         elsif type == :enum && option == :proxytype
           Curl::Proxy.to_h.fetch(value) do
             raise Errors::InvalidValue.new(option, value)

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -61,6 +61,7 @@ files:
 - lib/ethon/curls/infos.rb
 - lib/ethon/curls/messages.rb
 - lib/ethon/curls/options.rb
+- lib/ethon/curls/protocols.rb
 - lib/ethon/curls/proxy_types.rb
 - lib/ethon/curls/settings.rb
 - lib/ethon/curls/ssl_versions.rb
@@ -123,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 202971175461885038
+      hash: -3892708119982430515
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: