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

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 7ab7f68359c52e7498ee6e5b0e15dcdda2dedeb1..62a68b53369ddc0e2cf4829a9a4c40f4d5f552d5 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -5,8 +5,12 @@ class OauthController < ApplicationController
   # a login, but we want to check authorization on every action.
   authorize_resource :class => false
 
   # a login, but we want to check authorization on every action.
   authorize_resource :class => false
 

+  before_action :require_oauth_10a_support
+

   layout "site"
 
   layout "site"
 

+  allow_all_form_action :only => :oauth1_authorize
+

   def revoke
     @token = current_user.oauth_tokens.find_by :token => params[:token]
     if @token
   def revoke
     @token = current_user.oauth_tokens.find_by :token => params[:token]
     if @token


@@ -39,8 +43,6 @@ class OauthController < ApplicationController
   end
 
   def oauth1_authorize
   end
 
   def oauth1_authorize

-    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)
-

     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"
       render :action => "authorize_failure"
     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"
       render :action => "authorize_failure"


@@ -66,7 +68,7 @@ class OauthController < ApplicationController
 
           @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10?
 
 
           @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10?
 

-          redirect_to @redirect_url.to_s
+          redirect_to @redirect_url.to_s, :allow_other_host => true

         end
       else
         @token.invalidate!
         end
       else
         @token.invalidate!