ahoy_matey 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6686254ab1f5bb79219bdb93194e2e3ddb9ddd8
-  data.tar.gz: afd9cb6035e939db2c60b881b5a80a2ea0bb407e
+  metadata.gz: a0f2bb6fef22274ec84a1e02664f8a1baec9b590
+  data.tar.gz: 5e2bfe3a50b214345c0f375f00efda90fa47de35
 SHA512:
-  metadata.gz: 504dd73058c78a635072af48ca326f623a335af74d5cbfc7636ccd0c2d5a0ab12304cee3cc01d51f11829aa80200dada366734d7f55d1b99946ff0d49b072bb2
-  data.tar.gz: f1664a981c88b2896e856ec8bcdba0e4b1e94e26b93f290b1b495ad72166787952965ff5566e5325eb0be59ddcf8f70ebc4cdeeccf40cfa8614475fa4c5e35ae
+  metadata.gz: b6e677762054719a8834731d1f25d9b5aa9015d9a0f62e8980458916cb1174e51ef82ca7a8606e98da9bacf40f901394b170f80891b6a99b07cee4dc05a4f788
+  data.tar.gz: 605aa3c66d858c7e164496785bb42f4dea7d00c4ab3bf5166188245f026c549cd0cbb16c21c2fdbcecb27305e87aa3b8efcb44a694a8140fdee2b71141d2833f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.0
+
+- Added throttling
+- Added `max_content_length` and `max_events_per_request`
+
 ## 1.2.2
 
 - Fixed issue with latest version of `browser` gem

data/ahoy_matey.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "request_store"
   spec.add_dependency "uuidtools"
   spec.add_dependency "errbase"
+  spec.add_dependency "rack-attack"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/app/controllers/ahoy/base_controller.rb

@@ -4,12 +4,23 @@ module Ahoy
     filters = _process_action_callbacks.map(&:filter) - [:load_authlogic]
     if respond_to?(:skip_action)
       skip_action *filters
+      before_action :verify_request_size
     else
       skip_filter *filters
+      before_filter :verify_request_size
     end
 
+    protected
+
     def ahoy
       @ahoy ||= Ahoy::Tracker.new(controller: self, api: true)
     end
+
+    def verify_request_size
+      if request.content_length > Ahoy.max_content_length
+        logger.info "[ahoy] Payload too large"
+        render text: "Payload too large\n", status: 413
+      end
+    end
   end
 end

data/app/controllers/ahoy/events_controller.rb

@@ -14,7 +14,7 @@ module Ahoy
           end
         end
 
-      events.each do |event|
+      events.first(Ahoy.max_events_per_request).each do |event|
         time = Time.zone.parse(event["time"]) rescue nil
 
         # timestamp is deprecated

data/lib/ahoy.rb

@@ -62,6 +62,21 @@ module Ahoy
   mattr_accessor :geocode
   self.geocode = true
 
+  mattr_accessor :max_content_length
+  self.max_content_length = 8192
+
+  mattr_accessor :max_events_per_request
+  self.max_events_per_request = 10
+
+  mattr_accessor :throttle
+  self.throttle = true
+
+  mattr_accessor :throttle_limit
+  self.throttle_limit = 20
+
+  mattr_accessor :throttle_period
+  self.throttle_period = 1.minute
+
   def self.ensure_uuid(id)
     valid = UUIDTools::UUID.parse(id) rescue nil
     if valid

data/lib/ahoy/engine.rb

@@ -1,7 +1,12 @@
 module Ahoy
   class Engine < ::Rails::Engine
-    initializer "ahoy.middleware", after: "sprockets.environment" do
+    initializer "ahoy.middleware", after: "sprockets.environment" do |app|
       Rails::Rack::Logger.send(:prepend, Ahoy::LogSilencer) if Ahoy.quiet
+
+      if Ahoy.throttle
+        require "ahoy/throttle"
+        app.middleware.use Ahoy::Throttle
+      end
     end
   end
 end

data/lib/ahoy/throttle.rb

@@ -0,0 +1,17 @@
+require "rack/attack"
+
+module Ahoy
+  class Throttle < Rack::Attack
+    throttle("ahoy/ip", limit: Ahoy.throttle_limit, period: Ahoy.throttle_period) do |req|
+      if req.path.start_with?("/ahoy/")
+        req.ip
+      end
+    end
+
+    def_delegators self, :whitelisted?, :blacklisted?, :throttled?, :tracked?
+
+    def self.throttled_response
+      Rack::Attack.throttled_response
+    end
+  end
+end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-attack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +231,7 @@ files:
 - lib/ahoy/stores/log_store.rb
 - lib/ahoy/stores/mongoid_store.rb
 - lib/ahoy/subscribers/active_record.rb
+- lib/ahoy/throttle.rb
 - lib/ahoy/tracker.rb
 - lib/ahoy/version.rb
 - lib/ahoy/visit_properties.rb