honeypot 0.0.6 → 0.0.7

data/README.rdoc

@@ -2,9 +2,9 @@
 
 Catch bad guys when they stick their hands in the honey.
 
-== rails 3 only
+== rails 3 best
 
-uses rack
+uses rack... it might work on late versions of rails 2
 
 == honeypot models
 
@@ -29,7 +29,7 @@ when somebody touches a honeypot, make sure to log it:
   class UsersController < ApplicationController
     def create
       # [...]
-      @user.log_remote_request(request)
+      @user.log_action_dispatch_request(request)
       # [...]
     end
   end
@@ -37,7 +37,7 @@ when somebody touches a honeypot, make sure to log it:
   class VotesController < ApplicationController
     def create
       # [...]
-      @vote.log_remote_request(request)
+      @vote.log_action_dispatch_request(request)
       # [...]
     end
   end
@@ -48,7 +48,7 @@ and be creative...
     # notice when a User logs in
     def create
       # [...]
-      current_user.log_remote_request(request)
+      current_user.log_action_dispatch_request(request)
       # [...]
     end
   end

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/honeypot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{honeypot}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-07-02}
   s.description = %q{Catch bad guys when they stick their hands in the honey.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/seamusabshere/honeypot}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Track remote requests to catch fraud.}
   s.test_files = [
     "test/helper.rb",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fast_timestamp>, [">= 0.0.4"])
       s.add_runtime_dependency(%q<geokit>, [">= 1.5.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])

data/lib/honeypot.rb

@@ -25,21 +25,26 @@ module Honeypot
     end
   end
   
-  def log_remote_request(request)
-    effective_ip_address = [
-      request.env['rack.session'].andand['honeypot.last_known_remote_ip'].to_s,
-      request.remote_ip.to_s
-    ].detect(&:present?)
-    remote_host = RemoteHost.find_or_create_by_ip_address effective_ip_address
+  def log_action_dispatch_request(request)
+    log_remote_request request.env['honeypot.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
+  end
+  
+  def log_remote_request(ip_address, url, referer)
+    remote_host = RemoteHost.find_or_create_by_ip_address ip_address
     remote_request = remote_requests.find_or_create_by_remote_host_id remote_host.id
-    remote_request.last_http_referer = request.referer if request.referer.present?
-    remote_request.last_request_uri = request.url if request.url.present?
+    remote_request.last_http_referer = referer
+    remote_request.last_request_uri = url
     remote_request.increment :hits
     remote_request.save!
     true
   end
   
-  def related_requestables(seen_remote_host_ids = [])
+  def related_requestables(seen_remote_host_ids = Array.new)
     set = Set.new
     conditions = seen_remote_host_ids.present? ? [ "remote_hosts.id NOT IN (?)", seen_remote_host_ids ] : nil
     remote_hosts.where(conditions).find_in_batches do |batch|

data/lib/honeypot/ipaddr_ext.rb

@@ -1,18 +1,18 @@
 # http://codesnippets.joyent.com/posts/show/7546
 class IPAddr
-  PRIVATE_RANGES = [
+  UNROUTEABLE_RANGES = [
     IPAddr.new('127.0.0.1/32'),
     IPAddr.new('10.0.0.0/8'),
     IPAddr.new('172.16.0.0/12'),
     IPAddr.new('192.168.0.0/16')
   ]
   
-  def private?
+  def unrouteable?
     return false unless self.ipv4?
-    PRIVATE_RANGES.any? { |ipr| ipr.include? self }
+    UNROUTEABLE_RANGES.any? { |ipr| ipr.include? self }
   end
 
-  def public?
-    !private?
+  def routeable?
+    !unrouteable?
   end
 end

data/lib/honeypot/rack.rb

@@ -8,16 +8,41 @@ module Honeypot
     end
 
     def call(env)
-      raw_remote_ip = if env.has_key?('action_dispatch.remote_ip') # rails 3
-        env['action_dispatch.remote_ip']
-      elsif env.has_key?('action_controller.rescue.request') # rails 2
-        env['action_controller.rescue.request'].remote_ip
-      end
-      if raw_remote_ip and session = env['rack.session']
-        remote_ip = IPAddr.new raw_remote_ip.to_s
-        session['honeypot.last_known_remote_ip'] = remote_ip.to_s if remote_ip.public?
+      remote_ip = _most_likely_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
       end
+      
+      # For use by other middleware or the app itself
+      env['honeypot.remote_ip'] = remote_ip.to_s
+
       @app.call env
     end
+
+    def _most_likely_remote_ip(env)
+      candidates = _collect_possible_remote_ips env
+      candidates.detect { |remote_ip| remote_ip.routeable? } || candidates.first
+    end
+
+    def _collect_possible_remote_ips(env)
+      candidates = Array.new
+      # rails 3
+      if env.has_key? 'action_dispatch.remote_ip'
+        candidates.push env['action_dispatch.remote_ip']
+      end
+      # rails 2
+      if env.has_key? 'action_controller.rescue.request'
+        candidates.push env['action_controller.rescue.request']
+      end
+      # saved by honeypot between requests
+      if env.has_key? 'rack.session'
+        candidates.push env['rack.session']['honeypot.last_known_routeable_remote_ip']
+      end
+      candidates.map! { |raw_ip_address| IPAddr.new raw_ip_address.to_s }
+      candidates
+    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: honeypot
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -04:00
+date: 2010-07-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fast_timestamp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: geokit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -49,9 +54,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
@@ -63,9 +70,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
@@ -77,9 +86,11 @@ dependencies:
   name: andand
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 3
@@ -123,23 +134,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Track remote requests to catch fraud.