Merge remote-tracking branch 'upstream/pull/4732'

[rails.git] / app / controllers / sessions_controller.rb

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index bb3854e69b3d48348c394faa8dbc4ec6b2b2ac48..e57ffc06aac0617b65100bc5fe1dab3b9ecbda2e 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -12,9 +12,7 @@ class SessionsController < ApplicationController
   authorize_resource :class => false
 
   def new
   authorize_resource :class => false
 
   def new

-    append_content_security_policy_directives(
-      :form_action => %w[*]
-    )
+    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)

 
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
   end
 
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
   end


@@ -22,29 +20,20 @@ class SessionsController < ApplicationController
   def create
     session[:remember_me] ||= params[:remember_me]
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
   def create
     session[:remember_me] ||= params[:remember_me]
     session[:referer] = safe_referer(params[:referer]) if params[:referer]

-    password_authentication(params[:username], params[:password])
+    password_authentication(params[:username].strip, params[:password])

   end
 
   def destroy
   end
 
   def destroy

-    @title = t "sessions.destroy.title"
+    @title = t ".title"

 
     if request.post?
 
     if request.post?

-      if session[:token]
-        token = UserToken.find_by(:token => session[:token])
-        token&.destroy
-        session.delete(:token)
-      end
-
+      session.delete(:pending_user)

       session.delete(:user)
       session_expires_automatically
 
       referer = safe_referer(params[:referer]) if params[:referer]
 
       session.delete(:user)
       session_expires_automatically
 
       referer = safe_referer(params[:referer]) if params[:referer]
 

-      if referer
-        redirect_to referer
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
+      redirect_to referer || { :controller => "site", :action => "index" }

     end
   end
 
     end
   end
 


@@ -58,7 +47,7 @@ class SessionsController < ApplicationController
     elsif (user = User.authenticate(:username => username, :password => password, :pending => true))
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif (user = User.authenticate(:username => username, :password => password, :pending => true))
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)

-      failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe, username
+      failed_login({ :partial => "sessions/suspended_flash" }, username)

     else
       failed_login t("sessions.new.auth failure"), username
     end
     else
       failed_login t("sessions.new.auth failure"), username
     end