cafe-grader-web Commit - r777:e61e522c673f

cafe-grader-web

parent | child

Description:

Merge pull request #26 from cafe-grader-team/master merge edit from upstream

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r777:e61e522c673f - Thu, 10 Oct 2019 11:41:18 - 8 files changed: 82 inserted, 8 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

@@ -1,5 +1,7
1	class LoginController < ApplicationController	1	class LoginController < ApplicationController
2		2
		3	+ @@authenticators = []
		4	+
3	def index	5	def index
4	# show login screen	6	# show login screen
5	reset_session	7	reset_session
@@ -7,7 +9,7
7	end	9	end
8		10
9	def login	11	def login
10	- user = ~~User~~.authenticate(params[:login], params[:password])	12	+ user = get_authenticated_user(params[:login], params[:password])
11	unless user	13	unless user
12	flash[:notice] = 'Wrong password'	14	flash[:notice] = 'Wrong password'
13	redirect_to :controller => 'main', :action => 'login'	15	redirect_to :controller => 'main', :action => 'login'
@@ -60,4 +62,24
60	end	62	end
61	end	63	end
62		64
		65	+ def self.add_authenticator(authenticator)
		66	+ @@authenticators << authenticator
		67	+ end
		68	+
		69	+ protected
		70	+
		71	+ def get_authenticated_user(login, password)
		72	+ if @@authenticators.empty?
		73	+ return User.authenticate(login, password)
		74	+ else
		75	+ user = User.authenticate(login, password)
		76	+ @@authenticators.each do \|authenticator\|
		77	+ if not user
		78	+ user = authenticator.authenticate(login, password)
		79	+ end
		80	+ end
		81	+ return user
		82	+ end
		83	+ end
		84	+
63	end	85	end

app/controllers/problems_controller.rb ¶ +5 -1

                 def create
                   @problem = Problem.new(problem_params)
-            -     @description = Description.new(params[:description])
+            +     @description = Description.new(description_params)
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                 ##################################
                 protected
+            +   def description_params
+            +     params.require(:description).permit(:body, :markdowned)
+            +   end
+            +
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT

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

                 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
                   # 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

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

                 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,

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

                         %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
                       %h4 Compiler message
                     .modal-body
-            -         %pre#compiler_msg= @submission.compiler_message
+            +       %pre#compiler_msg
+            +         - if @submission
+            +           = @submission.compiler_message
                     .modal-footer
                       %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

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

               # 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

                    :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.

You need to be logged in to leave comments. Login now

	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