cafe-grader-web

Commit r539:c49187a88c77 public

parent | child
Description:
update heartbeat add try-to-login-from-other-ip loggin (by printing to stdout)
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r539:c49187a88c77 - - 2 files changed: 2 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -60,24 +60,25
60 60 end
61 61 end
62 62 return true
63 63 end
64 64
65 65 def authenticate_by_ip_address
66 66 #this assume that we have already authenticate normally
67 67 unless GraderConfiguration[MULTIPLE_IP_LOGIN_CONF_KEY]
68 68 user = User.find(session[:user_id])
69 69 if (not user.admin? and user.last_ip and user.last_ip != request.remote_ip)
70 70 flash[:notice] = "You cannot use the system from #{request.remote_ip}. Your last ip is #{user.last_ip}"
71 71 redirect_to :controller => 'main', :action => 'login'
72 + puts "CHEAT: user #{user.login} tried to login from '#{request.remote_ip}' while last ip is '#{user.last_ip}' at #{Time.zone.now}"
72 73 return false
73 74 end
74 75 unless user.last_ip
75 76 user.last_ip = request.remote_ip
76 77 user.save
77 78 end
78 79 end
79 80 return true
80 81 end
81 82
82 83 def authorization
83 84 return false unless authenticate
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -17,15 +17,15
17 17 # end
18 18 # hb.touch
19 19 #else
20 20 # HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
21 21 #end
22 22 HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
23 23
24 24 render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
25 25 end
26 26
27 27 def index
28 28 @hb = HeartBeat.where("updated_at >= ?",Time.zone.now-2.hours).includes(:user).order(:user_id).all
29 - @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count
29 + @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count(:user_id,distinct: true)
30 30 end
31 31 end
You need to be logged in to leave comments. Login now