Update bundle

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

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 13047167075245b17ee6f09353a14c81d9ef5464..9489553a81d438abfcc4620d8e8452cebfaa6d76 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,14 +4,15 @@ class SessionsController < ApplicationController
   layout "site"
 
   before_action :disable_terms_redirect, :only => [:destroy]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :check_database_readable
   before_action :require_cookies, :only => [: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
@@ -31,13 +32,13 @@ class SessionsController < ApplicationController
         token&.destroy
         session.delete(:token)
       end
+
       session.delete(:user)
       session_expires_automatically
-      if params[:referer]
-        redirect_to safe_referer(params[:referer])
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
+
+      referer = safe_referer(params[:referer]) if params[:referer]
+
+      redirect_to referer || { :controller => "site", :action => "index" }
     end
   end