From 5b3a4b768ce05c5cc5b3f794f830242ed6ade46a Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Thu, 17 Dec 2015 14:29:17 -0800
Subject: [PATCH] fixes #2557

---
 app/controllers/sessions_controller.rb                 | 2 +-
 app/logical/moderator/ip_addr_search.rb                | 1 +
 app/logical/session_creator.rb                         | 6 ++++--
 db/migrate/20151217213321_add_last_ip_addr_to_users.rb | 6 ++++++
 db/structure.sql                                       | 5 ++++-
 test/functional/sessions_controller_test.rb            | 2 ++
 6 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20151217213321_add_last_ip_addr_to_users.rb

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index a493bf9a3..b824800d0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,7 +4,7 @@ class SessionsController < ApplicationController
   end
 
   def create
-    session_creator = SessionCreator.new(session, cookies, params[:name], params[:password], params[:remember], request.ssl?)
+    session_creator = SessionCreator.new(session, cookies, params[:name], params[:password], request.remote_ip, params[:remember], request.ssl?)
 
     if session_creator.authenticate
       url = params[:url] if params[:url] && params[:url].start_with?("/")
diff --git a/app/logical/moderator/ip_addr_search.rb b/app/logical/moderator/ip_addr_search.rb
index 74b11ace8..cb056cd7a 100644
--- a/app/logical/moderator/ip_addr_search.rb
+++ b/app/logical/moderator/ip_addr_search.rb
@@ -27,6 +27,7 @@ module Moderator
     def search_by_ip_addr(ip_addrs)
       sums = Hash.new {|h, k| h[k] = 0}
 
+      add_row(sums, "select id as k, 1 as count from users where last_ip_addr in (?)", ip_addrs)
       add_row(sums, "select creator_id as k, count(*) from comments where ip_addr in (?) group by k", ip_addrs)
       add_row(sums, "select updater_id as k, count(*) from post_versions where updater_ip_addr in (?) group by k", ip_addrs)
       add_row(sums, "select updater_id as k, count(*) from note_versions where updater_ip_addr in (?) group by k", ip_addrs)
diff --git a/app/logical/session_creator.rb b/app/logical/session_creator.rb
index a0aff070c..8b60032a7 100644
--- a/app/logical/session_creator.rb
+++ b/app/logical/session_creator.rb
@@ -1,11 +1,12 @@
 class SessionCreator
-  attr_reader :session, :cookies, :name, :password, :remember, :secure
+  attr_reader :session, :cookies, :name, :password, :ip_addr, :remember, :secure
 
-  def initialize(session, cookies, name, password, remember = false, secure = false)
+  def initialize(session, cookies, name, password, ip_addr, remember = false, secure = false)
     @session = session
     @cookies = cookies
     @name = name
     @password = password
+    @ip_addr = ip_addr
     @remember = remember
     @secure = secure
   end
@@ -27,6 +28,7 @@ class SessionCreator
       end
 
       session[:user_id] = user.id
+      user.update_column(:last_ip_addr, ip_addr)
       return true
     else
       return false
diff --git a/db/migrate/20151217213321_add_last_ip_addr_to_users.rb b/db/migrate/20151217213321_add_last_ip_addr_to_users.rb
new file mode 100644
index 000000000..68a38b419
--- /dev/null
+++ b/db/migrate/20151217213321_add_last_ip_addr_to_users.rb
@@ -0,0 +1,6 @@
+class AddLastIpAddrToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :last_ip_addr, :inet
+    add_index :users, :last_ip_addr, where: "last_ip_addr is not null"
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index b231fbf3e..55adb76b0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -3175,7 +3175,8 @@ furry -rating:s'::text,
     bcrypt_password_hash text,
     per_page integer DEFAULT 20 NOT NULL,
     custom_style text,
-    bit_prefs bigint DEFAULT 0 NOT NULL
+    bit_prefs bigint DEFAULT 0 NOT NULL,
+    last_ip_addr inet
 );
 
 
@@ -7276,3 +7277,5 @@ INSERT INTO schema_migrations (version) VALUES ('20150728170433');
 
 INSERT INTO schema_migrations (version) VALUES ('20150805010245');
 
+INSERT INTO schema_migrations (version) VALUES ('20151217213321');
+
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index aba793d05..038e5aea5 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -17,7 +17,9 @@ class SessionsControllerTest < ActionController::TestCase
       should "create a new session" do
         post :create, {:name => @user.name, :password => "password"}
         assert_redirected_to posts_path
+        @user.reload
         assert_equal(@user.id, session[:user_id])
+        assert_not_nil(@user.last_ip_addr)
       end
     end