ssrf_filter 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59270dd5ca4e6fdf5e70fc74e2c1593eea7cd861
-  data.tar.gz: f23dbbcc57ea0114ae1220e22f93b5f1fa7910da
+  metadata.gz: 2e7c6b603a075892984767c0e84bdc31acef8a94
+  data.tar.gz: ad328c0f06c37ab4ce7f33610e5f6b16ee0a3537
 SHA512:
-  metadata.gz: c6ed09a682cd405c1cf06429b173f87965ff67231bd748a9520ee4c9fe8ed27d84df373abd917c3c25935dfcee984f5cc5c1b4b327548accd3694b6587ce9249
-  data.tar.gz: 73697be1c1619bda43e8fc7c517380f0f40155de9f20012d79390a58ef9122bec392a443661e0ffae93fb48a04a6aa6bc874b8a7aea9d1a59a1e8c460c317881
+  metadata.gz: 553c787de96785842f54c22f4ca9ae85b417ce38139ee93daa95deea1f0ca39383150bc242099d63fa4cea9161508cc4f58e27e06bcc5958bca1d58e7fed1744
+  data.tar.gz: f010ffafa1cdf23f45426f33b37eda10df5ad4ac27bef1e4d79851728c2ce3a24e52b62cb8b2c03a11400a0b7db29329672d6be101562d03152df3f0a1641eb5

data/lib/ssrf_filter.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 
+require 'ssrf_filter/patch/http_generic_request'
+require 'ssrf_filter/patch/ssl_socket'
 require 'ssrf_filter/ssrf_filter'
 require 'ssrf_filter/version'

data/lib/ssrf_filter/patch/http_generic_request.rb

@@ -0,0 +1,83 @@
+require 'stringio'
+
+class SsrfFilter
+  module Patch
+    module HTTPGenericRequest
+      # Ruby had a bug in its Http library where if you set a custom `Host` header on a request it would get
+      # overwritten. This was tracked in:
+      # https://bugs.ruby-lang.org/issues/10054
+      # and resolved with the commit:
+      # https://github.com/ruby/ruby/commit/70a2eb63999265ff7e8d46d1f5b410c8ee3d30d7#diff-5c08b4ae27d2294a8294a27ff9af4a85
+      # Versions of Ruby that don't have this fix applied will fail to connect to certain hosts via SsrfFilter. The
+      # patch below backports the fix from the linked commit.
+
+      def self.should_apply?
+        # Check if the patch needs to be applied:
+        # The Ruby bug was that HTTPGenericRequest#exec overwrote the Host header, so this snippet checks
+        # if we can reproduce that behavior. It does not actually open any network connections.
+
+        uri = URI('https://www.example.com')
+        request = ::Net::HTTPGenericRequest.new('HEAD', false, false, uri)
+        request['host'] = '127.0.0.1'
+        request.exec(StringIO.new, '1.1', '/')
+        request['host'] == uri.hostname
+      end
+
+      # Apply the patch from the linked commit onto ::Net::HTTPGenericRequest. Since this is 3rd party code,
+      # disable code coverage and rubocop linting for this section.
+      # :nocov:
+      # rubocop:disable all
+      def self.apply!
+        return if instance_variable_defined?(:@checked_http_generic_request)
+        @checked_http_generic_request = true
+        return unless should_apply?
+
+        ::Net::HTTPGenericRequest.class_eval do
+          def exec(sock, ver, path)
+            if @body
+              send_request_with_body sock, ver, path, @body
+            elsif @body_stream
+              send_request_with_body_stream sock, ver, path, @body_stream
+            elsif @body_data
+              send_request_with_body_data sock, ver, path, @body_data
+            else
+              write_header sock, ver, path
+            end
+          end
+
+          def update_uri(addr, port, ssl)
+            # reflect the connection and @path to @uri
+            return unless @uri
+
+            if ssl
+              scheme = 'https'.freeze
+              klass = URI::HTTPS
+            else
+              scheme = 'http'.freeze
+              klass = URI::HTTP
+            end
+
+            if host = self['host']
+              host.sub!(/:.*/s, ''.freeze)
+            elsif host = @uri.host
+            else
+             host = addr
+            end
+            # convert the class of the URI
+            if @uri.is_a?(klass)
+              @uri.host = host
+              @uri.port = port
+            else
+              @uri = klass.new(
+                scheme, @uri.userinfo,
+                host, port, nil,
+                @uri.path, nil, @uri.query, nil)
+            end
+          end
+        end
+      end
+      # rubocop:enable all
+      # :nocov:
+    end
+  end
+end

data/lib/ssrf_filter/patch/ssl_socket.rb

