cafe-grader-web Commit - r796:d1494dbef0e7

cafe-grader-web

Commit `r796:d1494dbef0e7` public

parent | child

Description:

problem group enabled

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

r796:d1494dbef0e7 - Thu, 13 Aug 2020 16:12:11 - 3 files changed: 70 inserted, 71 deleted

Gemfile.lock ¶ -4

                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bindex (0.7.0)
                   bootsnap (1.4.4)
                     msgpack (~> 1.0)
                   bootstrap-datepicker-rails (1.8.0.1)
                     railties (>= 3.0)
                   bootstrap-sass (3.4.1)
                     autoprefixer-rails (>= 5.2.1)
                     sassc (>= 2.0.0)
                   bootstrap-switch-rails (3.3.4)
                   bootstrap-toggle-rails (2.2.1.0)
                   bootstrap3-datetimepicker-rails (4.17.47)
                     momentjs-rails (>= 2.8.1)
                   builder (3.2.3)
                   byebug (11.0.1)
                   capybara (3.25.0)
                     addressable
                     mini_mime (>= 0.1.3)
                     nokogiri (~> 1.8)
                     rack (>= 1.6.0)
                     rack-test (>= 0.6.3)
                     regexp_parser (~> 1.5)
                     xpath (~> 3.2)
-            -     capybara-console (0.0.4)
-            -       capybara
-            -       rails (>= 3.0)
                   childprocess (1.0.1)
                     rake (< 13.0)
                   coffee-rails (4.2.2)
                     coffee-script (>= 2.2.0)
                     railties (>= 4.0.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.1.5)
                   crass (1.0.4)
                   dynamic_form (1.1.4)
                   erubi (1.8.0)
                   erubis (2.7.0)
                   execjs (2.7.0)
                   ffi (1.11.1)
                   fuzzy-string-match (1.0.1)
                     RubyInline (>= 3.8.6)
                   globalid (0.4.2)
                     activesupport (>= 4.2.0)
                   haml (5.1.0)
                     temple (>= 0.8.0)
                     tilt
                   haml-rails (1.0.0)
                   websocket-extensions (0.1.4)
                   will_paginate (3.0.12)
                   xpath (3.2.0)
                     nokogiri (~> 1.8)
                   yaml_db (0.7.0)
                     rails (>= 3.0)
                     rake (>= 0.8.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootsnap (>= 1.1.0)
                 bootstrap-datepicker-rails
                 bootstrap-sass (~> 3.4.1)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 bootstrap3-datetimepicker-rails
                 byebug
                 capybara (>= 2.15)
-            -   capybara-console
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing
                 jbuilder (~> 2.5)
                 jquery-countdown-rails
                 jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 puma
                 rails (~> 5.2)
                 rails-controller-testing
                 rails_bootstrap_sortable
                 rdiscount
                 rouge

app/controllers/application_controller.rb ¶ +2 -1

                       }
                     }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 def verify_time_limit
                   return true if session[:user_id]==nil
                   user = User.find(session[:user_id], :include => :site)
                   return true if user==nil || user.site == nil
                   if user.contest_finished?
                     flash[:notice] = 'Error: the contest you are participating is over.'
                     redirect_to :back
                     return false
                   end
                   return true
                 end
                 def is_request_ip_allowed?
                   unless GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     user_ip = IPAddr.new(request.remote_ip)
+            +       allowed = GraderConfiguration[WHITELIST_IP_CONF_KEY] || ''
-            -       GraderConfiguration[WHITELIST_IP_CONF_KEY].delete(' ').split(',').each do |ips|
+            +       allowed.delete(' ').split(',').each do |ips|
                       allow_ips = IPAddr.new(ips)
                       if allow_ips.include?(user_ip)
                         return true
                       end
                     end
                     return false
                   end
                   return true
                 end
               end

db/schema.rb ¶ +68 -66

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # 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 that you check this file into your version control system.
               ActiveRecord::Schema.define(version: 2020_08_13_083020) do
-            -   create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "author"
-            -     t.text "body"
+            +     t.text "body", limit: 16777215
                   t.boolean "published"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     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", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "title"
                   t.boolean "enabled"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                   t.string "name"
                 end
-            -   create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
-            -   create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
-            -   create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                 end
-            -   create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-            -     t.text "body"
+            +     t.text "body", limit: 16777215
                   t.boolean "markdowned"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                 end
-            -   create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "key"
                   t.string "value_type"
                   t.string "value"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
-            -     t.text "description"
+            +     t.text "description", limit: 16777215
                 end
-            -   create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "host"
                   t.integer "pid"
                   t.string "mode"
                   t.boolean "active"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                   t.integer "task_id"
                   t.string "task_type"
                   t.boolean "terminated"
