Fix new rubocop warnings

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bee5e8169a4709d05f5d36ead2c6924a03f2db6a..8adea79a4fadc7ae2c55c0df110927b3fb491e6d 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,14 +3,19 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery :with => :exception
 
 
   protect_from_forgery :with => :exception
 

+  add_flash_types :warning, :error
+

   rescue_from CanCan::AccessDenied, :with => :deny_access
   check_authorization
 
   before_action :fetch_body
   around_action :better_errors_allow_inline, :if => proc { Rails.env.development? }
 
   rescue_from CanCan::AccessDenied, :with => :deny_access
   check_authorization
 
   before_action :fetch_body
   around_action :better_errors_allow_inline, :if => proc { Rails.env.development? }
 

-  attr_accessor :current_user
+  attr_accessor :current_user, :oauth_token
+

   helper_method :current_user
   helper_method :current_user

+  helper_method :oauth_token
+  helper_method :preferred_langauges

 
   private
 
 
   private
 


@@ -54,7 +59,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_oauth
   end
 
   def require_oauth

-    @oauth = current_user.access_token(Settings.oauth_key) if current_user && Settings.key?(:oauth_key)
+    @oauth_token = current_user.access_token(Settings.oauth_key) if current_user && Settings.key?(:oauth_key)

   end
 
   ##
   end
 
   ##


@@ -63,7 +68,7 @@ class ApplicationController < ActionController::Base
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true

-        redirect_to params.to_unsafe_h.merge(:cookie_test => "true")
+        redirect_to params.to_unsafe_h.merge(:only_path => true, :cookie_test => "true")

         false
       else
         flash.now[:warning] = t "application.require_cookies.cookies_needed"
         false
       else
         flash.now[:warning] = t "application.require_cookies.cookies_needed"


@@ -109,9 +114,10 @@ class ApplicationController < ActionController::Base
   end
 
   def database_status
   end
 
   def database_status

-    if Settings.status == "database_offline"
+    case Settings.status
+    when "database_offline"

       "offline"
       "offline"

-    elsif Settings.status == "database_readonly"
+    when "database_readonly"

       "readonly"
     else
       "online"
       "readonly"
     else
       "online"


@@ -121,9 +127,10 @@ class ApplicationController < ActionController::Base
   def api_status
     status = database_status
     if status == "online"
   def api_status
     status = database_status
     if status == "online"

-      if Settings.status == "api_offline"
+      case Settings.status
+      when "api_offline"

         status = "offline"
         status = "offline"

-      elsif Settings.status == "api_readonly"
+      when "api_readonly"

         status = "readonly"
       end
     end
         status = "readonly"
       end
     end


@@ -185,6 +192,8 @@ class ApplicationController < ActionController::Base
 
   def api_call_handle_error
     yield
 
   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
   rescue ActiveRecord::RecordNotFound => e
     head :not_found
   rescue LibXML::XML::Error, ArgumentError => e


@@ -207,31 +216,27 @@ class ApplicationController < ActionController::Base
   # 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)
   # 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 + "?").to_sym)
+    ok = request.send(:"#{method.to_s.downcase}?")

     raise OSM::APIBadMethodError, method unless ok
   end
 
   ##
   # wrap an api call in a timeout
     raise OSM::APIBadMethodError, method unless ok
   end
 
   ##
   # wrap an api call in a timeout

-  def api_call_timeout
-    OSM::Timer.timeout(Settings.api_timeout, Timeout::Error) do
-      yield
-    end
+  def api_call_timeout(&block)
+    OSM::Timer.timeout(Settings.api_timeout, Timeout::Error, &block)

   rescue Timeout::Error
     raise OSM::APITimeoutError
   end
 
   ##
   # wrap a web page in a timeout
   rescue Timeout::Error
     raise OSM::APITimeoutError
   end
 
   ##
   # wrap a web page in a timeout

-  def web_timeout
-    OSM::Timer.timeout(Settings.web_timeout, Timeout::Error) do
-      yield
-    end
+  def web_timeout(&block)
+    OSM::Timer.timeout(Settings.web_timeout, Timeout::Error, &block)

   rescue ActionView::Template::Error => e
     e = e.cause
 
     if e.is_a?(Timeout::Error) ||
   rescue ActionView::Template::Error => e
     e = e.cause
 
     if e.is_a?(Timeout::Error) ||

-       (e.is_a?(ActiveRecord::StatementInvalid) && e.message =~ /execution expired/)
+       (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))

       render :action => "timeout"
     else
       raise
       render :action => "timeout"
     else
       raise


@@ -280,9 +285,10 @@ class ApplicationController < ActionController::Base
       :style_src => %w['unsafe-inline']
     )
 
       :style_src => %w['unsafe-inline']
     )
 

-    if Settings.status == "database_offline" || Settings.status == "api_offline"
+    case Settings.status
+    when "database_offline", "api_offline"

       flash.now[:warning] = t("layouts.osm_offline")
       flash.now[:warning] = t("layouts.osm_offline")

-    elsif Settings.status == "database_readonly" || Settings.status == "api_readonly"
+    when "database_readonly", "api_readonly"

       flash.now[:warning] = t("layouts.osm_read_only")
     end
 
       flash.now[:warning] = t("layouts.osm_read_only")
     end
 


@@ -294,15 +300,13 @@ class ApplicationController < ActionController::Base
   end
 
   def preferred_editor
   end
 
   def preferred_editor

-    editor = if params[:editor]
-               params[:editor]
-             elsif current_user&.preferred_editor
-               current_user.preferred_editor
-             else
-               Settings.default_editor
-             end
-
-    editor
+    if params[:editor]
+      params[:editor]
+    elsif current_user&.preferred_editor
+      current_user.preferred_editor
+    else
+      Settings.default_editor
+    end

   end
 
   helper_method :preferred_editor
   end
 
   helper_method :preferred_editor


@@ -368,4 +372,19 @@ class ApplicationController < ActionController::Base
 
   # override to stop oauth plugin sending errors
   def invalid_oauth_response; end
 
   # override to stop oauth plugin sending errors
   def invalid_oauth_response; end

+
+  # clean any referer parameter
+  def safe_referer(referer)
+    referer = URI.parse(referer)
+
+    if referer.scheme == "http" || referer.scheme == "https"
+      referer.scheme = nil
+      referer.host = nil
+      referer.port = nil
+    elsif referer.scheme || referer.host || referer.port
+      referer = nil
+    end
+
+    referer.to_s
+  end

 end
 end