cafe-grader-web

Commit r683:d4ac431eeeb6 public

parent | child
Description:
fix access right control bugs
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r683:d4ac431eeeb6 - - 2 files changed: 9 inserted, 7 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,15 +1,15
1 1 class SubmissionsController < ApplicationController
2 2 before_action :authenticate
3 - before_action :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
3 + before_action :submission_authorization, only: [:show, :download, :edit]
4 4 before_action :admin_authorization, only: [:rejudge]
5 5
6 6 # GET /submissions
7 7 # GET /submissions.json
8 8 # Show problem selection and user's submission of that problem
9 9 def index
10 10 @user = @current_user
11 11 @problems = @user.available_problems
12 12
13 13 if params[:problem_id]==nil
14 14 @problem = nil
15 15 @submissions = nil
@@ -42,28 +42,31
42 42 end
43 43
44 44 def compiler_msg
45 45 @submission = Submission.find(params[:id])
46 46 respond_to do |format|
47 47 format.js
48 48 end
49 49 end
50 50
51 51 #on-site new submission on specific problem
52 52 def direct_edit_problem
53 53 @problem = Problem.find(params[:problem_id])
54 + unless @current_user.can_view_problem?(@problem)
55 + unauthorized_redirect
56 + return
57 + end
54 58 @source = ''
55 - if (params[:user_id])
56 - u = User.find(params[:user_id])
57 - @submission = Submission.find_last_by_user_and_problem(u.id,@problem.id)
59 + if (params[:view_latest])
60 + sub = Submission.find_last_by_user_and_problem(@current_user.id,@problem.id)
58 61 @source = @submission.source.to_s if @submission and @submission.source
59 62 end
60 63 render 'edit'
61 64 end
62 65
63 66 # GET /submissions/1/edit
64 67 def edit
65 68 @submission = Submission.find(params[:id])
66 69 @source = @submission.source.to_s
67 70 @problem = @submission.problem
68 71 @lang_id = @submission.language.id
69 72 end
@@ -90,24 +93,23
90 93 end
91 94 end
92 95
93 96 protected
94 97
95 98 def submission_authorization
96 99 #admin always has privileged
97 100 if @current_user.admin?
98 101 return true
99 102 end
100 103
101 104 sub = Submission.find(params[:id])
102 - if sub.problem.available?
103 - puts "sub = #{sub.user.id}, current = #{@current_user.id}"
105 + if @current_user.available_problems.include? sub.problem
104 106 return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
105 107 end
106 108
107 109 #default to NO
108 110 unauthorized_redirect
109 111 return false
110 112 end
111 113
112 114
113 115 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -143,24 +143,24
143 143 end
144 144 end
145 145
146 146 def must_have_valid_problem
147 147 return if self.source==nil
148 148 if self.problem==nil
149 149 errors.add('problem',"must be specified.")
150 150 else
151 151 #admin always have right
152 152 return if self.user.admin?
153 153
154 154 #check if user has the right to submit the problem
155 - errors.add('problem',"must be valid.") if (!self.user.available_problem.include?(self.problem)) and (self.new_record?)
155 + errors.add('problem',"must be valid.") if (!self.user.available_problems.include?(self.problem)) and (self.new_record?)
156 156 end
157 157 end
158 158
159 159 # callbacks
160 160 def assign_latest_number_if_new_recond
161 161 return if !self.new_record?
162 162 latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
163 163 self.number = (latest==nil) ? 1 : latest.number + 1;
164 164 end
165 165
166 166 end
You need to be logged in to leave comments. Login now