wafris 2.0.7 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18143fac18debaf1b85c3b0bcef4deef24ea2fd27fbfaca36969a860e2ba1829
-  data.tar.gz: cc6c953ec32d817b2484336902c9474fea514a47d1e43860f7699bed2a79524e
+  metadata.gz: '090c73e4e16d97aa2076a9bed6a68cc4353d0f490f2954d7263bf919dd5cefee'
+  data.tar.gz: 3365dab3150d151be29735b95862adc7cda7e91142ddc05fa84d91bb9d7b59a4
 SHA512:
-  metadata.gz: 73d478b06f745fc49c2f073466c931fe118ed1a3fc127ad6598087d5aab1d2f5009bac3dc588aa597f802402cbc0262a147866f43815ef9e4f0ba0d73a4be592
-  data.tar.gz: 1ce9b2e491f7c776ee0ec113d515b5c9a47bfc1ee5debd0a59a0684e81771870a022886131fc8c7605776d6c52e52f1854f318b41cc63b9240c897203e83e39b
+  metadata.gz: f45d69161062ff57688c30e300bceae2425e80e7e954458317c248580ad64f7d580f2c25f36428e5123468b26d74b37ee8643ce250c4f5902da33a0d9c56d370
+  data.tar.gz: 3c9480600f9f51624db89f2ceb34483df8ab3f79d6e0153f810bb88343c39d93bcb72dd8f73c149539910382abe4a5eb029c2446f56f5f66e936d43f270f8aa2

data/lib/wafris/proxy_filter.rb

@@ -37,6 +37,15 @@ module Wafris
         /\A172\.(1[6-9]|2[0-9]|3[01])#{valid_ipv4_octet}{2}\z/,   # private IPv4 range 172.16.0.0 .. 172.31.255.255
         /\A192\.168#{valid_ipv4_octet}{2}\z/,                     # private IPv4 range 192.168.x.x
         /\Alocalhost\z|\Aunix(\z|:)/i,                            # localhost hostname, and unix domain sockets
+        # Cloudflare IPs: https://www.cloudflare.com/en-au/ips/
+        /\A103\.21\.24[4-7]#{valid_ipv4_octet}\z/,                # 103.21.244.0/22
+        /\A103\.22\.20[0-3]#{valid_ipv4_octet}\z/,                # 103.22.200.0/22
+        /\A103\.31\.[4-7]#{valid_ipv4_octet}\z/,                  # 103.31.4.0/22
+        /\A104\.(1[6-9]|2[0-3])#{valid_ipv4_octet}{2}\z/,         # 104.16.0.0/13
+        /\A104\.2[4-7]#{valid_ipv4_octet}{2}\z/,                  # 104.24.0.0/14
+        /\A108\.162\.192#{valid_ipv4_octet}\z/,                   # 108.162.192.0/18
+        /\A162\.15[8-9]#{valid_ipv4_octet}{2}\z/,                # 162.158.0.0/15
+        /\A172\.(6[4-9]|7[0-1])#{valid_ipv4_octet}{2}\z/,         # 172.64.0.0/13
         *user_defined_proxies
       )
 

data/lib/wafris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wafris
-  VERSION = "2.0.7"
+  VERSION = "2.1.1"
 end

data/lib/wafris/wafris_request.rb

@@ -16,8 +16,9 @@ module Wafris
       @request_id = env.fetch("action_dispatch.request_id", SecureRandom.uuid.to_s)
       @request_timestamp = Time.now.utc.to_i
 
+      pos = request.body&.pos
       @body = encode_to_utf8(request.body&.read)
-      request.body&.rewind
+      request.body&.rewind if request.body&.pos != pos
     end
 
     def data(treatment:, category:, rule:)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.1
 platform: ruby
 authors:
 - Michael Buckbee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack