rack-throttle 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7823180e20dd3ab553a305842fb9f785894953bd
-  data.tar.gz: 9781b73ca8565c8f9123d6100e6fd7729c707d5b
+SHA256:
+  metadata.gz: a65f5195779a2af8c7340f1e52dd0c19e6036e234eeaf934518a307b05a208e4
+  data.tar.gz: e69a0f3ee004f59b3a6808f9165a2c82b1729dde0ed344e7192998eb5c522f3a
 SHA512:
-  metadata.gz: 0a0828b9d713cb79ba08b694e9163bc22acd86b763b16cd054afb37f3e04ea938fa34c1757d01f4cd2e546b3bda196bc83f0777d232744fb7b098409da9c5461
-  data.tar.gz: afc4bb326fb276937dde75cb37db310313e5c87c4d134cef3b25bb4e3dc53ea453e1913514109c35ab58792b40a72897840964a8286aee0fc4a3d956b15e50f4
+  metadata.gz: 0e0a36ff42888850b8e1532133706342637e070998d815ff5358a7a36235a3c7a4eabe5f0514ad463bdb7fea13e84ce4ce21b63e47f7352be5c03877c4c3ffb1
+  data.tar.gz: 4d84b627410ff12bf7a81ac3ad19c681397287748d4d9306d1d5f447a918849488b04bb1b33f1057018a4519abbc309460aa109772193c7c4a81e13c23fe65bf

data/README

@@ -1 +1 @@
-README.md
+./README.md

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/rack/throttle.rb

@@ -9,6 +9,7 @@ module Rack
     autoload :Hourly,     ::File.expand_path(::File.dirname(__FILE__)) + '/throttle/hourly'
     autoload :Minute,     ::File.expand_path(::File.dirname(__FILE__)) + '/throttle/minute'
     autoload :Second,     ::File.expand_path(::File.dirname(__FILE__)) + '/throttle/second'
+    autoload :Rules,      ::File.expand_path(::File.dirname(__FILE__)) + '/throttle/rules'
     autoload :VERSION,    ::File.expand_path(::File.dirname(__FILE__)) + '/throttle/version'
   end
 end

data/lib/rack/throttle/rules.rb

@@ -0,0 +1,95 @@
+require "ipaddr"
+
+module Rack
+  module Throttle
+    class Rules < TimeWindow
+      ##
+      # @param  [#call]                  app
+      # @param  [Hash{Symbol => Object}] options
+      # @option options [Integer] :max   (1)
+      def initialize(app, options = {})
+        super
+      end
+
+      def rules
+        @rules ||= begin
+          rs = options[:rules]
+          rs.sort_by { |r| r[:path].to_s }.reverse
+        end
+      end
+    
+      def retry_after
+        @min ||= (options[:min] || 3600)
+      end
+  
+      def default_limit
+        @default_limit ||= options[:default] || 1_000_000_000
+      end
+
+      def ips
+        @ips ||= (options[:ip_whitelist] || []).map { |ip| IPAddr.new(ip) } || []
+      end
+
+      def whitelisted?(request)
+        return true if ip_whitelisted?(IPAddr.new(ip(request)))
+        return true if path_whitelisted?(request)
+        false
+      end
+
+      def ip_whitelisted?(request_ip)
+        !!ips.find { |ip| ip.include?(request_ip) }
+      end 
+
+      def path_whitelisted?(request)
+        rule = rule_for(request)
+        rule ? rule[:whitelisted] : false
+      end
+
+      def rule_for(request)
+        rules.find do |rule|
+          next unless rule[:method] == request.request_method.to_s
+          next unless path_matches?(rule, request.path.to_s)
+          rule
+        end
+      end
+
+      def path_matches?(rule, path)
+        return true unless rule[:path]
+        return true if     path.to_s.match(rule[:path])
+        false
+      end
+      
+      def max_per_window(request)
+        rule = rule_for(request)
+        rule ? rule[:limit] : default_limit
+      end
+
+      def client_identifier(request)
+        if (rule = rule_for(request)) 
+          "#{ip(request)}_#{rule[:method]}_#{rule[:path]}"
+        else
+          ip(request)
+        end
+      end
+
+      def ip(request)
+        request.ip.to_s
+      end
+
+      def cache_key(request)
+        [super, Time.now.strftime(time_string)].join(':')
+      end
+
+      def time_string
+        @time_string ||= case options[:time_window]
+          when :second then '%Y-%m-%dT%H:%M:%S'
+          when :minute then '%Y-%m-%dT%H:%M'
+          when :hour   then '%Y-%m-%dT%H'
+          when :day    then '%Y-%m-%d'
+          else              '%Y-%m-%dT%H:%M:%S'
+        end
+      end
+    end
+  end
+end
+

data/lib/rack/throttle/version.rb

@@ -1,7 +1,7 @@
 module Rack; module Throttle
   module VERSION
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
     EXTRA = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-throttle
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ files:
 - lib/rack/throttle/interval.rb
 - lib/rack/throttle/limiter.rb
 - lib/rack/throttle/minute.rb
+- lib/rack/throttle/rules.rb
 - lib/rack/throttle/second.rb
 - lib/rack/throttle/time_window.rb
 - lib/rack/throttle/version.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: HTTP request rate limiter for Rack applications.