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

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 2e847fcd5915e9b954c85ae5c87774a55e87e0ff..cd7e48277a2517b23e49af4cdb31eddfd396a762 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,21 +1,33 @@
-require "oauth/controllers/provider_controller"
-

 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 

+  # The ProviderController will call login_required for any action that needs
+  # a login, but we want to check authorization on every action.
+  authorize_resource :class => false
+

   layout "site"
 
   layout "site"
 

+  def revoke
+    @token = current_user.oauth_tokens.find_by :token => params[:token]
+    if @token
+      @token.invalidate!
+      flash[:notice] = t(".flash", :application => @token.client_application.name)
+    end
+    redirect_to oauth_clients_url(:display_name => @token.user.display_name)
+  end
+
+  protected
+

   def login_required
     authorize_web
     set_locale
   def login_required
     authorize_web
     set_locale

-    require_user

   end
 
   def user_authorizes_token?
     any_auth = false
 
     @token.client_application.permissions.each do |pref|
   end
 
   def user_authorizes_token?
     any_auth = false
 
     @token.client_application.permissions.each do |pref|

-      if params[pref]
+      if params[pref].to_i.nonzero?

         @token.write_attribute(pref, true)
         any_auth ||= true
       else
         @token.write_attribute(pref, true)
         any_auth ||= true
       else


@@ -26,20 +38,11 @@ class OauthController < ApplicationController
     any_auth
   end
 
     any_auth
   end
 

-  def revoke
-    @token = current_user.oauth_tokens.find_by :token => params[:token]
-    if @token
-      @token.invalidate!
-      flash[:notice] = t("oauth.revoke.flash", :application => @token.client_application.name)
-    end
-    redirect_to oauth_clients_url(:display_name => @token.user.display_name)
-  end
-
-  protected
-

   def oauth1_authorize
   def oauth1_authorize

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

     if @token.invalidated?
     if @token.invalidated?

-      @message = t "oauth.oauthorize_failure.invalid"
+      @message = t "oauth.authorize_failure.invalid"

       render :action => "authorize_failure"
     elsif request.post?
       if user_authorizes_token?
       render :action => "authorize_failure"
     elsif request.post?
       if user_authorizes_token?


@@ -49,7 +52,7 @@ class OauthController < ApplicationController
                        else
                          @token.oob? ? @token.client_application.callback_url : @token.callback_url
                        end
                        else
                          @token.oob? ? @token.client_application.callback_url : @token.callback_url
                        end

-        @redirect_url = URI.parse(callback_url) unless callback_url.blank?
+        @redirect_url = URI.parse(callback_url) if callback_url.present?

 
         if @redirect_url.to_s.blank?
           render :action => "authorize_success"
 
         if @redirect_url.to_s.blank?
           render :action => "authorize_success"


@@ -61,15 +64,13 @@ class OauthController < ApplicationController
                                     "&oauth_token=#{@token.token}"
                                 end
 
                                     "&oauth_token=#{@token.token}"
                                 end
 

-          unless @token.oauth10?
-            @redirect_url.query += "&oauth_verifier=#{@token.verifier}"
-          end
+          @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!

-        @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name)
+        @message = t("oauth.authorize_failure.denied", :app_name => @token.client_application.name)

         render :action => "authorize_failure"
       end
     end
         render :action => "authorize_failure"
       end
     end