cafe-grader-web Commit - r525:89e2deff986b

cafe-grader-web

Commit `r525:89e2deff986b` public

parent | child

Description:

add option to disable login from multiple ip

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r525:89e2deff986b - Thu, 18 Jun 2015 11:10:53 - 6 files changed: 59 inserted, 27 deleted

app/controllers/application_controller.rb ¶ +18

               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
+            +   MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 def admin_authorization
                   return false unless authenticate
                   user = User.find(session[:user_id], :include => ['roles'])
                   unless user.admin?
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     rescue
                     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'
+            +         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
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role|
               	role.rights.detect{ |right|
               	  right.controller == self.class.controller_name and

app/controllers/configurations_controller.rb ¶ +1

                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
                 def update
                   @config = GraderConfiguration.find(params[:id])
+            +     User.clear_last_login if @config.key = 'multiple_ip_login' and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
                   respond_to do |format|
                     if @config.update_attributes(params[:grader_configuration])
                       format.json { head :ok }
                     else
                       format.json { respond_with_bip(@config) }
                     end

app/controllers/main_controller.rb ¶ +2

                 # to prevent log in box to be shown when user logged out of the
                 # system only in some tab
                 prepend_before_filter :reject_announcement_refresh_when_logged_out,
                                       :only => [:announcements]
+            +   before_filter :authenticate_by_ip_address, :only => [:list]
+            +
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }

app/models/user.rb ¶ +4

                     return problem.available
                   else
                     return problem_in_user_contests? problem
                   end
                 end
+            +   def self.clear_last_login
+            +     User.update_all(:last_ip => nil)
+            +   end
+            +
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end

db/schema.rb ¶ +27 -27

               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20150503164846) do
+            + ActiveRecord::Schema.define(:version => 20150618085823) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
-            -     t.text     "body",         :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "published"
-            -     t.datetime "created_at",                                          :null => false
-            -     t.datetime "updated_at",                                          :null => false
-            -     t.boolean  "frontpage",                        :default => false
-            -     t.boolean  "contest_only",                     :default => false
+            +     t.datetime "created_at",                      :null => false
+            +     t.datetime "updated_at",                      :null => false
+            +     t.boolean  "frontpage",    :default => false
+            +     t.boolean  "contest_only", :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.string   "name"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "descriptions", :force => true do |t|
-            -     t.text     "body",       :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "markdowned"
-            -     t.datetime "created_at",                     :null => false
-            -     t.datetime "updated_at",                     :null => false
+            +     t.datetime "created_at", :null => false
+            +     t.datetime "updated_at", :null => false
                 end
                 create_table "grader_configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
-            -     t.datetime "created_at",                      :null => false
-            -     t.datetime "updated_at",                      :null => false
-            -     t.text     "description", :limit => 16777215
+            +     t.datetime "created_at",  :null => false
+            +     t.datetime "updated_at",  :null => false
+            +     t.text     "description"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
-            -     t.text     "body",                :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "replied"
-            -     t.datetime "created_at",                              :null => false
-            -     t.datetime "updated_at",                              :null => false
+            +     t.datetime "created_at",          :null => false
+            +     t.datetime "updated_at",          :null => false
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",                 :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
-            -     t.text     "data",       :limit => 16777215
+            +     t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
-            -     t.text     "source",                :limit => 16777215
+            +     t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message",      :limit => 16777215
+            +     t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
-            -     t.text     "grader_comment",        :limit => 16777215
+            +     t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
                   t.float    "max_runtime"
                   t.integer  "peak_memory"
                   t.integer  "effective_code_length"
                   t.string   "ip_address"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
-            -     t.text     "input",      :limit => 2147483647
-            -     t.text     "solution",   :limit => 2147483647
-            -     t.datetime "created_at",                       :null => false
-            -     t.datetime "updated_at",                       :null => false
+            +     t.text     "input",      :limit => 16777215
+            +     t.text     "solution",   :limit => 16777215
+            +     t.datetime "created_at",                     :null => false
+            +     t.datetime "updated_at",                     :null => false
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
-            -     t.datetime "updated_at",                           :null => false
+            +     t.datetime "updated_at",       :null => false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message", :limit => 16777215
+            +     t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
-            -     t.datetime "created_at",                           :null => false
+            +     t.datetime "created_at",       :null => false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.string   "section"
                   t.boolean  "enabled",                       :default => true
                   t.string   "remark"
+            +     t.string   "last_ip"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

db/seeds.rb ¶ +7

                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can access hall of fame page.'
                  },
                  {
+            +      :key => 'right.multiple_ip_login',
+            +      :value_type => 'boolean',
+            +      :default_value => 'true',
+            +      :description => 'When change from true to false, a user can login from the first IP they logged into afterward.'
+            +    },
+            +
+            +    {
                    :key => 'right.user_view_submission',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can view submissions of every one.'
                  },

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Author

r525:89e2deff986b - Thu, 18 Jun 2015 11:10:53 - 6 files changed: 59 inserted, 27 deleted

Sign in to your account

Commit r525:89e2deff986b public

Author

r525:89e2deff986b - Thu, 18 Jun 2015 11:10:53 - 6 files changed: 59 inserted, 27 deleted

Commit `r525:89e2deff986b` public