Don't set input value from endpoint.setLatLng()

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 686e8163001abd8c1f5eb8c6f0a849a546274ec7..ae1bc87554e0e0b1da81debd07cf7296df80d2d1 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,6 +1,8 @@
 class ApiController < ApplicationController
   skip_before_action :verify_authenticity_token
 
 class ApiController < ApplicationController
   skip_before_action :verify_authenticity_token
 

+  before_action :check_api_readable
+

   private
 
   ##
   private
 
   ##


@@ -106,8 +108,13 @@ class ApiController < ApplicationController
     if doorkeeper_token&.accessible?
       self.current_user = User.find(doorkeeper_token.resource_owner_id)
     elsif Authenticator.new(self, [:token]).allow?
     if doorkeeper_token&.accessible?
       self.current_user = User.find(doorkeeper_token.resource_owner_id)
     elsif Authenticator.new(self, [:token]).allow?

-      # self.current_user setup by OAuth
-    elsif Settings.basic_auth_support
+      if Settings.oauth_10a_support
+        # self.current_user setup by OAuth
+      else
+        report_error t("application.oauth_10a_disabled", :link => t("application.auth_disabled_link")), :forbidden
+        self.current_user = nil
+      end
+    else

       username, passwd = auth_data # parse from headers
       # authenticate per-scheme
       self.current_user = if username.nil?
       username, passwd = auth_data # parse from headers
       # authenticate per-scheme
       self.current_user = if username.nil?


@@ -115,8 +122,14 @@ class ApiController < ApplicationController
                           else
                             User.authenticate(:username => username, :password => passwd) # basic auth
                           end
                           else
                             User.authenticate(:username => username, :password => passwd) # basic auth
                           end

-      # log if we have authenticated using basic auth
-      logger.info "Authenticated as user #{current_user.id} using basic authentication" if current_user
+      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
 
     # have we identified the user?
     end
 
     # have we identified the user?


@@ -164,14 +177,6 @@ class ApiController < ApplicationController
     report_error "#{e.class}: #{e.message}", :internal_server_error
   end
 
     report_error "#{e.class}: #{e.message}", :internal_server_error
   end
 

-  ##
-  # asserts that the request method is the +method+ given as a parameter
-  # or raises a suitable error. +method+ should be a symbol, e.g: :put or :get.
-  def assert_method(method)
-    ok = request.send(:"#{method.to_s.downcase}?")
-    raise OSM::APIBadMethodError, method unless ok
-  end
-

   ##
   # wrap an api call in a timeout
   def api_call_timeout(&block)
   ##
   # wrap an api call in a timeout
   def api_call_timeout(&block)