cafe-grader-web Commit - r779:df983f8fc960

cafe-grader-web

Commit `r779:df983f8fc960` public

parent | child

Description:

merge with upstream

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r779:df983f8fc960 - Thu, 10 Oct 2019 12:06:04 - 8 files changed: 76 inserted, 13 deleted

lib/programming_authenticator.rb created 644 ¶ +33

@@ -0,0 +1,33
	1	+ # Authentication and user imports through programming.in.th web request
	2	+ require 'net/http'
	3	+ require 'uri'
	4	+ require 'json'
	5	+
	6	+ class ProgrammingAuthenticator
	7	+ PROGRAMMING_AUTHEN_URL = "https://programming.in.th/authen.php"
	8	+
	9	+ def find_or_create_user(result)
	10	+ user = User.find_by(login: result['username'])
	11	+ if not user
	12	+ user = User.new(login: result['username'],
	13	+ full_name: result['firstname'] + ' ' + result['surname'],
	14	+ alias: result['display'],
	15	+ email: result['email'])
	16	+ user.password = User.random_password
	17	+ user.save
	18	+ end
	19	+ return user
	20	+ end
	21	+
	22	+ def authenticate(login, password)
	23	+ uri = URI(PROGRAMMING_AUTHEN_URL)
	24	+ result = Net::HTTP.post_form(uri, 'username' => login, 'password' => password)
	25	+ request_result = JSON.parse(result.body)
	26	+
	27	+ if request_result.fetch('status', 'incorrect') == 'OK'
	28	+ return find_or_create_user(request_result)
	29	+ else
	30	+ return nil
	31	+ end
	32	+ end
	33	+ end

app/controllers/login_controller.rb ¶ +23 -1

               class LoginController < ApplicationController
+            +   @@authenticators = []
+            +
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
-            -     user = User.authenticate(params[:login], params[:password])
+            +     user = get_authenticated_user(params[:login], params[:password])
                   unless user
                     flash[:notice] = 'Wrong password'
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                 end
                 def logout
                   redirect_to root_path
                 end
+            +   def self.add_authenticator(authenticator)
+            +     @@authenticators << authenticator
+            +   end
+            +
+            +   protected
+            +
+            +   def get_authenticated_user(login, password)
+            +     if @@authenticators.empty?
+            +       return User.authenticate(login, password)
+            +     else
+            +       user = User.authenticate(login, password)
+            +       @@authenticators.each do |authenticator|
+            +         if not user
+            +           user = authenticator.authenticate(login, password)
+            +         end
+            +       end
+            +       return user
+            +     end
+            +   end
+            +
               end

app/controllers/problems_controller.rb ¶ +2 -6

               class ProblemsController < ApplicationController
                 before_action :admin_authorization
-            -   #NOTE: ghost from the past?
-            -   #before_action :testcase_authorization, only: [:show_testcase]
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
                 def index
                   @problems = Problem.order(date_added: :desc)
                   @problem = Problem.new
                   @description = nil
                 end
                 def create
                   @problem = Problem.new(problem_params)
-            -     @description = Description.new(problem_params[:description])
+            +     @description = Description.new(description_params)
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                     end
                   else
                     @description = nil
                   def problem_params
                     params.require(:problem).permit(:name, :full_name, :full_score, :change_date_added, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
                   def description_params
-            -       params.require(:description).permit(:body, :markdown)
+            +       params.require(:description).permit(:body, :markdowned)
                   end
               end

app/models/submission.rb ¶ +6 -4

                     self.problem = Submission.find_problem_in_source(self.source,
                                                                      self.source_filename)
                   end
                 end
                 def assign_language
-            -     self.language = Submission.find_language_in_source(self.source,
+            +     if self.language == nil
-            -                                                        self.source_filename)
+            +       self.language = Submission.find_language_in_source(self.source,
+            +                                                          self.source_filename)
+            +     end
                 end
                 # validation codes
                 def must_specify_language
                   return if self.source==nil
                   # for output_only tasks
                   return if self.problem!=nil and self.problem.output_only
-            -     if self.language==nil
+            +     if self.language == nil
-            -       errors.add('source',"Cannot detect language. Did you submit a correct source file?") unless self.language!=nil
+            +       errors.add('source',"Cannot detect language. Did you submit a correct source file?")
                   end
                 end
                 def must_have_valid_problem
                   return if self.source==nil
                   if self.problem==nil

app/models/user.rb ¶ +1 -1

                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
-            -   validates_length_of :password, :within => 4..20, :if => :password_required?
+            +   validates_length_of :password, :within => 4..50, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,

app/views/submissions/edit.html.haml ¶ -1

@@ -82,7 +82,6
82	//brython();	82	//brython();
83	});	83	});
84		84
85		85
86		86
87		87
88	-

config/initializers/cafe_grader_config.rb.SAMPLE ¶ +3

               # Uncomment so that Apache X-Sendfile is used when delivering files
               # (e.g., in /tasks/view).
               # USE_APACHE_XSENDFILE = true
               # Uncomment so that configuration is read only once when the server is loaded
               # CONFIGURATION_CACHE_ENABLED = true
+            +
+            + # Uncomment to allow authentication and user import from programming.in.th
+            + # LoginController.add_authenticator(ProgrammingAuthenticator.new)

db/seeds.rb ¶ +8

                  {
                    :key => 'right.view_testcase',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'When true, any user can view/download test data'
                  },
+            +
+            +    {
+            +      :key => 'system.online_registration',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false',
+            +      :description => 'This option enables online registration.'
+            +    },
+            +
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',

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

r779:df983f8fc960 - Thu, 10 Oct 2019 12:06:04 - 8 files changed: 76 inserted, 13 deleted

Sign in to your account

Commit r779:df983f8fc960 public

Author

r779:df983f8fc960 - Thu, 10 Oct 2019 12:06:04 - 8 files changed: 76 inserted, 13 deleted

Commit `r779:df983f8fc960` public