ssrf_filter 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e7c6b603a075892984767c0e84bdc31acef8a94
-  data.tar.gz: ad328c0f06c37ab4ce7f33610e5f6b16ee0a3537
+SHA256:
+  metadata.gz: 97b1c63593031040d2f23b6fbb055c44490fc2624a5b9901203053c971991ba6
+  data.tar.gz: ca816401abe0177feea5fd70d01afd19758598cd9864659a8eb97e7184367830
 SHA512:
-  metadata.gz: 553c787de96785842f54c22f4ca9ae85b417ce38139ee93daa95deea1f0ca39383150bc242099d63fa4cea9161508cc4f58e27e06bcc5958bca1d58e7fed1744
-  data.tar.gz: f010ffafa1cdf23f45426f33b37eda10df5ad4ac27bef1e4d79851728c2ce3a24e52b62cb8b2c03a11400a0b7db29329672d6be101562d03152df3f0a1641eb5
+  metadata.gz: 75ae3f265b486cb8768ef0c49d3dd0313a218b3863a2c1dfc8615727453aea45ab7ae5f71289e3748eecb9e17dc09443870413937c7fbad56a9a7a225b2fbb89
+  data.tar.gz: c881ea003dafd105bbbff4001646a879fc4cefb18d722fc60f21281c8ebaca8b19a324dccadb9acdf799e56501905addebcfe8f91253ee52136a9dab433335ad

data/lib/ssrf_filter/patch/ssl_socket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SsrfFilter
   module Patch
     module SSLSocket
@@ -27,6 +29,7 @@ class SsrfFilter
 
       def self.apply!
         return if instance_variable_defined?(:@patched_ssl_socket)
+
         @patched_ssl_socket = true
 
         ::OpenSSL::SSL::SSLSocket.class_eval do

data/lib/ssrf_filter/ssrf_filter.rb

@@ -10,7 +10,9 @@ class SsrfFilter
     mask_addr = ipaddr.instance_variable_get('@mask_addr')
     raise ArgumentError, 'Invalid mask' if mask_addr.zero?
 
-    mask_addr >>= 1 while (mask_addr & 0x1).zero?
+    while (mask_addr & 0x1).zero?
+      mask_addr >>= 1
+    end
 
     length = 0
     while mask_addr & 0x1 == 0x1
@@ -53,11 +55,12 @@ class SsrfFilter
     ::IPAddr.new('2002::/16'), # 6to4
     ::IPAddr.new('fc00::/7'), # Unique local address
     ::IPAddr.new('fe80::/10'), # Link-local address
-    ::IPAddr.new('ff00::/8'), # Multicast
+    ::IPAddr.new('ff00::/8') # Multicast
   ] + IPV4_BLACKLIST.flat_map do |ipaddr|
     prefixlen = prefixlen_from_ipaddr(ipaddr)
 
-    ipv4_compatible = ipaddr.ipv4_compat.mask(96 + prefixlen)
+    # Don't call ipaddr.ipv4_compat because it prints out a deprecation warning on ruby 2.5+
+    ipv4_compatible = IPAddr.new(ipaddr.to_i, Socket::AF_INET6).mask(96 + prefixlen)
     ipv4_mapped = ipaddr.ipv4_mapped.mask(80 + prefixlen)
 
     [ipv4_compatible, ipv4_mapped]
@@ -75,7 +78,9 @@ class SsrfFilter
     get: ::Net::HTTP::Get,
     put: ::Net::HTTP::Put,
     post: ::Net::HTTP::Post,
-    delete: ::Net::HTTP::Delete
+    delete: ::Net::HTTP::Delete,
+    head: ::Net::HTTP::Head,
+    patch: ::Net::HTTP::Patch
   }.freeze
 
   FIBER_LOCAL_KEY = :__ssrf_filter_hostname
@@ -98,10 +103,9 @@ class SsrfFilter
   class CRLFInjection < Error
   end
 
-  %i[get put post delete].each do |method|
+  %i[get put post delete head patch].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
@@ -123,16 +127,8 @@ class SsrfFilter
         public_addresses = ip_addresses.reject(&method(:unsafe_ip_address?))
         raise PrivateIPAddress, "Hostname '#{hostname}' has no public ip addresses" if public_addresses.empty?
 
-        response = fetch_once(uri, public_addresses.sample.to_s, method, options, &block)
-
-        case response
-        when ::Net::HTTPRedirection then
-          url = response['location']
-          # Handle relative redirects
-          url = "#{uri.scheme}://#{hostname}:#{uri.port}#{url}" if url.start_with?('/')
-        else
-          return response
-        end
+        response, url = fetch_once(uri, public_addresses.sample.to_s, method, options, &block)
+        return response if url.nil?
       end
 
       raise TooManyRedirects, "Got #{max_redirects} redirects fetching #{original_url}"
@@ -168,7 +164,7 @@ class SsrfFilter
 
   def self.fetch_once(uri, ip, verb, options, &block)
     if options[:params]
-      params = uri.query ? ::Hash[::URI.decode_www_form(uri.query)] : {}
+      params = uri.query ? ::URI.decode_www_form(uri.query).to_h : {}
       params.merge!(options[:params])
       uri.query = ::URI.encode_www_form(params)
     end
@@ -185,13 +181,26 @@ class SsrfFilter
 
     request.body = options[:body] if options[:body]
 
-    block.call(request) if block_given?
+    options[:request_proc].call(request) if options[:request_proc].respond_to?(:call)
     validate_request(request)
 
-    use_ssl = uri.scheme == 'https'
+    http_options = options[:http_options] || {}
+    http_options[:use_ssl] = (uri.scheme == 'https')
+
     with_forced_hostname(hostname) do
-      ::Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
-        http.request(request)
+      ::Net::HTTP.start(uri.hostname, uri.port, **http_options) do |http|
+        http.request(request) do |response|
+          case response
+          when ::Net::HTTPRedirection
+            url = response['location']
+            # Handle relative redirects
+            url = "#{uri.scheme}://#{hostname}:#{uri.port}#{url}" if url.start_with?('/')
+            return nil, url
+          else
+            block&.call(response)
+            return response, nil
+          end
+        end
       end
     end
   end

data/lib/ssrf_filter/version.rb

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

data/lib/ssrf_filter.rb

@@ -1,6 +1,5 @@
 # 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssrf_filter
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Arkadiy Tetelman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -16,87 +16,143 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: pry-byebug
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 1.35.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 1.35.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.18.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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'
 description: A gem that makes it easy to prevent server side request forgery (SSRF)
   attacks
-email: 
+email:
 executables: []
 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
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,16 +160,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A gem that makes it easy to prevent server side request forgery (SSRF) attacks
 test_files: []

data/lib/ssrf_filter/patch/http_generic_request.rb

@@ -1,83 +0,0 @@
-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