cloudflare-rails 1.2.0 → 2.4.0.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd4b756d17197d18b6ed4daba9b3a98f4105410d95785f835013701fe372e813
-  data.tar.gz: 8be58cbbc6d6b7b32aa4280d3acc4c6c2fe8b7e77f06bc62dada0d080ca021a3
+  metadata.gz: c1a2e44d7bd29c0dc2341b7faf87c656a21ddb96396a611076ba9ddfae79c65c
+  data.tar.gz: 34b4900fc88e75206feeed25e1e5e43c88343e4a655b8fd8a1f28b71389642d3
 SHA512:
-  metadata.gz: 603165c9c4e53bcd4bbe0f608659cef70a6c2f20d6c96807d78007e7128613d13171a3126516f38c8caa181b759908321db4d2788325698392ca872a1799b4d3
-  data.tar.gz: 7e72201d4968db350b38d5f237b5a3e5931f1ec5fd921917b227e7b78dd3ed4f2fd0f641b09c5a3240d33892e980e322a4e73b4949612dc10690f7e5b1821e38
+  metadata.gz: 34575cf27372171d29709ae245d9527fd1a3fd0f7c696b3a1a759d55277708241b12270fe7d213c521648bd89779051d43729929d1d190bcda49c01ff5cada82
+  data.tar.gz: 3b85514ae3eed71fce038209c701044f2f003cd9d984f9e5fbe68ce11629660d5ef234793c8c88e69126a51a49b076e9f53364303db921897c7b6aa211ccc89c

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.7.0
+      - image: circleci/ruby:2.7.3
 
     working_directory: ~/repo
 
@@ -21,6 +21,11 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
+      - run:
+          name: install bundler
+          command: |
+            gem install bundler -v $(grep bundler cloudflare-rails.gemspec |awk {'print $4'}|sed 's/"//g')
+
       - run:
           name: install dependencies
           command: |

data/Appraisals

@@ -1,11 +1,3 @@
-appraise "rails-5.0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
-end
-
 appraise "rails-5.2" do
   gem "rails", "~> 5.2.0"
 end
@@ -17,3 +9,7 @@ end
 appraise "rails-6.1" do
   gem "rails", "~> 6.1.0"
 end
+
+appraise "rails-7.0" do
+  gem "rails", git: "https://github.com/rails/rails", branch: "main"
+end

data/CHANGELOG.md

