X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ecb53b8692cbaac262fba5b1baa632d7cef5353..ccc898b8a04f14537c17c924deb477d156967089:/app/controllers/sessions_controller.rb

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 7e6a740f3..9489553a8 100644
--- 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
-    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
@@ -34,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