cafe-grader-web Commit - r539:c49187a88c77

cafe-grader-web

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r539:c49187a88c77 - Wed, 16 Sep 2015 06:29:27 - 2 files changed: 2 inserted, 1 deleted

app/controllers/application_controller.rb ¶ +1

                     end
                   end
                   return true
                 end
                 def authenticate_by_ip_address
                   #this assume that we have already authenticate normally
                   unless GraderConfiguration[MULTIPLE_IP_LOGIN_CONF_KEY]
                     user = User.find(session[:user_id])
                     if (not user.admin? and user.last_ip and user.last_ip != request.remote_ip)
                       flash[:notice] = "You cannot use the system from #{request.remote_ip}. Your last ip is #{user.last_ip}"
                       redirect_to :controller => 'main', :action => 'login'
+            +         puts "CHEAT: user #{user.login} tried to login from '#{request.remote_ip}' while last ip is '#{user.last_ip}' at #{Time.zone.now}"
                       return false
                     end
                     unless user.last_ip
                       user.last_ip = request.remote_ip
                       user.save
                     end
                   end
                   return true
                 end
                 def authorization
                   return false unless authenticate

app/controllers/heartbeat_controller.rb ¶ +1 -1

                   #  end
                   #  hb.touch
                   #else
                   #  HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
                   #end
                   HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
                   render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
                 end
                 def index
                   @hb = HeartBeat.where("updated_at >= ?",Time.zone.now-2.hours).includes(:user).order(:user_id).all
-            -     @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count
+            +     @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count(:user_id,distinct: true)
                 end
               end

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