cafe-grader-web Commit - r282:6dab27215603

cafe-grader-web

Commit `r282:6dab27215603` public

parent | child

Description:

added contest problem access control

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r282:6dab27215603 - Thu, 04 Mar 2010 17:56:29 - 5 files changed: 76 inserted, 17 deleted

app/controllers/tasks_controller.rb ¶ +28 -13

               class TasksController < ApplicationController
                 before_filter :authenticate, :check_viewability
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @problems = Problem.find_available_problems
-            -     @user = User.find(session[:user_id])
                 end
+            +   # this has contest-wide access control
                 def view
                   base_name = params[:file]
-            -     if !check_user_viewability(base_name)
+            +     base_filename = File.basename("#{base_name}.#{params[:ext]}")
+            +     filename = "#{Problem.download_file_basedir}/#{base_filename}"
+            +
+            +     if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end
-            -     base_filename = File.basename("#{base_name}.#{params[:ext]}")
+            +     send_file_to_user(filename, base_filename)
-            -     filename = "#{Problem.download_file_basedir}/#{base_filename}"
+            +   end
-            -     if !check_user_viewability(base_name) or !FileTest.exists?(filename)
+            +   # this has problem-level access control
+            +   def download
+            +     problem = Problem.find(params[:id])
+            +     if !problem or !problem.available or !@user.can_view_problem? problem
                     redirect_to :action => 'index' and return
                   end
+            +     base_name = params[:file]
+            +     base_filename = File.basename("#{base_name}.#{params[:ext]}")
+            +     filename = "#{Problem.download_file_basedir}/#{params[:id]}/#{base_filename}"
+            +     puts "SENDING: #{filename}"
+            +
+            +     if !FileTest.exists?(filename)
+            +       redirect_to :action => 'index' and return
+            +     end
+            +
+            +     puts "SENDING: #{filename}"
+            +
+            +     send_file_to_user(filename, base_filename)
+            +   end
+            +
+            +   protected
+            +
+            +   def send_file_to_user(filename, base_filename)
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
                     response.headers["X-Sendfile"] = filename
                     response.headers['Content-length'] = File.size(filename)
                     render :nothing => true
                   else
                     if params[:ext]=='pdf'
                       content_type = 'application/pdf'
                     else
                       content_type = 'application/octet-stream'
                     end
                     send_file filename, :stream => false, :filename => base_filename, :type => content_type
                   end
                 end
-            -   protected
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if @user==nil or !Configuration.show_tasks_to?(@user)
                     redirect_to :controller => 'main', :action => 'list'
                     return false
                   end
                 end
-            -   def check_user_viewability(filename)
-            -     # individual file access control shall be added here
-            -     return false if not @user
-            -     return Configuration.show_tasks_to?(@user)
               end
-            - end

app/helpers/main_helper.rb ¶ +2 -1

               module MainHelper
                 def link_to_description_if_any(name, problem, options={})
                   if !problem.url.blank?
                     return link_to name, problem.url, options
                   elsif !problem.description_filename.blank?
                     basename, ext = problem.description_filename.split('.')
                     options[:controller] = 'tasks'
-            -       options[:action] = 'view'
+            +       options[:action] = 'download'
+            +       options[:id] = problem.id
                     options[:file] = basename
                     options[:ext] = ext
                     return link_to name, options
                   else
                     return ''
                   end
                 end
               end

app/models/user.rb ¶ +23

                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end
                 def contest_finished?
                   if Configuration.contest_mode?
                     return false if site==nil
                     return site.finished?
                   elsif Configuration.indv_contest_mode?
                     time_limit = Configuration.contest_time_limit
                     return false if contest_stat==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
                   if Configuration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
                 def update_start_time
                   stat = self.contest_stat
                   if stat == nil
                     stat = UserContestStat.new(:user => self,
                                                :started_at => Time.now.gmtime)
                     stat.save
                   end
                 end
+            +   def problem_in_user_contests?(problem)
+            +     problem_contests = problem.contests.all
+            +
+            +     if problem_contests.length == 0   # this is public contest
+            +       return true
+            +     end
+            +
+            +     contests.each do |contest|
+            +       if problem_contests.find {|c| c.id == contest.id }
+            +         return true
+            +       end
+            +     end
+            +     return false
+            +   end
+            +
+            +   def can_view_problem?(problem)
+            +     if not Configuration.multicontests?
+            +       return problem.available
+            +     else
+            +       return problem_in_user_contests? problem
+            +     end
+            +   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
                   def assign_default_site
                     # have to catch error when migrating (because self.site is not available).
                     begin
                       if self.site==nil
                         self.site = Site.find_by_name('default')
                         if self.site==nil
                           self.site = Site.find(1)  # when 'default has be renamed'
                         end
                       end
                     rescue
                     end
                   end
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
                   def uniqueness_of_email_from_activated_users
                     user = User.activated_users.find_by_email(self.email)
                     if user and (user.login != self.login)
                       self.errors.add_to_base("Email has already been taken")
                     end
                   end
                   def enough_time_interval_between_same_email_registrations
                     return if !self.new_record?
                     return if self.activated
                     open_user = User.find_by_email(self.email,
                                                    :order => 'created_at DESC')
                     if open_user and open_user.created_at and
                         (open_user.created_at > Time.now.gmtime - 5.minutes)
                       self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
                     end
                   end
                   def email_validation?
                     begin

