rack-cloudflare_middleware 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22757d992eeecdb17309877680ce87ff3f276c3feee9204f74e268b8f7a191c1
-  data.tar.gz: f6ed538c9de7682d91113ea40204a29e2c933f4d4da5d88716ca4c69121e1541
+  metadata.gz: 2caa6f46bb75a1436d76b66b04a3c74a3fe6be8132d8be1a5cf3f8eb46920ed6
+  data.tar.gz: bb6bae39cca23f835be26697c23fb3fefcb3f7e7bce7657b1aedbae0d1ab8744
 SHA512:
-  metadata.gz: 6f5723f47e69a46e6712ca9e77ceb55d95a31c2a8a3e18daffcd46f751a30f8e044d590f282c749d67917a4dff2b9e055f5f6e089e0736a58f0a3cf40e7aaba8
-  data.tar.gz: 7398eb50105915fbf26825ebc3169b0603aae9ad3a56bbc2449b63bb8d8ca55bac54daea46339fba05fcb900d60f8ba496d72cbde1f1706fcb7693b4a91f3cb0
+  metadata.gz: 36a8c2416e03f0bd46bb13ca3263acd31292584c2fa9880f177b44bae83ecf8b664fc7e0aea20bbd953c103cbcef427c444ab208288d79610ce1e0fa44c236da
+  data.tar.gz: 4f6947ff84694af20469dc060dce6747d558a35ee7e66d470e42c2304b1bcbb3a58550363c42d8432fe5f6872e00a504855ebb0850f1bcc121769f76119f69b1

