cafe-grader-web Commit - r779:df983f8fc960

cafe-grader-web

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

@@ -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'
@@ -64,4 +66,24
64	redirect_to root_path	66	redirect_to root_path
65	end	67	end
66		68
		69	+ def self.add_authenticator(authenticator)
		70	+ @@authenticators << authenticator
		71	+ end
		72	+
		73	+ protected
		74	+
		75	+ def get_authenticated_user(login, password)
		76	+ if @@authenticators.empty?
		77	+ return User.authenticate(login, password)
		78	+ else
		79	+ user = User.authenticate(login, password)
		80	+ @@authenticators.each do \|authenticator\|
		81	+ if not user
		82	+ user = authenticator.authenticate(login, password)
		83	+ end
		84	+ end
		85	+ return user
		86	+ end
		87	+ end
		88	+
67	end	89	end

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

                 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 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
                   def description_params
-            -       params.require(:description).permit(:body, :markdown)
+            +       params.require(:description).permit(:body, :markdowned)
                   end
               end

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 ¶ -1

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