honeypot 0.0.5 → 0.0.6

data/Rakefile

@@ -12,8 +12,9 @@ begin
     gem.authors = ["Seamus Abshere"]
     gem.add_dependency 'fast_timestamp', '>=0.0.4'
     gem.add_dependency 'geokit', '>=1.5.0'
-    gem.add_dependency 'activesupport', '>=3.0.0beta2'
-    gem.add_dependency 'activerecord', '>=3.0.0beta2'
+    gem.add_dependency 'activesupport', '>=2.3.8'
+    gem.add_dependency 'activerecord', '>=2.3.8'
+    gem.add_dependency 'andand', '>=1.3.1'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/honeypot.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{honeypot}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/honeypot.rb",
      "lib/honeypot/ipaddr_ext.rb",
      "lib/honeypot/rack.rb",
+     "lib/honeypot/rails.rb",
      "lib/honeypot/railtie.rb",
      "lib/honeypot/remote_host.rb",
      "lib/honeypot/remote_request.rb",
@@ -50,19 +51,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= 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>, [">= 3.0.0beta2"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0beta2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<andand>, [">= 1.3.1"])
     else
       s.add_dependency(%q<fast_timestamp>, [">= 0.0.4"])
       s.add_dependency(%q<geokit>, [">= 1.5.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0beta2"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0beta2"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.8"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.8"])
+      s.add_dependency(%q<andand>, [">= 1.3.1"])
     end
   else
     s.add_dependency(%q<fast_timestamp>, [">= 0.0.4"])
     s.add_dependency(%q<geokit>, [">= 1.5.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0beta2"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0beta2"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.8"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.8"])
+    s.add_dependency(%q<andand>, [">= 1.3.1"])
   end
 end
 

data/lib/honeypot.rb

@@ -1,5 +1,6 @@
 require 'ipaddr'
 require 'set'
+require 'andand'
 require 'active_support'
 require 'active_support/version'
 %w{
@@ -26,7 +27,7 @@ module Honeypot
   
   def log_remote_request(request)
     effective_ip_address = [
-      request.env['rack.session']['honeypot.last_known_remote_ip'].to_s,
+      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

data/lib/honeypot/rack.rb

@@ -8,8 +8,13 @@ module Honeypot
     end
 
     def call(env)
-      if session = env['rack.session'] and raw_remote_ip = env['action_dispatch.remote_ip']
-        remote_ip = IPAddr.new raw_remote_ip.to_s 
+      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?
       end
       @app.call env

data/lib/honeypot/rails.rb

@@ -0,0 +1,5 @@
+require 'honeypot'
+
+if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
+  ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', ::Honeypot::Rack
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -53,10 +53,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 3
-        - 0
-        - 0beta2
-        version: 3.0.0beta2
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -67,12 +67,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 3
-        - 0
-        - 0beta2
-        version: 3.0.0beta2
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: andand
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :runtime
+  version_requirements: *id005
 description: Catch bad guys when they stick their hands in the honey.
 email: seamus@abshere.net
 executables: []
@@ -93,6 +107,7 @@ files:
 - lib/honeypot.rb
 - lib/honeypot/ipaddr_ext.rb
 - lib/honeypot/rack.rb
+- lib/honeypot/rails.rb
 - lib/honeypot/railtie.rb
 - lib/honeypot/remote_host.rb
 - lib/honeypot/remote_request.rb