config/routes.rb ¶ +1

               ActionController::Routing::Routes.draw do |map|
                 map.resources :contests
                 map.resources :announcements
                 map.resources :sites
                 # The priority is based upon order of creation: first created -> highest priority.
                 # Sample of regular route:
                 # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
                 # Keep in mind you can assign values other than :controller and :action
                 # Sample of named route:
                 # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
                 # This route can be invoked with purchase_url(:id => product.id)
                 # You can have the root of your site routed by hooking up ''
                 # -- just remember to delete public/index.html.
                 map.connect '', :controller => 'main', :action => 'login'
                 # Allow downloading Web Service WSDL as a file with an extension
                 # instead of a file named 'wsdl'
                 map.connect ':controller/service.wsdl', :action => 'wsdl'
                 map.connect 'tasks/view/:file.:ext', :controller => 'tasks', :action => 'view'
+            +   map.connect 'tasks/download/:id/:file.:ext', :controller => 'tasks', :action => 'download'
                 # Install the default route as the lowest priority.
                 map.connect ':controller/:action/:id.:format'
                 map.connect ':controller/:action/:id'
               end

lib/testdata_importer.rb ¶ +22 -3

                 def initialize(problem)
                   @problem = problem
                 end
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
                                      import_to_db=false)
                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
                                                                 memory_limit)
                   else
                     # Import test data to test pairs.
                     @problem.test_pairs.clear
                     if import_test_pairs(dirname)
                       test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
                       @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
                     else
                       @log_msg = "Importing test pair failed. (0 test pairs imported)"
                     end
                   end
                   @log_msg << import_problem_description(dirname)
                   @log_msg << import_problem_pdf(dirname)
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
+            +     if File.exists? extract_dir
+            +       backup_count = 0
                     begin
+            +         backup_count += 1
+            +         backup_dirname = "#{extract_dir}.backup.#{backup_count}"
+            +       end while File.exists? backup_dirname
+            +       File.rename(extract_dir, backup_dirname)
+            +     end
                   Dir.mkdir extract_dir
-            -     rescue Errno::EEXIST
-            -     end
                   if ext=='.tar.gz' or ext=='.tgz'
                     cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.tar'
                     cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.zip'
                     cmd = "unzip -o #{testdata_filename} -d #{extract_dir}"
                   else
                     return nil
                   end
                   system(cmd)
                   files = Dir["#{extract_dir}/**/*1*.in"]
                   return nil if files.length==0
                   File.delete(testdata_filename)
                   return File.dirname(files[0])
                 end
                 def save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}")
                   return nil if tempfile==""
                   if tempfile.instance_of?(Tempfile)
                     tempfile.close
                     FileUtils.move(tempfile.path,testdata_filename)
                   else
                     File.open(testdata_filename, "wb") do |f|
                       f.write(tempfile.read)
                     end
                   end
                   return testdata_filename
                 end
                 def import_test_pairs(dirname)
                   test_num = 1
                   while FileTest.exists? "#{dirname}/#{test_num}.in"
                     in_filename = "#{dirname}/#{test_num}.in"
                     sol_filename = "#{dirname}/#{test_num}.sol"
                     break if not FileTest.exists? sol_filename
                     test_pair = TestPair.new(:input => open(in_filename).read,
                                              :solution => open(sol_filename).read,
                                              :problem => @problem)
                     break if not test_pair.save
                     test_num += 1
                   end
                   return test_num > 1
                 end
                 def import_problem_description(dirname)
                   html_files = Dir["#{dirname}/*.html"]
                   markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
                   if (html_files.length != 0) or (markdown_files.length != 0)
                     description = @problem.description || Description.new
                     if html_files.length != 0
                       filename = html_files[0]
                       description.markdowned = false
                     else
                       filename = markdown_files[0]
                       description.markdowned = true
                     end
                     description.body = open(filename).read
                     description.save
                     @problem.description = description
                     @problem.save
                     return "\nProblem description imported from #{filename}."
                   else
                     return ''
                   end
                 end
                 def import_problem_pdf(dirname)
                   pdf_files = Dir["#{dirname}/*.pdf"]
+            +     puts "CHECKING... #{dirname}"
                   if pdf_files.length != 0
+            +       puts "HAS PDF FILE"
                     filename = pdf_files[0]
-            -       out_filename = "#{Problem.download_file_basedir}/#{@problem.name}.pdf"
+            +       @problem.save if not @problem.id
+            +       out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
+            +       if not FileTest.exists? out_dirname
+            +         Dir.mkdir out_dirname
+            +       end
+            +
+            +       out_filename = "#{out_dirname}/#{@problem.name}.pdf"
+            +
+            +       if FileTest.exists? out_filename
+            +         File.delete out_filename
+            +       end
+            +
                     File.rename(filename, out_filename)
                     @problem.description_filename = "#{@problem.name}.pdf"
                     @problem.save
                     return "\nProblem pdf imported from #{filename}."
                   else
                     return ""
                   end
                 end
               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

r282:6dab27215603 - Thu, 04 Mar 2010 17:56:29 - 5 files changed: 76 inserted, 17 deleted

Sign in to your account

Commit r282:6dab27215603 public

Author

r282:6dab27215603 - Thu, 04 Mar 2010 17:56:29 - 5 files changed: 76 inserted, 17 deleted

Commit `r282:6dab27215603` public