rack-cloudflare 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab4c47613f24dc1d1cfb47b75324a3ed31c46eb8d509069304f803b56ff2bcb1
-  data.tar.gz: 2470bf3a84bd1436bc30d8bf796f2f7d8ae8c9f79072981273ff798b559d844d
+  metadata.gz: 9d583c505204a0ac54be1748df8eb4b4e2fa1889366a8065dcc00f70d16d7075
+  data.tar.gz: '079af617a6d6c75e93992c7d43cc537f025b887f3620c686986473cf069c0131'
 SHA512:
-  metadata.gz: a7bc139b0d11dc4050bb21720c8fd1bab5a3bca26939175da26b8ff54742bbf325d9a9561df60ca2aa079f29e7d52c9f55b924ebf155c5d4c56eac22fb3ce428
-  data.tar.gz: 21ac336b1586f7c770b8f63016093445beb4d19b2869526b563d1948c53dde128129fbe314e10daac02322ac75c3c1b09c23b85d2440d70349af8db9c56b9496
+  metadata.gz: b290cd1c7eb02e12d7accd551bf910088f33272c5bf1f7d89dfe382a951a1fc196eed3944769439dd3fe2dff119ac6f6f967185b7d5520e8c7cab06e37c1cc21
+  data.tar.gz: 6f2a38f93c166ceaabe0dd1089f7ce61ba00e00adb0ec816e4119d980cd21c88204aa4beed10b689b5553e5499c83d13e25ef1b8bfe309434546ebcd5f55f13c

data/.rubocop.yml

@@ -40,4 +40,8 @@ Style/Documentation:
 
 Metrics/ModuleLength:
   Exclude:
-    - 'lib/rack/cloudflare/countries.rb'
+    - 'lib/rack/cloudflare/countries.rb'
+
+Naming/FileName:
+  Exclude:
+    - 'rack-cloudflare.gemspec'

data/README.md

@@ -34,10 +34,10 @@ use Rack::Cloudflare::Middleware::AccessControl
 config.middleware.unshift Rack::Cloudflare::Middleware::AccessControl
 
 # Configure custom blocked message (defaults to "Forbidden")
-Rack::Cloudflare::Middleware::AccessControl.blocked_message = "You don't belong here..."
+Rack::Cloudflare::Middleware::AccessControl.message = "You don't belong here..."
 
 # Fully customize the Rack response (such as making it a redirect)
-Rack::Cloudflare::Middleware::AccessControl.blocked_response = lambda do |_env|
+Rack::Cloudflare::Middleware::AccessControl.response = lambda do |_env|
     [301, { 'Location' => 'https://somewhere.else.xyz' }, ["Redirecting...\n"]]
 end
 ```

data/lib/rack/cloudflare/ips.rb

@@ -37,6 +37,7 @@ module Rack
 
         def parse(string)
           return [] if string.to_s.strip.empty?
+
           string.strip.split(/[,\s]+/).map { |ip| ::IPAddr.new(ip.strip) }
         end
       end

data/lib/rack/cloudflare/middleware/access_control.rb

@@ -4,15 +4,37 @@ module Rack
   class Cloudflare
     module Middleware
       class AccessControl
+        PRESETS = {
+          forbidden: {
+            message: 'Forbidden',
+            response: lambda do |_env|
+              [403, { 'Content-Type' => 'text/plain' }, ["#{AccessControl.message.strip}\n"]]
+            end
+          },
+          not_found: {
+            message: 'Not Found',
+            response: lambda do |_env|
+              [404, { 'Content-Type' => 'text/plain' }, ["#{AccessControl.message.strip}\n"]]
+            end
+          }
+        }.freeze
+
         class << self
-          attr_accessor :blocked_response, :blocked_message
-        end
+          attr_accessor :response, :message
+
+          def as(preset, message: nil)
+            self.message,
+            self.response = PRESETS.fetch(preset).values_at :message, :response
 
-        self.blocked_message  = 'Forbidden'
-        self.blocked_response = lambda do |_env|
-          [403, { 'Content-Type' => 'text/plain' }, ["#{blocked_message.strip}\n"]]
+            self.message = message unless message.nil?
+
+            self
+          end
         end
 
+        # Default setup
+        as :forbidden
+
         def initialize(app)
           @app = app
         end
@@ -25,7 +47,7 @@ module Rack
             @app.call(env)
           else
             Cloudflare.warn "[#{self.class.name}] Untrusted Network (REMOTE_ADDR): #{headers.target_headers}"
-            AccessControl.blocked_response.call(env)
+            AccessControl.response.call(env)
           end
         end
       end

data/lib/rack/cloudflare/version.rb

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

metadata

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