data/.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ruby: ["3.2", "3.3", "3.4"]
+        ruby: ["3.4", "4.0"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
@@ -35,16 +35,16 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: "3.4"
+          ruby-version: "4.0"
       - name: Bundle Audit Check
         run: bundle exec bundle-audit update && bundle exec bundle-audit check
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.12"
       - name: Run pre-commit

data/.github/workflows/release.yml

@@ -9,12 +9,12 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: "3.3"
+          ruby-version: "4.0"
       - name: Publish gem
         run: |
           umask 077

data/.gitignore

@@ -1,2 +1,3 @@
 /.bundle
 *.gem
+.DS_Store

data/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+  rev: v6.0.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -8,10 +8,10 @@ repos:
   - id: check-yaml
     exclude: '.rubocop.yml'
   - id: check-added-large-files
-  - id: check-byte-order-marker
+  - id: fix-byte-order-marker
     exclude: '^spec/data/'
   - id: check-merge-conflict
 - repo: https://github.com/instrumentl/pre-commit-standardrb.git
-  rev: 'v1.44.0'
+  rev: 'v1.45.0'
   hooks:
     - id: standardrb

data/.rubocop.yml

@@ -2,7 +2,9 @@ require: standard
 inherit_gem:
   standard: config/base.yml
 AllCops:
-  TargetRubyVersion: 3.4
+AllCops:
+  TargetRubyVersion: 4.0
+  NewCops: enable
   Exclude:
     - "vendor/bundle/**/*"
     - "tmp/**/*"

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 4.0

data/CHANGELOG.md

@@ -1,41 +1,49 @@
+# changelog
+
+## v3.0.0 - 2026-08-20
+
+- **BREAKING CHANGE**: Dropped support for Ruby 3.2 and 3.3 (EOL as of March 31, 2026)
+- Updated minimum Ruby version requirement from >= 3.2 to >= 3.4
+- Added support for Ruby 4.0; CI now tests against Ruby 3.4, and 4.0
+- Dependencies updates
+
+## v2.0.0 - 2026-02-19
 
-v2.0.0 - 2026-02-19
--------------------
 - **BREAKING CHANGE**: Dropped support for Ruby 3.1 (EOL as of March 31, 2025)
 - Updated minimum Ruby version requirement from >= 3.1 to >= 3.2
 - This change resolves Dependabot dependency resolution issues with bundler-audit
 - CI now tests against Ruby 3.2, 3.3, and 3.4
 - First major version bump following semantic versioning for breaking changes
 
-v1.2.4 - 2026-02-10
--------------------
+## v1.2.4 - 2026-02-10
+
 - Updated Faraday dependency to >= 2.14.1 to address CVE-2026-25765 (SSRF vulnerability)
 
-v1.2.3 - 2025-07-25
--------------------
+## v1.2.3 - 2025-07-25
+
 - Libraries updates
 
-v1.2.2 - 2024-05-22
--------------------
+## v1.2.2 - 2024-05-22
+
 - Added support for ruby 3.4
 
-v1.2.1 - 2024-02-23
--------------------
+## v1.2.1 - 2024-02-23
+
 - Update cloudflare trusted IP URL to include new required trailing slash
 - Many dependabot bumps
 
-v1.2.0 - 2023-06-05
--------------------
+## v1.2.0 - 2023-06-05
+
 - Set `required_ruby_version` in the gemspec
 - Add `trusted_request_proc` kwarg to DenyOthers middleware
 
-v1.1.0 - 2023-03-31
--------------------
+## v1.1.0 - 2023-03-31
+
 - Expand requirements to allow using Rack 3.x
 - Add `trust_xff_if_private` kwarg to both middlewares
 - Add `on_fail_proc` to DenyOthers middleware
 - Bump various build-time dependencies
 
-v1.0.0 - 2023-03-31
--------------------
+## v1.0.0 - 2023-03-31
+
 - Initial release

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "faraday", "~> 2.14"
-gem "rake", "~> 13.3"
+gem "rake", "~> 13.4"
 
 group :development, :test do
   gem "rspec", "~> 3.13"

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    rack-cloudflare_middleware (2.0.0)
+    rack-cloudflare_middleware (3.0.0)
       faraday (>= 1.0, < 3)
       rack (>= 2, < 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
-    bigdecimal (3.3.1)
+    bigdecimal (4.1.1)
     bundler-audit (0.9.3)
       bundler (>= 1.2.0)
       thor (~> 1.0)
@@ -20,38 +20,38 @@ GEM
       bigdecimal
       rexml
     diff-lcs (1.6.2)
-    faraday (2.14.1)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.4)
       net-http (~> 0.5)
     hashdiff (1.2.1)
     io-console (0.8.2)
-    json (2.18.1)
-    language_server-protocol (3.17.0.5)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     method_source (1.1.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (2.1.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
-    prism (1.6.0)
+    prism (1.9.0)
     pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
       reline (>= 0.6.0)
-    public_suffix (6.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.7)
     rack-test (2.2.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.3.1)
-    regexp_parser (2.11.3)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     rexml (3.4.4)
@@ -71,43 +71,43 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.81.7)
+    rubocop (1.88.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
-    standard (1.52.0)
+    standard (1.56.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.81.7)
+      rubocop (~> 1.88.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.8.0)
+    standard-performance (1.9.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.25.0)
+      rubocop-performance (~> 1.26.0)
     thor (1.4.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
+    unicode-emoji (4.2.0)
     uri (1.1.1)
-    webmock (3.26.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -116,6 +116,7 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   arm64-darwin-24
+  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES
@@ -125,11 +126,11 @@ DEPENDENCIES
   pry
   rack-cloudflare_middleware!
   rack-test (~> 2)
-  rake (~> 13.3)
+  rake (~> 13.4)
   rspec (~> 3.13)
   rspec-its (~> 2.0)
   standard (~> 1)
   webmock (~> 3.26)
 
 BUNDLED WITH
-   2.5.23
+   2.7.2

data/README.md

@@ -5,8 +5,8 @@ This is a small Rack middleware for use with the [Cloudflare](https://www.cloudf
 
 We include two middlewares:
 
- * `Rack::CloudflareMiddleware::RewriteRemoteAddr` swaps in `CF-Connecting-IP` for `REMOTE_ADDR` if and only if the "real" remote address is a trusted Cloudflare source IP address.
- * `Rack::CloudflareMiddleware::DenyOthers` returns a 401 for all requests where `REMOTE_ADDR` is not Cloudflare
+- `Rack::CloudflareMiddleware::RewriteRemoteAddr` swaps in `CF-Connecting-IP` for `REMOTE_ADDR` if and only if the "real" remote address is a trusted Cloudflare source IP address.
+- `Rack::CloudflareMiddleware::DenyOthers` returns a 401 for all requests where `REMOTE_ADDR` is not Cloudflare
 
 If you're using Rails, you may want to use [cloudflare-rails](https://github.com/modosc/cloudflare-rails) instead.
 

data/lib/rack/cloudflare_middleware/trusted_ips.rb

@@ -33,9 +33,9 @@ module Rack
           ip = IPAddr.new(ip)
         end
         if ip.ipv4?
-          @ranges[4].any? { _1.include? ip }
+          @ranges[4].any? { it.include? ip }
         else
-          @ranges[6].any? { _1.include? ip }
+          @ranges[6].any? { it.include? ip }
         end
       end
 
@@ -45,7 +45,7 @@ module Rack
       end
 
       def check_update
-        if [4, 6].any? { (Time.now - @mtimes[_1]) > UPDATE_THRESHOLD }
+        if [4, 6].any? { (Time.now - @mtimes[it]) > UPDATE_THRESHOLD }
           update!
         end
       end
@@ -58,7 +58,7 @@ module Rack
       end
 
       def process_body(body)
-        body.lines.map(&:strip).filter { !_1.empty? }.map(&IPAddr.method(:new)).to_set
+        body.lines.map(&:strip).filter { !it.empty? }.map(&IPAddr.method(:new)).to_set
       end
 
       def read_file(path, version)

data/lib/rack/cloudflare_middleware/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   module CloudflareMiddleware
-    VERSION = "2.0.0"
+    VERSION = "3.0.0"
   end
 end

data/rack-cloudflare_middleware.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.2"
+  spec.required_ruby_version = ">= 3.4"
 
   spec.add_dependency "faraday", ">= 1.0", "< 3"
   spec.add_dependency "rack", ">= 2", "< 4"
 
   spec.add_development_dependency "bundler", "~> 2"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", "~> 13.4"
+  spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "standard", "~> 1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-cloudflare_middleware
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - James Brown
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -70,28 +69,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +105,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description:
 email:
 - james@instrumentl.com
 executables: []
@@ -119,6 +117,7 @@ files:
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rubocop.yml"
+- ".standard.yml"
 - CHANGELOG.md
 - CODEOWNERS
 - Gemfile
@@ -137,7 +136,6 @@ homepage: https://github.com/instrumentl/rack-cloudflare_middleware
 licenses:
 - ISC
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,15 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Rack middleware for handling Cloudflare remote IP headers
 test_files: []