cafe-grader-web Commit - r852:41c96ab8e589

cafe-grader-web

parent | child

Description:

use uuid cookie

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r852:41c96ab8e589 - Thu, 03 Feb 2022 17:22:51 - 3 files changed: 20 inserted, 2 deleted

app/controllers/application_controller.rb ¶ +8

               require 'ipaddr'
+            + require "securerandom"
               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 before_action :current_user
                 before_action :nav_announcement
+            +   before_action :unique_visitor_id
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 WHITELIST_IGNORE_CONF_KEY = 'right.whitelist_ignore'
                 WHITELIST_IP_CONF_KEY = 'right.whitelist_ip'
                     return true
                   end
                   unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
                 end
+            +   def unique_visitor_id
+            +     unless cookies[:uuid]
+            +       value = SecureRandom.uuid
+            +       cookies[:uuid] = { value: value, expires: 20.year }
+            +     end
+            +   end
                 protected
                 #redirect to root (and also force logout)
                 #if the user is not logged_in or the system is in "ADMIN ONLY" mode
                 def check_valid_login

app/controllers/login_controller.rb ¶ +11 -1

                   if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin?
                     flash[:notice] = 'You must accept the agreement before logging in'
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
+            +     #store uuid when login
+            +     if user.last_ip.nil?
+            +       user.last_ip = cookies[:uuid]
+            +     else
+            +       if user.last_ip != cookies[:uuid]
+            +         user.last_ip =cookies[:uuid]
+            +         #log different login
+            +       end
+            +     end
+            +
                   #process logging in
                   session[:user_id] = user.id
                   session[:admin] = user.admin?
                   # clear forced logout flag for multicontests contest change
                   if GraderConfiguration.multicontests?
                         contest_stat.save
                       end
                     end
                   end
                   #save login information
-            -     Login.create(user_id: user.id, ip_address: request.remote_ip)
+            +     Login.create(user_id: user.id, ip_address: cookies[:uuid])
                   redirect_to :controller => 'main', :action => 'list'
                 end
                 def site_login
                   begin

app/models/user.rb ¶ +1 -1

                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
+            +
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..50, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings