cloudflare-rails 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84dc9aec556073a4d870a4784e841e63f8a047ade776f55646617d90ae57a350
-  data.tar.gz: b2d3411fae45afc2e4f9586dc3c9fddd966c2dab028fdef278a2e57e2fb11cca
+  metadata.gz: 11110e82a65bdac6452690a323d9f7b834ec61d224dce3584d59244ae5150240
+  data.tar.gz: cbbd90760e1966e42d0ae0e59526228686222a0b2381deb3d41680d4e05d227e
 SHA512:
-  metadata.gz: 77da9de7361192e828223e3ee2da7213e8f502971b2bb503f8454e14210233bbabab107dce472d8477b0ef123bb389a8fc31b07fe0bc54d41ccbd5f0312fd474
-  data.tar.gz: 5581a9d55303a8ec303e2e95497d87c20a973ae451f0a38bee98310dffb0d5b408d43b773808c7258acd7ad2c7a657638e874fb67a1d2c1df2bafd54a910eb72
+  metadata.gz: 55dad9534a826670be89601a3404d420535b92e42639e44a001e2f869711c3e7347b2d810ef00967d5f51f680e0517d0c856aa26c1caff8531988722fef00910
+  data.tar.gz: 45000db30d0f95515c7d69a4295a4f69d68b2285c638a24b4f1d30b79c53aa5940beb861b7dcc9c2cc75183ab039baaedc34f84510c5455abf7b68d46cc76379

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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).
 
+## [2.4.0] - 2022-02-22
+- Add trailing slashes to reflect Cloudflare API URLs (https://github.com/modosc/cloudflare-rails/pull/53)
+
+## [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
 

data/Gemfile

@@ -2,7 +2,3 @@ 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,4 +1,4 @@
-# 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

data/gemfiles/rails_5.2.gemfile

@@ -4,8 +4,4 @@ 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,8 +4,4 @@ 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,8 +4,4 @@ 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

@@ -4,8 +4,4 @@ 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

@@ -7,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
 
@@ -37,8 +43,8 @@ module Cloudflare
         end
 
         BASE_URL = 'https://www.cloudflare.com'.freeze
-        IPS_V4_URL = '/ips-v4'.freeze
-        IPS_V6_URL = '/ips-v6'.freeze
+        IPS_V4_URL = '/ips-v4/'.freeze
+        IPS_V6_URL = '/ips-v6/'.freeze
 
         class << self
           def ips_v6

data/lib/cloudflare/rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - jonathan schatz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -224,7 +224,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_airbnb.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -261,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.22
 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