-            -     t.index ["host", "pid"], name: "index_grader_processes_on_host_and_pid"
+            +     t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
                 end
                 create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.string "description"
                   t.boolean "enabled", default: true
                 end
                 create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id", null: false
                   t.integer "group_id", null: false
                   t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id"
                 end
-            -   create_table "groups_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "groups_users", options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "group_id", null: false
                   t.integer "user_id", null: false
                   t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
                 end
                 create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                   t.string "status"
                   t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
                 end
-            -   create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name", limit: 10
                   t.string "pretty_name"
                   t.string "ext", limit: 10
                   t.string "common_ext"
                 end
                 create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
+            +     t.index ["user_id"], name: "index_logins_on_user_id"
                 end
-            -   create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "sender_id"
                   t.integer "receiver_id"
                   t.integer "replying_message_id"
-            -     t.text "body"
+            +     t.text "body", limit: 16777215
                   t.boolean "replied"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                 end
-            -   create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-            -     t.string "name", limit: 30
+            +     t.string "name", limit: 100
                   t.string "full_name"
                   t.integer "full_score"
                   t.date "date_added"
                   t.boolean "available"
                   t.string "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string "description_filename"
                   t.boolean "view_testcase"
                 end
                 create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id"
                   t.integer "tag_id"
                   t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
                   t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
                   t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
                 end
-            -   create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
-            -   create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                   t.index ["role_id"], name: "index_rights_roles_on_role_id"
                 end
-            -   create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"
                 end
-            -   create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                   t.index ["user_id"], name: "index_roles_users_on_user_id"
                 end
-            -   create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "session_id"
-            -     t.text "data"
+            +     t.text "data", limit: 16777215
                   t.datetime "updated_at"
                   t.index ["session_id"], name: "index_sessions_on_session_id"
                   t.index ["updated_at"], name: "index_sessions_on_updated_at"
                 end
-            -   create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"
                   t.boolean "started"
                   t.datetime "start_time"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                   t.integer "country_id"
                   t.string "password"
                 end
                 create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "submission_id"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                 end
-            -   create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "problem_id"
                   t.integer "language_id"
                   t.text "source", limit: 16777215
                   t.binary "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text "compiler_message"
+            +     t.text "compiler_message", limit: 16777215
                   t.datetime "graded_at"
                   t.integer "points"
-            -     t.text "grader_comment"
+            +     t.text "grader_comment", limit: 16777215
                   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.index ["submitted_at"], name: "index_submissions_on_submitted_at"
                   t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
                   t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
                 end
                 create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name", null: false
                   t.text "description"
                   t.boolean "public"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
-            -   create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "submission_id"
                   t.datetime "created_at"
                   t.integer "status"
                   t.datetime "updated_at"
                   t.index ["submission_id"], name: "index_tasks_on_submission_id"
                 end
-            -   create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "problem_id"
-            -     t.text "input", limit: 16777215
+            +     t.text "input", limit: 4294967295
-            -     t.text "solution", limit: 16777215
+            +     t.text "solution", limit: 4294967295
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                 end
-            -   create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade 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"
+            +     t.datetime "updated_at", null: false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text "compiler_message"
+            +     t.text "compiler_message", limit: 16777215
                   t.datetime "graded_at"
                   t.string "grader_comment"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
                   t.float "running_time"
                   t.string "exit_status"
                   t.integer "memory_usage"
                   t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
                 end
                 create_table "testcases", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id"
                   t.integer "num"
                   t.integer "group"
                   t.integer "score"
                   t.text "input", limit: 4294967295
                   t.text "sol", limit: 4294967295
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                   t.index ["problem_id"], name: "index_testcases_on_problem_id"
                 end
-            -   create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "user_id"
                   t.datetime "started_at"
-            -     t.datetime "created_at"
+            +     t.datetime "created_at", null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at", null: false
                   t.boolean "forced_logout"
                 end
-            -   create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "login", limit: 50
                   t.string "full_name"
                   t.string "hashed_password"
                   t.string "salt", limit: 5
                   t.string "alias"
                   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"
                   t.index ["login"], name: "index_users_on_login", unique: true
                 end
                 add_foreign_key "problems_tags", "problems"
                 add_foreign_key "problems_tags", "tags"
               end

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

r796:d1494dbef0e7 - Thu, 13 Aug 2020 16:12:11 - 3 files changed: 70 inserted, 71 deleted

Sign in to your account

Commit r796:d1494dbef0e7 public

Author

r796:d1494dbef0e7 - Thu, 13 Aug 2020 16:12:11 - 3 files changed: 70 inserted, 71 deleted

Commit `r796:d1494dbef0e7` public