honeypot 0.0.3 → 0.0.4

data/README.rdoc

@@ -29,7 +29,7 @@ when somebody touches a honeypot, make sure to log it:
   class UsersController < ApplicationController
     def create
       # [...]
-      @user.log_remote_request(session, request)
+      @user.log_remote_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(session, request)
+      @vote.log_remote_request(request)
       # [...]
     end
   end
@@ -48,13 +48,11 @@ and be creative...
     # notice when a User logs in
     def create
       # [...]
-      current_user.log_remote_request(session, request)
+      current_user.log_remote_request(request)
       # [...]
     end
   end
 
-you pass both the session and the request so that you have the maximum chance of getting a real remote ip
-
 == migration
 
   create_table "remote_hosts" do |t|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/honeypot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{honeypot}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-05-13}
   s.description = %q{Catch bad guys when they stick their hands in the honey.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [

data/lib/honeypot.rb

@@ -1,6 +1,12 @@
 require 'ipaddr'
 require 'set'
 require 'active_support'
+require 'active_support/version'
+%w{
+  active_support/core_ext/object/blank
+}.each do |active_support_3_requirement|
+  require active_support_3_requirement
+end if ActiveSupport::VERSION::MAJOR == 3
 require 'active_record'
 require 'fast_timestamp'
 require 'honeypot/ipaddr_ext'
@@ -18,12 +24,15 @@ module Honeypot
     end
   end
   
-  def log_remote_request(session, request)
-    effective_ip_address = session['honeypot.last_known_remote_ip'].present? ? session['honeypot.last_known_remote_ip'] : request.remote_ip
+  def log_remote_request(request)
+    effective_ip_address = [
+      request.env['rack.session']['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
     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.fullpath if request.fullpath.present?
+    remote_request.last_request_uri = request.url if request.url.present?
     remote_request.increment :hits
     remote_request.save!
     true

data/lib/honeypot/railtie.rb

@@ -3,8 +3,8 @@ require 'rails'
 
 module Honeypot
   class Railtie < Rails::Railtie
-    initializer "honeypot.configure_rails_initialization" do |app|
-      app.middleware.use Honeypot::Rack
+    initializer 'honeypot.configure_rails_initialization' do |app|
+      app.middleware.insert_after 'ActionDispatch::RemoteIp', ::Honeypot::Rack
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -04:00
+date: 2010-05-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency