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

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c6223fb9d6228890ea86c6bc6420a14d58f2f9fe..7ce804ced01af000ada0560ee4f27f99046618ac 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -86,10 +86,6 @@ class ApplicationController < ActionController::Base
     @oauth_token = current_user.oauth_token(Settings.oauth_application) if current_user && Settings.key?(:oauth_application)
   end
 
     @oauth_token = current_user.oauth_token(Settings.oauth_application) if current_user && Settings.key?(:oauth_application)
   end
 

-  def require_oauth_10a_support
-    report_error t("application.oauth_10a_disabled", :link => t("application.auth_disabled_link")), :forbidden unless Settings.oauth_10a_support
-  end
-

   ##
   # require the user to have cookies enabled in their browser
   def require_cookies
   ##
   # require the user to have cookies enabled in their browser
   def require_cookies


@@ -219,21 +215,26 @@ class ApplicationController < ActionController::Base
 
   ##
   # wrap a web page in a timeout
 
   ##
   # wrap a web page in a timeout

-  def web_timeout(&block)
-    Timeout.timeout(Settings.web_timeout, &block)
+  def web_timeout(&)
+    raise Timeout::Error if Settings.web_timeout.negative?
+
+    Timeout.timeout(Settings.web_timeout, &)

   rescue ActionView::Template::Error => e
     e = e.cause
 
     if e.is_a?(Timeout::Error) ||
        (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
   rescue ActionView::Template::Error => e
     e = e.cause
 
     if e.is_a?(Timeout::Error) ||
        (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))

-      ActiveRecord::Base.connection.raw_connection.cancel
-      render :action => "timeout"
+      respond_to_timeout

     else
       raise
     end
   rescue Timeout::Error
     else
       raise
     end
   rescue Timeout::Error

+    respond_to_timeout
+  end
+
+  def respond_to_timeout

     ActiveRecord::Base.connection.raw_connection.cancel
     ActiveRecord::Base.connection.raw_connection.cancel

-    render :action => "timeout"
+    render :action => "timeout", :status => :gateway_timeout

   end
 
   ##
   end
 
   ##


@@ -297,7 +298,7 @@ class ApplicationController < ActionController::Base
   end
 
   def deny_access(_exception)
   end
 
   def deny_access(_exception)

-    if doorkeeper_token || current_token
+    if doorkeeper_token

       set_locale
       report_error t("oauth.permissions.missing"), :forbidden
     elsif current_user
       set_locale
       report_error t("oauth.permissions.missing"), :forbidden
     elsif current_user


@@ -327,23 +328,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

-  # extract authorisation credentials from headers, returns user = nil if none
-  def auth_data
-    if request.env.key? "X-HTTP_AUTHORIZATION" # where mod_rewrite might have put it
-      authdata = request.env["X-HTTP_AUTHORIZATION"].to_s.split
-    elsif request.env.key? "REDIRECT_X_HTTP_AUTHORIZATION" # mod_fcgi
-      authdata = request.env["REDIRECT_X_HTTP_AUTHORIZATION"].to_s.split
-    elsif request.env.key? "HTTP_AUTHORIZATION" # regular location
-      authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
-    end
-    # only basic authentication supported
-    user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic"
-    [user, pass]
-  end
-
-  # override to stop oauth plugin sending errors
-  def invalid_oauth_response; end
-

   # clean any referer parameter
   def safe_referer(referer)
     begin
   # clean any referer parameter
   def safe_referer(referer)
     begin


@@ -366,7 +350,7 @@ class ApplicationController < ActionController::Base
   end
 
   def scope_enabled?(scope)
   end
 
   def scope_enabled?(scope)

-    doorkeeper_token&.includes_scope?(scope) || current_token&.includes_scope?(scope)
+    doorkeeper_token&.includes_scope?(scope)

   end
 
   helper_method :scope_enabled?
   end
 
   helper_method :scope_enabled?