@@ -4,7 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [2.4.0-beta.0] - 12-10-24
+- Skip fetching and caching of Cloudflare ip address when Rails::Console is defined or when ENV['DISABLE_CLOUDFLARE_RAILS] is set
+
+## [2.3.0] - 2021-10-22
+-  Better handling of malformed IP addresses (https://github.com/modosc/cloudflare-rails/pull/49)
+
+## [2.2.0] - 2021-06-11
+- Fix typo in `actionpack` dependency
+
+## [2.1.0] - 2021-06-11
+### Breaking Changes
+- Drop support for unsupported `rails` versions (`5.0.x` and `5.1.x`)
+
+### Added
+- use Net::HTTP instead of httparty ([pr](https://github.com/modosc/cloudflare-rails/pull/44))
+- Add `rails 7.0.0.alpha` support
+
+## [2.0.0] - 2021-02-17
+### Breaking Changes
+- Removed broad dependency on `rails`, replaced with explicit dependencies for `railties`, `activesupport`, and `actionpack` ( [issue](https://github.com/modosc/cloudflare-rails/issues/34) and [pr](https://github.com/modosc/cloudflare-rails/pull/35))
 
 ## [1.0.0] - 2020-09-29
 ### Added

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cloudflare-rails.gemspec
 gemspec
+
+group :development do
+  gem "rspec-isolation", git: "https://github.com/modosc/rspec-isolation"
+end

data/README.md

@@ -1,9 +1,13 @@
-# Cloudflare::Rails [![Gem Version](https://badge.fury.io/rb/cloudflare-rails.svg)](https://badge.fury.io/rb/cloudflare-rails) [![CircleCI](https://circleci.com/gh/modosc/cloudflare-rails/tree/master.svg?style=shield)](https://circleci.com/gh/modosc/cloudflare-rails/tree/master)
+# Cloudflare::Rails [![Gem Version](https://badge.fury.io/rb/cloudflare-rails.svg)](https://badge.fury.io/rb/cloudflare-rails) [![CircleCI](https://circleci.com/gh/modosc/cloudflare-rails/tree/main.svg?style=shield)](https://circleci.com/gh/modosc/cloudflare-rails/tree/main)
 This gem correctly configures Rails for [CloudFlare](https://www.cloudflare.com) so that `request.remote_ip` / `request.ip` both work correctly.
 
 ## Rails Compatibility
 
-This gem requires Rails >= 5. The last version that supports Rails 4.2 is `0.1.x`.
+This gem requires `railties`, `activesupport`, and `actionpack` >= `5.2`.
+
+For Rails `5.0` and `5.1` use `2.0.0`.
+
+For Rails `4.2` use `0.1.x`.
 
 ## Installation
 
@@ -25,7 +29,7 @@ And then execute:
 
 Using Cloudflare means it's hard to identify the IP address of incoming requests since all requests are proxied through Cloudflare's infrastructure. Cloudflare provides a [CF-Connecting-IP](https://support.cloudflare.com/hc/en-us/articles/200170986-How-does-Cloudflare-handle-HTTP-Request-headers-) header which can be used to identify the originating IP address of a request. However, this header alone doesn't verify a request is legitimate. If an attacker has found the actual IP address of your server they could spoof this header and masquerade as legitimate traffic.
 
-`cloudflare-rails` mitigates this attack by checking that the originating ip address of any incoming connecting is from one of Cloudflare's ip address ranges. If so, the incoming `X-Forwarded-For` header is trusted and used as the ip address provided to `rack` and `rails` (via `request.ip` and `request.remote_ip`). If the incoming connection does not originate from a Cloudflare server then the `X-Forwarded-For` header is ignored and the actual remote ip address is used.
+`cloudflare-rails` mitigates this attack by checking that the originating ip address of any incoming connection is from one of Cloudflare's ip address ranges. If so, the incoming `X-Forwarded-For` header is trusted and used as the ip address provided to `rack` and `rails` (via `request.ip` and `request.remote_ip`). If the incoming connection does not originate from a Cloudflare server then the `X-Forwarded-For` header is ignored and the actual remote ip address is used.
 
 ## Usage
 This code will fetch CloudFlare's current [IPv4](https://www.cloudflare.com/ips-v4) and [IPv6](https://www.cloudflare.com/ips-v6) lists, store them in `Rails.cache`, and add them to `config.cloudflare.ips`. The `X-Forwarded-For` header will then be trusted only from those ip addresses.

data/cloudflare-rails.gemspec

@@ -20,19 +20,21 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1.2"
+  spec.add_development_dependency "bundler", ">= 2.1.2"
   spec.add_development_dependency "rake", "~> 13.0.1"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
-  spec.add_development_dependency "rspec-rails", "~> 4.0.0"
+  spec.add_development_dependency "rspec-rails", "~> 5.0.1"
   spec.add_development_dependency "rspec", "~> 3.10.0"
   spec.add_development_dependency "rubocop-airbnb", "~> 3.0.2"
-  spec.add_development_dependency "webmock", "~> 3.11.0"
-  spec.add_development_dependency "rack-attack", "~> 6.4.0"
+  spec.add_development_dependency "webmock", "~> 3.13.0"
+  spec.add_development_dependency "rack-attack", "~> 6.5.0"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "climate_control"
 
-  spec.add_dependency "httparty"
-  spec.add_dependency "rails", ">= 5.0", "< 6.2.0"
+  spec.add_dependency "railties", ">= 5.2", "< 7.1.0"
+  spec.add_dependency "activesupport", ">= 5.2", "< 7.1.0"
+  spec.add_dependency "actionpack", ">= 5.2", "< 7.1.0"
 
   # we need Module#prepend
   spec.required_ruby_version = '>= 2.0'

data/gemfiles/rails_5.2.gemfile

@@ -4,4 +4,8 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
 
+group :development do
+  gem "rspec-isolation", git: "https://github.com/modosc/rspec-isolation"
+end
+
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -4,4 +4,8 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.0.0"
 
+group :development do
+  gem "rspec-isolation", git: "https://github.com/modosc/rspec-isolation"
+end
+
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -4,4 +4,8 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
 
+group :development do
+  gem "rspec-isolation", git: "https://github.com/modosc/rspec-isolation"
+end
+
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", git: "https://github.com/rails/rails", branch: "main"
+
+group :development do
+  gem "rspec-isolation", git: "https://github.com/modosc/rspec-isolation"
+end
+
+gemspec path: "../"

data/lib/cloudflare/rails/railtie.rb

@@ -1,5 +1,4 @@
 require "active_support/core_ext/integer/time"
-require "httparty"
 
 module Cloudflare
   module Rails
@@ -8,7 +7,13 @@ module Cloudflare
       # correct inside of rack and rails
       module CheckTrustedProxies
         def trusted_proxy?(ip)
-          ::Rails.application.config.cloudflare.ips.any? { |proxy| proxy === ip } || super
+          matching = ::Rails.application.config.cloudflare.ips.any? do |proxy|
+            begin
+              proxy === ip
+            rescue IPAddr::InvalidAddressError
+            end
+          end
+          matching || super
         end
       end
 
@@ -21,13 +26,23 @@ module Cloudflare
       end
 
       class Importer
-        include HTTParty
-        base_uri 'https://www.cloudflare.com'
-        follow_redirects true
-        default_options.update(verify: true)
+        # Exceptions contain the Net::HTTP
+        # response object accessible via the {#response} method.
+        class ResponseError < StandardError
+          # Returns the response of the last request
+          # @return [Net::HTTPResponse] A subclass of Net::HTTPResponse, e.g.
+          # Net::HTTPOK
+          attr_reader :response
 
-        class ResponseError < HTTParty::ResponseError; end
+          # Instantiate an instance of ResponseError with a Net::HTTPResponse object
+          # @param [Net::HTTPResponse]
+          def initialize(response)
+            @response = response
+            super(response)
+          end
+        end
 
+        BASE_URL = 'https://www.cloudflare.com'.freeze
         IPS_V4_URL = '/ips-v4'.freeze
         IPS_V6_URL = '/ips-v6'.freeze
 
@@ -40,16 +55,31 @@ module Cloudflare
             fetch IPS_V4_URL
           end
 
+          def should_skip?
+            defined?(::Rails::Console) || ENV.key?('DISABLE_CLOUDFLARE_RAILS')
+          end
+
           def fetch(url)
-            resp = get url, timeout: ::Rails.application.config.cloudflare.timeout
-            if resp.success?
+            uri = URI("#{BASE_URL}#{url}")
+
+            resp = Net::HTTP.start(uri.host,
+                                   uri.port,
+                                   use_ssl: true,
+                                   read_timeout: ::Rails.application.config.cloudflare.timeout) do |http|
+              req = Net::HTTP::Get.new(uri)
+
+              http.request(req)
+            end
+
+            if resp.is_a?(Net::HTTPSuccess)
               resp.body.split("\n").reject(&:blank?).map { |ip| IPAddr.new ip }
             else
-              raise ResponseError, resp.response
+              raise ResponseError, resp
             end
           end
 
           def fetch_with_cache(type)
+            return if should_skip?
             ::Rails.cache.fetch("cloudflare-rails:#{type}", expires_in: ::Rails.application.config.cloudflare.expires_in) do
               send type
             end

data/lib/cloudflare/rails/version.rb

@@ -1,5 +1,5 @@
 module Cloudflare
   module Rails
-    VERSION = "1.2.0".freeze
+    VERSION = "2.4.0-beta.0".freeze
   end
 end

data/lib/cloudflare/rails.rb

@@ -1,5 +1,6 @@
 require "cloudflare/rails/version"
-require "httparty"
+require 'net/http'
+require 'uri'
 
 module Cloudflare
   module Rails

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.4.0.pre.beta.0
 platform: ruby
 authors:
 - jonathan schatz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rack-attack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -151,13 +151,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: climate_control
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,25 +165,65 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 description: ''
 email:
 - modosc@users.noreply.github.com
@@ -198,7 +238,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_airbnb.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -209,11 +248,10 @@ files:
 - bin/setup
 - cloudflare-rails.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/cloudflare/rails.rb
 - lib/cloudflare/rails/railtie.rb
 - lib/cloudflare/rails/version.rb
@@ -232,11 +270,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.18
 signing_key:
 specification_version: 4
 summary: This gem configures Rails for CloudFlare so that request.ip and request.remote_ip

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6

data/gemfiles/rails_5.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"