cafe-grader-web Commit - r585:0d6ca27c4e8d

cafe-grader-web

Commit `r585:0d6ca27c4e8d` public

parent | child

Description:

- fix ssl, we no longer check SSL for the API call to chula

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

r585:0d6ca27c4e8d - Wed, 31 Aug 2016 05:29:33 - 4 files changed: 8 inserted, 7 deleted

app/models/user.rb ¶ +3 -2

                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   if user
                     return user if user.authenticated?(password)
                     if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
                       user.password = password
                       user.save
                       return user
                     end
                   end
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 end
                 def authenticated_by_pop3?(password)
                   Net::POP3.enable_ssl
                   pop = Net::POP3.new('pops.it.chula.ac.th')
                   authen = true
                   begin
                     pop.start(login, password)
                     pop.finish
                     return true
                   rescue
                     return false
                   end
                 end
                 def authenticated_by_cucas?(password)
                   url = URI.parse('https://www.cas.chula.ac.th/cas/api/?q=studentAuthenticate')
                   appid = '41508763e340d5858c00f8c1a0f5a2bb'
                   appsecret ='d9cbb5863091dbe186fded85722a1e31'
                   post_args = {
                     'appid' => appid,
                     'appsecret' => appsecret,
                     'username' => login,
                     'password' => password
                   }
                   #simple call
                   begin
                     http = Net::HTTP.new('www.cas.chula.ac.th', 443)
                     http.use_ssl = true
+            +       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
                     result = [ ]
                     http.start do |http|
                       req = Net::HTTP::Post.new('/cas/api/?q=studentAuthenticate')
                       param = "appid=#{appid}&appsecret=#{appsecret}&username=#{login}&password=#{password}"
                       resp = http.request(req,param)
                       result = JSON.parse resp.body
                     end
                     return true if result["type"] == "beanStudent"
-            -     rescue
+            +     rescue => e
                     return false
                   end
                   return false
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end
                 def alias_for_editing
                   if self.alias==nil
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end
                 end
                 def alias_for_editing=(e)
                   self.alias=e
                 end
                 def activation_key
                   if self.hashed_password==nil
                     encrypt_new_password
                   end
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
                     return site.time_left
                   elsif GraderConfiguration.indv_contest_mode?
                     time_limit = GraderConfiguration.contest_time_limit
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       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 GraderConfiguration.contest_mode?
                     return false if site==nil
                     return site.finished?
                   elsif GraderConfiguration.indv_contest_mode?
                     return false if self.contest_stat(true)==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
                   if GraderConfiguration.indv_contest_mode?
                     stat = self.contest_stat
                     return ((stat != nil) and (stat.started_at != nil))
                   elsif GraderConfiguration.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?) or (stat.started_at.nil?)
+            +     if stat.nil? or stat.started_at.nil?
                     stat ||= UserContestStat.new(:user => self)
                     stat.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 available_problems_group_by_contests
                   contest_problems = []
                   pin = {}
                   contests.enabled.each do |contest|
                     available_problems = contest.problems.available
                     contest_problems << {
                       :contest => contest,
                       :problems => available_problems
                     }
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
                 def available_problems
                   if not GraderConfiguration.multicontests?
                     return Problem.find_available_problems
                   else
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|

app/views/graders/_grader.html.haml ¶ +2 -2

               %td= grader.host
               %td= grader.pid
               %td= grader.mode
-            - %td= grader.updated_at.strftime("%H:%M:%S") unless grader.updated_at.nil?
+            + %td= grader.updated_at.strftime("%H:%M:%S") if grader.updated_at
               %td= grader.task_type
               %td
-            -   - if grader.task_id.nil?
+            +   - unless grader.task_id
                   idle
                 - else
                   = link_to "#{grader.task_id}", :action => 'view', :id => grader.task_id, :type => grader.task_type

app/views/main/_submission_short.html.haml ¶ +2 -2

               - if submission.nil?
                 = "-"
               - else
                 - if submission.graded_at.nil?
                   =t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   = t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)}, "
                   - if GraderConfiguration['ui.show_score']
                     = t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   - if GraderConfiguration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
                   = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
-            -   //= " | "
+            +   = " | "
-            -   //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)
+            +   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => problem_name

app/views/user_admin/user_stat.html.haml ¶ +1 -1

               / = stylesheet_link_tag 'tablesorter-theme.cafe'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 /$('#my_table').tablesorter({widgets: ['zebra']});
                 });
               %h1 User grading results
               %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = render partial: 'submission_range'
               - if params[:action] == 'user_stat'
                 %h3 Latest score
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat, commit: 'download csv'
               - else
                 %h3 Max score
                 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat_max, commit: 'download csv'
               %table.table.sortable.table-striped.table-bordered
                 %thead
                   %tr
                     %th Login
                     %th Name
                     %th Activated?
                     %th Logged_in
                     %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
                           %td= sc[i].full_name
                           %td= sc[i].activated
-            -             %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
+            +             %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
                           %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
               :javascript
                 $.bootstrapSortable(true,'reversed')

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

r585:0d6ca27c4e8d - Wed, 31 Aug 2016 05:29:33 - 4 files changed: 8 inserted, 7 deleted

Sign in to your account

Commit r585:0d6ca27c4e8d public

Author

r585:0d6ca27c4e8d - Wed, 31 Aug 2016 05:29:33 - 4 files changed: 8 inserted, 7 deleted

Commit `r585:0d6ca27c4e8d` public