Description:
use uuid cookie
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r849:2290fefd2c38 - - 2 files changed: 19 inserted, 1 deleted
| @@ -1,13 +1,15 | |||
|
|
1 | 1 | require 'ipaddr' |
|
|
2 | + require "securerandom" | |
|
|
2 | 3 | |
|
|
3 | 4 | class ApplicationController < ActionController::Base |
|
|
4 | 5 | protect_from_forgery |
|
|
5 | 6 | |
|
|
6 | 7 | before_action :current_user |
|
|
7 | 8 | before_action :nav_announcement |
|
|
9 | + before_action :unique_visitor_id | |
|
|
8 | 10 | |
|
|
9 | 11 | SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode' |
|
|
10 | 12 | MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login' |
|
|
11 | 13 | WHITELIST_IGNORE_CONF_KEY = 'right.whitelist_ignore' |
|
|
12 | 14 | WHITELIST_IP_CONF_KEY = 'right.whitelist_ip' |
|
|
13 | 15 | |
| @@ -51,12 +53,18 | |||
|
|
51 | 53 | return true |
|
|
52 | 54 | end |
|
|
53 | 55 | |
|
|
54 | 56 | unauthorized_redirect unless GraderConfiguration["right.view_testcase"] |
|
|
55 | 57 | end |
|
|
56 | 58 | |
|
|
59 | + def unique_visitor_id | |
|
|
60 | + unless cookies[:uuid] | |
|
|
61 | + value = SecureRandom.uuid | |
|
|
62 | + cookies[:uuid] = { value: value, expires: 20.year } | |
|
|
63 | + end | |
|
|
64 | + end | |
|
|
57 | 65 | |
|
|
58 | 66 | protected |
|
|
59 | 67 | |
|
|
60 | 68 | #redirect to root (and also force logout) |
|
|
61 | 69 | #if the user is not logged_in or the system is in "ADMIN ONLY" mode |
|
|
62 | 70 | def check_valid_login |
| @@ -19,12 +19,22 | |||
|
|
19 | 19 | if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin? |
|
|
20 | 20 | flash[:notice] = 'You must accept the agreement before logging in' |
|
|
21 | 21 | redirect_to :controller => 'main', :action => 'login' |
|
|
22 | 22 | return |
|
|
23 | 23 | end |
|
|
24 | 24 | |
|
|
25 | + #store uuid when login | |
|
|
26 | + if user.last_ip.nil? | |
|
|
27 | + user.last_ip = cookies[:uuid] | |
|
|
28 | + else | |
|
|
29 | + if user.last_ip != cookies[:uuid] | |
|
|
30 | + user.last_ip =cookies[:uuid] | |
|
|
31 | + #log different login | |
|
|
32 | + end | |
|
|
33 | + end | |
|
|
34 | + | |
|
|
25 | 35 | #process logging in |
|
|
26 | 36 | session[:user_id] = user.id |
|
|
27 | 37 | session[:admin] = user.admin? |
|
|
28 | 38 | |
|
|
29 | 39 | # clear forced logout flag for multicontests contest change |
|
|
30 | 40 | if GraderConfiguration.multicontests? |
| @@ -35,13 +45,13 | |||
|
|
35 | 45 | contest_stat.save |
|
|
36 | 46 | end |
|
|
37 | 47 | end |
|
|
38 | 48 | end |
|
|
39 | 49 | |
|
|
40 | 50 | #save login information |
|
|
41 |
- Login.create(user_id: user.id, ip_address: |
|
|
|
51 | + Login.create(user_id: user.id, ip_address: cookies[:uuid]) | |
|
|
42 | 52 | |
|
|
43 | 53 | redirect_to :controller => 'main', :action => 'list' |
|
|
44 | 54 | end |
|
|
45 | 55 | |
|
|
46 | 56 | def site_login |
|
|
47 | 57 | begin |
You need to be logged in to leave comments.
Login now