X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/24b138db094e4b5e8d062c5248ee867967dc0fd7..387d130e87b79cb428f7554c1a233de5d0627ae9:/app/controllers/application_controller.rb?ds=sidebyside diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bee5e8169..d22a031d4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,16 +1,22 @@ class ApplicationController < ActionController::Base + require "timeout" + include SessionPersistence 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? } - attr_accessor :current_user + attr_accessor :current_user, :oauth_token + helper_method :current_user + helper_method :oauth_token private @@ -18,7 +24,11 @@ class ApplicationController < ActionController::Base if session[:user] self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first - if current_user.status == "suspended" + if session[:fingerprint] && + session[:fingerprint] != current_user.fingerprint + reset_session + self.current_user = nil + elsif current_user.status == "suspended" session.delete(:user) session_expires_automatically @@ -37,6 +47,8 @@ class ApplicationController < ActionController::Base elsif session[:token] session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token]) end + + session[:fingerprint] = current_user.fingerprint if current_user && session[:fingerprint].nil? rescue StandardError => e logger.info("Exception authorizing user: #{e}") reset_session @@ -46,7 +58,7 @@ class ApplicationController < ActionController::Base def require_user unless current_user if request.get? - redirect_to :controller => "users", :action => "login", :referer => request.fullpath + redirect_to login_path(:referer => request.fullpath) else head :forbidden end @@ -54,7 +66,7 @@ class ApplicationController < ActionController::Base end def require_oauth - @oauth = current_user.access_token(Settings.oauth_key) if current_user && Settings.key?(:oauth_key) + @oauth_token = current_user.oauth_token(Settings.oauth_application) if current_user && Settings.key?(:oauth_application) end ## @@ -63,7 +75,7 @@ class ApplicationController < ActionController::Base 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" @@ -73,7 +85,7 @@ class ApplicationController < ActionController::Base end end - def check_database_readable(need_api = false) + def check_database_readable(need_api: false) if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline") if request.xhr? report_error "Database offline for maintenance", :service_unavailable @@ -83,7 +95,7 @@ class ApplicationController < ActionController::Base end end - def check_database_writable(need_api = false) + def check_database_writable(need_api: false) if Settings.status == "database_offline" || Settings.status == "database_readonly" || (need_api && (Settings.status == "api_offline" || Settings.status == "api_readonly")) if request.xhr? @@ -109,9 +121,10 @@ class ApplicationController < ActionController::Base end def database_status - if Settings.status == "database_offline" + case Settings.status + when "database_offline" "offline" - elsif Settings.status == "database_readonly" + when "database_readonly" "readonly" else "online" @@ -121,9 +134,10 @@ class ApplicationController < ActionController::Base def api_status status = database_status if status == "online" - if Settings.status == "api_offline" + case Settings.status + when "api_offline" status = "offline" - elsif Settings.status == "api_readonly" + when "api_readonly" status = "readonly" end end @@ -147,7 +161,7 @@ class ApplicationController < ActionController::Base response.headers["Error"] = message if request.headers["X-Error-Format"]&.casecmp("xml")&.zero? - result = OSM::API.new.get_xml_doc + result = OSM::API.new.xml_doc result.root.name = "osmError" result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}") result.root << (XML::Node.new("message") << message) @@ -158,8 +172,7 @@ class ApplicationController < ActionController::Base end end - def preferred_languages(reset = false) - @preferred_languages = nil if reset + def preferred_languages @preferred_languages ||= if params[:locale] Locale.list(params[:locale]) elsif current_user @@ -171,72 +184,34 @@ class ApplicationController < ActionController::Base helper_method :preferred_languages - def set_locale(reset = false) + def set_locale if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty? current_user.languages = http_accept_language.user_preferred_languages current_user.save end - I18n.locale = Locale.available.preferred(preferred_languages(reset)) + I18n.locale = Locale.available.preferred(preferred_languages) response.headers["Vary"] = "Accept-Language" response.headers["Content-Language"] = I18n.locale.to_s end - def api_call_handle_error - yield - 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 { |attr, msg| message << "#{attr}: #{msg} (#{e.record[attr].inspect})" } - report_error message, :bad_request - rescue OSM::APIError => e - report_error e.message, e.status - rescue AbstractController::ActionNotFound => 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 - - ## - # 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) - 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 - 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) + Timeout.timeout(Settings.web_timeout, Timeout::Error, &block) 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")) + ActiveRecord::Base.connection.raw_connection.cancel render :action => "timeout" else raise end rescue Timeout::Error + ActiveRecord::Base.connection.raw_connection.cancel render :action => "timeout" end @@ -275,14 +250,15 @@ class ApplicationController < ActionController::Base append_content_security_policy_directives( :child_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112], :frame_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112], - :connect_src => [Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url], + :connect_src => [Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url], :form_action => %w[render.openstreetmap.org], :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") - elsif Settings.status == "database_readonly" || Settings.status == "api_readonly" + when "database_readonly", "api_readonly" flash.now[:warning] = t("layouts.osm_read_only") end @@ -294,15 +270,13 @@ class ApplicationController < ActionController::Base 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 @@ -333,18 +307,18 @@ class ApplicationController < ActionController::Base end def deny_access(_exception) - if current_token + if doorkeeper_token || current_token set_locale report_error t("oauth.permissions.missing"), :forbidden elsif current_user set_locale respond_to do |format| - format.html { redirect_to :controller => "errors", :action => "forbidden" } + format.html { redirect_to :controller => "/errors", :action => "forbidden" } format.any { report_error t("application.permission_denied"), :forbidden } end elsif request.get? respond_to do |format| - format.html { redirect_to :controller => "users", :action => "login", :referer => request.fullpath } + format.html { redirect_to login_path(:referer => request.fullpath) } format.any { head :forbidden } end else @@ -353,7 +327,7 @@ class ApplicationController < ActionController::Base end # extract authorisation credentials from headers, returns user = nil if none - def get_auth_data + 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 @@ -368,4 +342,31 @@ class ApplicationController < ActionController::Base # override to stop oauth plugin sending errors def invalid_oauth_response; end + + # clean any referer parameter + def safe_referer(referer) + begin + 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 = nil if referer&.path&.first != "/" + rescue URI::InvalidURIError + referer = nil + end + + referer&.to_s + end + + def scope_enabled?(scope) + doorkeeper_token&.includes_scope?(scope) || current_token&.includes_scope?(scope) + end + + helper_method :scope_enabled? end