@@ -0,0 +1,48 @@
+class SsrfFilter
+  module Patch
+    module SSLSocket
+      # When fetching a url we'd like to have the following workflow:
+      # 1) resolve the hostname www.example.com, and choose a public ip address to connect to
+      # 2) connect to that specific ip address, to prevent things like DNS TOCTTOU bugs or other trickery
+      #
+      # Ideally this would happen by the ruby http library giving us control over DNS resolution,
+      # but it doesn't. Instead, when making the request we set the uri.hostname to the chosen ip address,
+      # and send a 'Host' header of the original hostname, i.e. connect to 'http://93.184.216.34/' and send
+      # a 'Host: www.example.com' header.
+      #
+      # This works for the http case, http://www.example.com. For the https case, this causes certificate
+      # validation failures, since the server certificate for https://www.example.com will not have a
+      # Subject Alternate Name for 93.184.216.34.
+      #
+      # Thus we perform the monkey-patch below, modifying SSLSocket's `post_connection_check(hostname)`
+      # and `hostname=(hostname)` methods:
+      # If our fiber local variable is set, use that for the hostname instead, otherwise behave as usual.
+      # The only time the variable will be set is if you are executing inside a `with_forced_hostname` block,
+      # which is used in ssrf_filter.rb.
+      #
+      # An alternative approach could be to pass in our own OpenSSL::X509::Store with a custom
+      # `verify_callback` to the ::Net::HTTP.start call, but this would require reimplementing certification
+      # validation, which is dangerous. This way we can piggyback on the existing validation and simply pretend
+      # that we connected to the desired hostname.
+
+      def self.apply!
+        return if instance_variable_defined?(:@patched_ssl_socket)
+        @patched_ssl_socket = true
+
+        ::OpenSSL::SSL::SSLSocket.class_eval do
+          original_post_connection_check = instance_method(:post_connection_check)
+          define_method(:post_connection_check) do |hostname|
+            original_post_connection_check.bind(self).call(::Thread.current[::SsrfFilter::FIBER_LOCAL_KEY] || hostname)
+          end
+
+          if method_defined?(:hostname=)
+            original_hostname = instance_method(:hostname=)
+            define_method(:hostname=) do |hostname|
+              original_hostname.bind(self).call(::Thread.current[::SsrfFilter::FIBER_LOCAL_KEY] || hostname)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ssrf_filter/ssrf_filter.rb

@@ -100,6 +100,9 @@ class SsrfFilter
 
   %i[get put post delete].each do |method|
     define_singleton_method(method) do |url, options = {}, &block|
+      ::SsrfFilter::Patch::SSLSocket.apply!
+      ::SsrfFilter::Patch::HTTPGenericRequest.apply!
+
       original_url = url
       scheme_whitelist = options[:scheme_whitelist] || DEFAULT_SCHEME_WHITELIST
       resolver = options[:resolver] || DEFAULT_RESOLVER
@@ -207,52 +210,7 @@ class SsrfFilter
   end
   private_class_method :validate_request
 
-  def self.patch_ssl_socket!
-    return if instance_variable_defined?(:@patched_ssl_socket)
-
-    # What we'd like to do is have the following workflow:
-    # 1) resolve the hostname www.example.com, and choose a public ip address to connect to
-    # 2) connect to that specific ip address, to prevent things like DNS TOCTTOU bugs or other trickery
-    #
-    # Ideally this would happen by the ruby http library giving us control over DNS resolution,
-    # but it doesn't. Instead, when making the request we set the uri.hostname to the chosen ip address,
-    # and send a 'Host' header of the original hostname, i.e. connect to 'http://93.184.216.34/' and send
-    # a 'Host: www.example.com' header.
-    #
-    # This works for the http case, http://www.example.com. For the https case, this causes certificate
-    # validation failures, since the server certificate does not have a Subject Alternate Name for 93.184.216.34.
-    #
-    # Thus we perform the monkey-patch below, modifying SSLSocket's `post_connection_check(hostname)`
-    # and `hostname=(hostname)` methods:
-    # If our fiber local variable is set, use that for the hostname instead, otherwise behave as usual.
-    # The only time the variable will be set is if you are executing inside a `with_forced_hostname` block,
-    # which is used above.
-    #
-    # An alternative approach could be to pass in our own OpenSSL::X509::Store with a custom
-    # `verify_callback` to the ::Net::HTTP.start call, but this would require reimplementing certification
-    # validation, which is dangerous. This way we can piggyback on the existing validation and simply pretend
-    # that we connected to the desired hostname.
-
-    ::OpenSSL::SSL::SSLSocket.class_eval do
-      original_post_connection_check = instance_method(:post_connection_check)
-      define_method(:post_connection_check) do |hostname|
-        original_post_connection_check.bind(self).call(::Thread.current[FIBER_LOCAL_KEY] || hostname)
-      end
-
-      if method_defined?(:hostname=)
-        original_hostname = instance_method(:hostname=)
-        define_method(:hostname=) do |hostname|
-          original_hostname.bind(self).call(::Thread.current[FIBER_LOCAL_KEY] || hostname)
-        end
-      end
-    end
-
-    @patched_ssl_socket = true
-  end
-  private_class_method :patch_ssl_socket!
-
   def self.with_forced_hostname(hostname, &_block)
-    patch_ssl_socket!
     ::Thread.current[FIBER_LOCAL_KEY] = hostname
     yield
   ensure

data/lib/ssrf_filter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class SsrfFilter
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssrf_filter
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Arkadiy Tetelman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ssrf_filter.rb
+- lib/ssrf_filter/patch/http_generic_request.rb
+- lib/ssrf_filter/patch/ssl_socket.rb
 - lib/ssrf_filter/ssrf_filter.rb
 - lib/ssrf_filter/version.rb
 homepage: https://github.com/arkadiyt/ssrf_filter