rack-cloudflare 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d583c505204a0ac54be1748df8eb4b4e2fa1889366a8065dcc00f70d16d7075
-  data.tar.gz: '079af617a6d6c75e93992c7d43cc537f025b887f3620c686986473cf069c0131'
+  metadata.gz: d4a6cbd7a1396b2daee2e5f0e4ed3bb7a77800255eedb6d162c26b9f00a6f8e7
+  data.tar.gz: 1f17b7d667512c429fd0168bb32acb6c7c8b23bae057908ef93920ca94af5b01
 SHA512:
-  metadata.gz: b290cd1c7eb02e12d7accd551bf910088f33272c5bf1f7d89dfe382a951a1fc196eed3944769439dd3fe2dff119ac6f6f967185b7d5520e8c7cab06e37c1cc21
-  data.tar.gz: 6f2a38f93c166ceaabe0dd1089f7ce61ba00e00adb0ec816e4119d980cd21c88204aa4beed10b689b5553e5499c83d13e25ef1b8bfe309434546ebcd5f55f13c
+  metadata.gz: 575efb62ae08e5eed7d35112f4fba522aa58beee80314c33789110aa4cddc4fa1755fc60bedc2d3c1851f01567f42219465b3fc16aad0c9148b432034cfae5aa
+  data.tar.gz: 5cd9b90a95f4c02af706bb76f573c7fcb178a3ded661775041166b36cfbd60ca958d8829dc14cc87f46fb1e36c9cc3e87f9d0d6951b90cc5d476f4a50b4a2b97

data/README.md

@@ -79,6 +79,12 @@ Rack::Cloudflare::Headers.original_remote_addr   = 'BACKUP_REMOTE_ADDR'
 Rack::Cloudflare::Headers.original_forwarded_for = 'BACKUP_FORWARDED_FOR'
 ```
 
+You can set the `HTTP_X_FORWARDED_FOR` header to exactly `HTTP_CF_CONNECTING_IP`, which effectively removes proxies.
+
+```ruby
+Rack::Cloudflare::Headers.remove_proxies = true
+```
+
 See _Toolkits: Rewrite Headers_ for alternative uses.
 
 ### Logging

data/lib/rack/cloudflare/headers.rb

@@ -25,7 +25,7 @@ module Rack
       ALL.map { |h| const_set h, h.to_s.freeze }.freeze
 
       class << self
-        attr_accessor :backup, :original_remote_addr, :original_forwarded_for
+        attr_accessor :backup, :remove_proxies, :original_remote_addr, :original_forwarded_for
 
         def trusted?(headers)
           Headers.new(headers).trusted?
@@ -106,6 +106,9 @@ module Rack
           # it was present in the original request.
           # See: https://support.cloudflare.com/hc/en-us/articles/200170986-How-does-Cloudflare-handle-HTTP-Request-headers-
           headers[HTTP_X_FORWARDED_FOR] = "#{connecting_ip}, #{cloudflare_ip}" if forwarded_for.none?
+
+          # Avoid getting the wrong IP by removing proxies
+          headers[HTTP_X_FORWARDED_FOR] = connecting_ip.to_s if connecting_ip && Headers.remove_proxies
         end
       end
 
@@ -129,6 +132,7 @@ module Rack
       ### Configure
 
       self.backup                 = true
+      self.remove_proxies         = false
       self.original_remote_addr   = 'ORIGINAL_REMOTE_ADDR'
       self.original_forwarded_for = 'ORIGINAL_FORWARDED_FOR'
     end

data/lib/rack/cloudflare/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class Cloudflare
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cloudflare
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler