From: Tom Hughes <tom@compton.nu>
Date: Wed, 23 May 2018 11:50:10 +0000 (+0100)
Subject: Don't override non-existent policy
X-Git-Tag: live~3015
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fb94bb6c581a2bd3bc437e7705e3efcecbe79c72?hp=ff86bf136a0ce835938cacb53aa6fda3abc18fd2

Don't override non-existent policy
---

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 7e7a52677..96b562b5e 100644
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -38,7 +38,7 @@ class OauthController < ApplicationController
   protected
 
   def oauth1_authorize
-    override_content_security_policy_directives(:form_action => [])
+    override_content_security_policy_directives(:form_action => []) if CSP_ENFORCE || defined?(CSP_REPORT_URL)
 
     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"