X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/59102ea017825ceafdfe603cc43f9dd45e5c0ab6..a517441db5f1a8d69785e960fd7cb9ef31870a20:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c701d8add..6750b5d8e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -39,6 +39,19 @@ class ApplicationController < ActionController::Base end end + ## + # require the user to have cookies enabled in their browser + def require_cookies + if request.cookies["_osm_session"].to_s == "" + if params[:cookie_test].nil? + redirect_to params.merge(:cookie_test => "true") + return false + else + flash.now[:warning] = t 'application.require_cookies.cookies_needed' + end + end + end + # Utility methods to make the controller filter methods easier to read and write. def require_allow_read_prefs require_capability(:allow_read_prefs) @@ -195,12 +208,54 @@ class ApplicationController < ActionController::Base end def api_call_timeout - Timeout::timeout(APP_CONFIG['api_timeout'], OSM::APITimeoutError) do + SystemTimer.timeout_after(APP_CONFIG['api_timeout']) do yield end + rescue Timeout::Error + raise OSM::APITimeoutError + end + + ## + # extend caches_action to include the parameters, locale and logged in + # status in all cache keys + def self.caches_action(*actions) + options = actions.extract_options! + cache_path = options[:cache_path] || Hash.new + + options[:cache_path] = Proc.new do |controller| + user = controller.instance_variable_get("@user") + + case + when user.nil? then user = :none + when user.display_name == controller.params[:display_name] then user = :self + when user.administrator? then user = :administrator + when user.moderator? then user = :moderator + else user = :other + end + + cache_path.merge(controller.params).merge(:locale => I18n.locale, :user => user) + end + + actions.push(options) + + super *actions + end + + ## + # extend expire_action to expire all variants + def expire_action(options = {}) + path = ActionCachePath.path_for(self, options, false).gsub('?', '.').gsub(':', '.') + expire_fragment(Regexp.new(Regexp.escape(path) + "\\..*")) + end + + ## + # is the requestor logged in? + def logged_in? + !@user.nil? end private + # extract authorisation credentials from headers, returns user = nil if none def get_auth_data if request.env.has_key? 'X-HTTP_AUTHORIZATION' # where mod_rewrite might have put it