honeypot 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/honeypot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{honeypot}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-07-15}
   s.description = %q{Catch bad guys when they stick their hands in the honey.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
      "VERSION",
      "honeypot.gemspec",
      "lib/honeypot.rb",
+     "lib/honeypot/best_guess_routeable_remote_ip.rb",
      "lib/honeypot/ipaddr_ext.rb",
-     "lib/honeypot/rack.rb",
      "lib/honeypot/rails.rb",
      "lib/honeypot/railtie.rb",
      "lib/honeypot/remote_host.rb",

data/lib/honeypot.rb

@@ -13,9 +13,9 @@ require 'fast_timestamp'
 require 'honeypot/ipaddr_ext'
 require 'honeypot/remote_request'
 require 'honeypot/remote_host'
-require 'honeypot/rack'
+require 'honeypot/best_guess_routeable_remote_ip'
 
-require 'honeypot/railtie' if defined?(Rails::Railtie)
+require 'honeypot/railtie' if defined? ::Rails::Railtie
 
 module Honeypot
   def self.included(base)
@@ -26,12 +26,12 @@ module Honeypot
   end
   
   def log_action_dispatch_request(request)
-    log_remote_request request.env['honeypot.remote_ip'], request.url, request.referer
+    log_remote_request request.env['honeypot.best_guess_routeable_remote_ip'], request.url, request.referer
   end
   
   def log_rack_env(env)
     request = ::Rack::Request.new env
-    log_remote_request request.env['honeypot.remote_ip'], request.url, request.referer
+    log_remote_request request.env['honeypot.best_guess_routeable_remote_ip'], request.url, request.referer
   end
   
   def log_remote_request(ip_address, url, referer)

data/lib/honeypot/{rack.rb → best_guess_routeable_remote_ip.rb}

@@ -2,27 +2,27 @@
 # http://charlesmaxwood.com/sessions-in-rack-and-rails-metal/
 module Honeypot
   # Middleware for Rack applications. Remote hosts will be tied together with remote requests.
-  class Rack
+  class BestGuessRouteableRemoteIp
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      remote_ip = _most_likely_remote_ip env
+      ip = _best_guess_remote_ip env
 
       # For the next request, in case the next time we see this session the remote ip is obscured
       # (for example, that happens if you're on engineyard and the request comes in over SSL)
-      if env.has_key? 'rack.session' and remote_ip.routeable?
-        env['rack.session']['honeypot.last_known_routeable_remote_ip'] = remote_ip.to_s
+      if env.has_key? 'rack.session' and ip.routeable?
+        env['rack.session']['honeypot.best_guess_routeable_remote_ip'] = ip.to_s
       end
       
       # For use by other middleware or the app itself
-      env['honeypot.remote_ip'] = remote_ip.to_s
+      env['honeypot.best_guess_routeable_remote_ip'] = ip.to_s
 
       @app.call env
     end
 
-    def _most_likely_remote_ip(env)
+    def _best_guess_remote_ip(env)
       candidates = _collect_possible_remote_ips env
       candidates.detect { |remote_ip| remote_ip.routeable? } || candidates.first
     end
@@ -39,9 +39,16 @@ module Honeypot
       end
       # saved by honeypot between requests
       if env.has_key? 'rack.session'
-        candidates.push env['rack.session']['honeypot.last_known_routeable_remote_ip']
+        candidates.push env['rack.session']['honeypot.best_guess_routeable_remote_ip']
       end
-      candidates.map! { |raw_ip_address| IPAddr.new raw_ip_address.to_s }
+      candidates.map! do |raw_ip_address|
+        begin
+          IPAddr.new raw_ip_address.to_s
+        rescue ArgumentError
+          # ignore it, maybe bad data got in here somehow
+        end
+      end
+      candidates.compact!
       candidates
     end
   end

data/lib/honeypot/rails.rb

@@ -1,5 +1,5 @@
 require 'honeypot'
 
-if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
-  ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', ::Honeypot::Rack
-end
+raise "rails 2.3 support isn't tested"
+
+::Rails.configuration.middleware.insert_after '::Rack::MethodOverride', '::Honeypot::BestGuessRouteableRemoteIp'

data/lib/honeypot/railtie.rb

@@ -3,8 +3,7 @@ require 'rails'
 
 module Honeypot
   class Railtie < Rails::Railtie
-    initializer 'honeypot.configure_rails_initialization' do |app|
-      app.middleware.insert_after 'ActionDispatch::RemoteIp', ::Honeypot::Rack
-    end
+    # more or less, this puts us after the rails helper stuff (ActionDispatch::RemoteIp) but before most custom middleware
+    config.app_middleware.insert_after '::Rack::MethodOverride', '::Honeypot::BestGuessRouteableRemoteIp'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: honeypot
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -04:00
+date: 2010-07-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,8 +116,8 @@ files:
 - VERSION
 - honeypot.gemspec
 - lib/honeypot.rb
+- lib/honeypot/best_guess_routeable_remote_ip.rb
 - lib/honeypot/ipaddr_ext.rb
-- lib/honeypot/rack.rb
 - lib/honeypot/rails.rb
 - lib/honeypot/railtie.rb
 - lib/honeypot/remote_host.rb