From 08187be382994eab757f2d7e18229b03574b39de Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 31 Jan 2020 18:41:06 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=BB=9F=E8=AE=A1401=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/colleges_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb index ee7b9c014..6c1b6b8f4 100644 --- a/app/controllers/colleges_controller.rb +++ b/app/controllers/colleges_controller.rb @@ -136,11 +136,11 @@ class CollegesController < ApplicationController private - def require_login - return if User.current.logged? - - redirect_to "/login?back_url=#{CGI::escape(request.fullpath)}" - end + # def require_login + # return if User.current.logged? + # + # redirect_to "/login?back_url=#{CGI::escape(request.fullpath)}" + # end def check_college_present! return if current_college.present? From 9e0095c64e1f3b719903398714983fdae5297354 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 12:12:14 +0800 Subject: [PATCH 02/11] test --- config/initializers/session_store.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 2bbdbd0d2..06ba35f6e 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -4,5 +4,5 @@ # Rails.application.config.session_store :active_record_store # Be sure to restart your server when you modify this file. -# Rails.application.config.session_store :cache_store, :expire_after => 24.hours, key: '_educoder_session', domain: :all +Rails.application.config.session_store :cache_store, :expire_after => 24.hours, key: '_educoder_session', domain: :all From 901565cb3eb646ffb10bff0d09aa529b2b91ccf0 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 12:21:15 +0800 Subject: [PATCH 03/11] .. --- app/controllers/main_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 75a6012b0..ba5b0f349 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -8,6 +8,10 @@ class MainController < ApplicationController end def index + domain_session = params[:_educoder_session] + if domain_session + cookies[:_educoder_session] = domain_session + end render file: 'public/react/build/index.html', :layout => false end end \ No newline at end of file From 6bbdc71ae80e39cb3fcffb4219467e45a920f20c Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 12:23:41 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/main_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index ba5b0f349..3eb8059e4 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -11,6 +11,8 @@ class MainController < ApplicationController domain_session = params[:_educoder_session] if domain_session cookies[:_educoder_session] = domain_session + + uid_logger("main start is #{cookies[:_educoder_session]}") end render file: 'public/react/build/index.html', :layout => false end From ac67692f985cec3c35751a66cc9777cfdad9652b Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 12:26:45 +0800 Subject: [PATCH 05/11] ad log --- app/controllers/main_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 3eb8059e4..8a83c2949 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -10,7 +10,8 @@ class MainController < ApplicationController def index domain_session = params[:_educoder_session] if domain_session - cookies[:_educoder_session] = domain_session + uid_logger("main start domain_session is #{domain_session}") + cookies[:_educoder_session] = domain_session if cookies[:_educoder_session] != domain_session uid_logger("main start is #{cookies[:_educoder_session]}") end From d24ffa8ca630df7eabf6d200a724cd8e7ed9bd39 Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Sun, 2 Feb 2020 12:26:51 +0800 Subject: [PATCH 06/11] update codeEvaluateView style --- public/react/src/modules/page/main/CodeEvaluateView.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js index fef5bd83e..e68bfa43a 100644 --- a/public/react/src/modules/page/main/CodeEvaluateView.js +++ b/public/react/src/modules/page/main/CodeEvaluateView.js @@ -225,10 +225,11 @@ class CodeEvaluateView extends Component { { item.input ?
-
+
测试输入： -
"))}} > From d4d5686ecb03ef8f50cfcb5e717673b3d97133bc Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 13:02:17 +0800 Subject: [PATCH 07/11] test sesion --- app/controllers/main_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 8a83c2949..bccc76c81 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -11,7 +11,11 @@ class MainController < ApplicationController domain_session = params[:_educoder_session] if domain_session uid_logger("main start domain_session is #{domain_session}") - cookies[:_educoder_session] = domain_session if cookies[:_educoder_session] != domain_session + if cookies[:_educoder_session] != domain_session + cookies[:_educoder_session] = nil + cookies[:_educoder_session] = domain_session + end + uid_logger("main start is #{cookies[:_educoder_session]}") end From 1ee6b429bd18ba7938e872042c8cc03cfdb4f45a Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 15:01:52 +0800 Subject: [PATCH 08/11] test --- app/controllers/concerns/login_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index ede7ff071..b85b17a22 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -16,7 +16,7 @@ module LoginHelper :expires => 1.month.from_now, :path => '/', :secure => false, - :httponly => true + :httponly => false } if edu_setting('cookie_domain').present? cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) From 96539460afa5e7ebe9aed15530c7a2da19f1db9c Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 15:21:25 +0800 Subject: [PATCH 09/11] httponly --- config/initializers/session_store.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 06ba35f6e..85ee230db 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -4,5 +4,5 @@ # Rails.application.config.session_store :active_record_store # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cache_store, :expire_after => 24.hours, key: '_educoder_session', domain: :all +Rails.application.config.session_store :cache_store, :expire_after => 24.hours, :httponly => false, key: '_educoder_session', domain: :all From 824ec7ff70c573aff091a7a96c0b37a98b4d7833 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 15:22:50 +0800 Subject: [PATCH 10/11] httponly false and secure false --- config/initializers/session_store.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 85ee230db..def30285a 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -4,5 +4,5 @@ # Rails.application.config.session_store :active_record_store # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cache_store, :expire_after => 24.hours, :httponly => false, key: '_educoder_session', domain: :all +Rails.application.config.session_store :cache_store, :expire_after => 24.hours, :httponly => false, :secure => false, key: '_educoder_session', domain: :all From cd8185d352b9ac828dfebf9f6abcbc0d228d92bf Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sun, 2 Feb 2020 16:02:45 +0800 Subject: [PATCH 11/11] remove log --- app/controllers/application_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cb31067cb..aaf8ecabf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,10 +23,6 @@ class ApplicationController < ActionController::Base # 所有请求必须合法签名 def check_sign - uid_logger("educoder_session is #{cookies[:_educoder_session]}") - uid_logger("autologin trustie is #{cookies[:autologin_trustie]}") - uid_logger("check sign start: session[:user_id] is #{session[:user_id]}") - uid_logger("check sign start: default_yun_session is #{default_yun_session}, session[:current_user_id] is #{session[:"#{default_yun_session}"]}") if !Rails.env.development? Rails.logger.info("66666 #{params}") # suffix = request.url.split(".").last.split("?").first