Update bundle

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 1a8185a3e92a2e01321eb794c5086e6a715af922..17c98fe8b657e4c52acf6133084a786110405d90 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,6 +3,8 @@ class ApiController < ApplicationController
 
   before_action :check_api_readable
 
 
   before_action :check_api_readable
 

+  around_action :api_call_handle_error, :api_call_timeout
+

   private
 
   ##
   private
 
   ##


@@ -47,19 +49,14 @@ 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

-      if Settings.basic_auth_support
-        response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
-        render :plain => errormessage, :status => :unauthorized
-      else
-        render :plain => errormessage, :status => :forbidden
-      end
+      render :plain => errormessage, :status => :unauthorized

 
       false
     end
 
       false
     end


@@ -80,13 +77,8 @@ class ApiController < ApplicationController
       report_error t("oauth.permissions.missing"), :forbidden
     elsif current_user
       head :forbidden
       report_error t("oauth.permissions.missing"), :forbidden
     elsif current_user
       head :forbidden

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

     else
     else

-      render :plain => errormessage, :status => :forbidden
+      head :unauthorized

     end
   end
 
     end
   end
 


@@ -103,25 +95,7 @@ class ApiController < ApplicationController
   def setup_user_auth
     logger.info " setup_user_auth"
     # try and setup using OAuth
   def setup_user_auth
     logger.info " setup_user_auth"
     # try and setup using OAuth

-    if doorkeeper_token&.accessible?
-      self.current_user = User.find(doorkeeper_token.resource_owner_id)
-    else
-      username, passwd = 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)
-                          else
-                            User.authenticate(:username => username, :password => passwd) # basic auth
-                          end
-      if username && current_user
-        if Settings.basic_auth_support
-          # log if we have authenticated using basic auth
-          logger.info "Authenticated as user #{current_user.id} using basic authentication"
-        else
-          report_error t("application.basic_auth_disabled", :link => t("application.auth_disabled_link")), :forbidden
-        end
-      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


@@ -160,7 +134,7 @@ class ApiController < ApplicationController
     report_error message, :bad_request
   rescue OSM::APIError => e
     report_error e.message, e.status
     report_error message, :bad_request
   rescue OSM::APIError => e
     report_error e.message, e.status

-  rescue AbstractController::ActionNotFound => e
+  rescue AbstractController::ActionNotFound, CanCan::AccessDenied => e

     raise
   rescue StandardError => e
     logger.info("API threw unexpected #{e.class} exception: #{e.message}")
     raise
   rescue StandardError => e
     logger.info("API threw unexpected #{e.class} exception: #{e.message}")


@@ -170,8 +144,8 @@ class ApiController < ApplicationController
 
   ##
   # wrap an api call in a timeout
 
   ##
   # wrap an api call in a timeout

-  def api_call_timeout(&block)
-    Timeout.timeout(Settings.api_timeout, &block)
+  def api_call_timeout(&)
+    Timeout.timeout(Settings.api_timeout, &)

   rescue ActionView::Template::Error => e
     e = e.cause
 
   rescue ActionView::Template::Error => e
     e = e.cause