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

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 478810dfc21d40448410662adf82179a2e0d60be..17c98fe8b657e4c52acf6133084a786110405d90 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,6 +1,10 @@
 class ApiController < ApplicationController
   skip_before_action :verify_authenticity_token
 
 class ApiController < ApplicationController
   skip_before_action :verify_authenticity_token
 

+  before_action :check_api_readable
+
+  around_action :api_call_handle_error, :api_call_timeout
+

   private
 
   ##
   private
 
   ##


@@ -22,18 +26,17 @@ class ApiController < ApplicationController
         #
         # As a workaround, and for back compatibility, default to XML format.
         mimetypes = begin
         #
         # As a workaround, and for back compatibility, default to XML format.
         mimetypes = begin

-                      Mime::Type.parse(accept_header)
-                    rescue Mime::Type::InvalidMimeType
-                      Array(Mime[:xml])
-                    end
+          Mime::Type.parse(accept_header)
+        rescue Mime::Type::InvalidMimeType
+          Array(Mime[:xml])
+        end

 
         # Allow XML and JSON formats, and treat an all formats wildcard
         # as XML for backwards compatibility - all other formats are discarded
         # which will result in a 406 Not Acceptable response being sent
         formats = mimetypes.map do |mime|
 
         # Allow XML and JSON formats, and treat an all formats wildcard
         # as XML for backwards compatibility - all other formats are discarded
         # which will result in a 406 Not Acceptable response being sent
         formats = mimetypes.map do |mime|

-          if mime.symbol == :xml then :xml
+          if mime.symbol == :xml || mime == "*/*" then :xml

           elsif mime.symbol == :json then :json
           elsif mime.symbol == :json then :json

-          elsif mime == "*/*" then :xml

           end
         end
       else
           end
         end
       else


@@ -46,39 +49,36 @@ class ApiController < ApplicationController
     end
   end
 
     end
   end
 

-  def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
+  def authorize(errormessage = "Couldn't authenticate you")

     # make the current_user object from any auth sources we have
     setup_user_auth
 
     # handle authenticate pass/fail
     unless current_user
       # no auth, the user does not exist or the password was wrong
     # make the current_user object from any auth sources we have
     setup_user_auth
 
     # handle authenticate pass/fail
     unless current_user
       # no auth, the user does not exist or the password was wrong

-      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""

       render :plain => errormessage, :status => :unauthorized
       render :plain => errormessage, :status => :unauthorized

+

       false
     end
   end
 
   def current_ability
     # Use capabilities from the oauth token if it exists and is a valid access token
       false
     end
   end
 
   def current_ability
     # Use capabilities from the oauth token if it exists and is a valid access token

-    if Authenticator.new(self, [:token]).allow?
-      ApiAbility.new(nil).merge(ApiCapability.new(current_token))
+    if doorkeeper_token&.accessible?
+      ApiAbility.new(nil).merge(ApiCapability.new(doorkeeper_token))

     else
       ApiAbility.new(current_user)
     end
   end
 
   def deny_access(_exception)
     else
       ApiAbility.new(current_user)
     end
   end
 
   def deny_access(_exception)

-    if current_token
+    if doorkeeper_token

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

-      realm = "Web Password"
-      errormessage = "Couldn't authenticate you"
-      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
-      render :plain => errormessage, :status => :unauthorized
+      head :unauthorized

     end
   end
 
     end
   end
 


@@ -93,18 +93,9 @@ class ApiController < ApplicationController
   # from the authorize method, but can be called elsewhere if authorisation
   # is optional.
   def setup_user_auth
   # from the authorize method, but can be called elsewhere if authorisation
   # is optional.
   def setup_user_auth

+    logger.info " setup_user_auth"

     # try and setup using OAuth
     # try and setup using OAuth

-    unless Authenticator.new(self, [:token]).allow?
-      username, passwd = get_auth_data # parse from headers
-      # authenticate per-scheme
-      self.current_user = if username.nil?
-                            nil # no authentication provided - perhaps first connect (client should retry after 401)
-                          elsif username == "token"
-                            User.authenticate(:token => passwd) # preferred - random token for user from db, passed in basic auth
-                          else
-                            User.authenticate(:username => username, :password => passwd) # basic auth
-                          end
-    end
+    self.current_user = User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?

 
     # have we identified the user?
     if current_user
 
     # have we identified the user?
     if current_user


@@ -128,4 +119,55 @@ class ApiController < ApplicationController
       end
     end
   end
       end
     end
   end

+
+  def api_call_handle_error
+    yield
+  rescue ActionController::UnknownFormat
+    head :not_acceptable
+  rescue ActiveRecord::RecordNotFound => e
+    head :not_found
+  rescue LibXML::XML::Error, ArgumentError => e
+    report_error e.message, :bad_request
+  rescue ActiveRecord::RecordInvalid => e
+    message = "#{e.record.class} #{e.record.id}: "
+    e.record.errors.each { |error| message << "#{error.attribute}: #{error.message} (#{e.record[error.attribute].inspect})" }
+    report_error message, :bad_request
+  rescue OSM::APIError => e
+    report_error e.message, e.status
+  rescue AbstractController::ActionNotFound, CanCan::AccessDenied => e
+    raise
+  rescue StandardError => e
+    logger.info("API threw unexpected #{e.class} exception: #{e.message}")
+    e.backtrace.each { |l| logger.info(l) }
+    report_error "#{e.class}: #{e.message}", :internal_server_error
+  end
+
+  ##
+  # wrap an api call in a timeout
+  def api_call_timeout(&)
+    Timeout.timeout(Settings.api_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"))
+      ActiveRecord::Base.connection.raw_connection.cancel
+      raise OSM::APITimeoutError
+    else
+      raise
+    end
+  rescue Timeout::Error
+    ActiveRecord::Base.connection.raw_connection.cancel
+    raise OSM::APITimeoutError
+  end
+
+  ##
+  # check the api change rate limit
+  def check_rate_limit(new_changes = 1)
+    max_changes = ActiveRecord::Base.connection.select_value(
+      "SELECT api_rate_limit($1)", "api_rate_limit", [current_user.id]
+    )
+
+    raise OSM::APIRateLimitExceeded if new_changes > max_changes
+  end

 end
 end