X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/59c97f4866652c025ec4f61cabcaaedd3124ab33..f0feca800d91ac1d23eb63ca17a45d8fd4d41920:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a0e0e20dc..aec612080 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,10 +3,7 @@ class ApplicationController < ActionController::Base protect_from_forgery - if STATUS == :database_readonly or STATUS == :database_offline - def self.cache_sweeper(*sweepers) - end - end + before_filter :fetch_body def authorize_web if session[:user] @@ -48,11 +45,15 @@ class ApplicationController < ActionController::Base if request.get? redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end end + def require_oauth + @oauth = @user.access_token(OAUTH_KEY) if @user and defined? OAUTH_KEY + end + ## # requires the user to be logged in by the token or HTTP methods, or have an # OAuth token with the right capability. this method is a bit of a pain to call @@ -110,6 +111,9 @@ class ApplicationController < ActionController::Base def require_allow_write_gpx require_capability(:allow_write_gpx) end + def require_allow_write_notes + require_capability(:allow_write_notes) + end ## # require that the user is a moderator, or fill out a helpful error message @@ -120,7 +124,7 @@ class ApplicationController < ActionController::Base flash[:error] = t('application.require_moderator.not_a_moderator') redirect_to :action => 'index' else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end end @@ -204,20 +208,49 @@ class ApplicationController < ActionController::Base end def check_api_readable - if STATUS == :database_offline or STATUS == :api_offline + if api_status == :offline report_error "Database offline for maintenance", :service_unavailable return false end end def check_api_writable - if STATUS == :database_offline or STATUS == :database_readonly or - STATUS == :api_offline or STATUS == :api_readonly + unless api_status == :online report_error "Database offline for maintenance", :service_unavailable return false end end + def database_status + if STATUS == :database_offline + :offline + elsif STATUS == :database_readonly + :readonly + else + :online + end + end + + def api_status + status = database_status + if status == :online + if STATUS == :api_offline + status = :offline + elsif STATUS == :api_readonly + status = :readonly + end + end + return status + end + + def gpx_status + status = database_status + if status == :online + status = :offline if STATUS == :gpx_offline + end + return status + end + def require_public_data unless @user.data_public? report_error "You must make your edits public to upload new data", :forbidden @@ -243,51 +276,56 @@ class ApplicationController < ActionController::Base render :text => result.to_s, :content_type => "text/xml" else - render :text => message + "\n", :status => status + render :text => message, :status => status, :content_type => "text/plain" end end def set_locale response.header['Vary'] = 'Accept-Language' - if @user - if !@user.languages.empty? - request.user_preferred_languages = @user.languages - response.header['Vary'] = '*' - elsif !request.user_preferred_languages.empty? - @user.languages = request.user_preferred_languages - @user.save - end + if @user && !@user.languages.empty? + request.user_preferred_languages = @user.languages + response.header['Vary'] = '*' + end + + I18n.locale = select_locale + + if @user && @user.languages.empty? && !request.user_preferred_languages.empty? + @user.languages = request.user_preferred_languages + @user.save end - if request.compatible_language_from(I18n.available_locales).nil? + response.headers['Content-Language'] = I18n.locale.to_s + end + + def select_locale(locales = I18n.available_locales) + if params[:locale] + request.user_preferred_languages = [ params[:locale] ] + end + + if request.compatible_language_from(locales).nil? request.user_preferred_languages = request.user_preferred_languages.collect do |pl| pls = [ pl ] while pl.match(/^(.*)-[^-]+$/) - pls.push($1) if I18n.available_locales.include?($1.to_sym) + pls.push($1) if locales.include?($1) or locales.include?($1.to_sym) pl = $1 end pls end.flatten - - if @user and not request.compatible_language_from(I18n.available_locales).nil? - @user.languages = request.user_preferred_languages - @user.save - end end - I18n.locale = params[:locale] || request.compatible_language_from(I18n.available_locales) || I18n.default_locale - - response.headers['Content-Language'] = I18n.locale.to_s + request.compatible_language_from(locales) || I18n.default_locale end + helper_method :select_locale + def api_call_handle_error begin yield rescue ActiveRecord::RecordNotFound => ex - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found rescue LibXML::XML::Error, ArgumentError => ex report_error ex.message, :bad_request rescue ActiveRecord::RecordInvalid => ex @@ -332,7 +370,7 @@ class ApplicationController < ActionController::Base rescue ActionView::Template::Error => ex ex = ex.original_exception - if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/ + if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/ ex = Timeout::Error.new end @@ -345,40 +383,6 @@ class ApplicationController < ActionController::Base render :action => "timeout" 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[:unless] = case options[:unless] - when NilClass then Array.new - when Array then options[:unless] - else unlessp = [ options[:unless] ] - end - - options[:unless].push(Proc.new do |controller| - controller.params.include?(:page) - end) - - options[:cache_path] = Proc.new do |controller| - cache_path.merge(controller.params).merge(:host => SERVER_URL, :locale => I18n.locale) - end - - actions.push(options) - - super *actions - end - - ## - # extend expire_action to expire all variants - def expire_action(options = {}) - I18n.available_locales.each do |locale| - super options.merge(:host => SERVER_URL, :locale => locale) - end - end - ## # is the requestor logged in? def logged_in? @@ -401,10 +405,41 @@ class ApplicationController < ActionController::Base respond_to do |format| format.html { render :template => "user/no_such_user", :status => :not_found } - format.all { render :nothing => true, :status => :not_found } + format.all { render :text => "", :status => :not_found } end end - + + ## + # Unfortunately if a PUT or POST request that has a body fails to + # read it then Apache will sometimes fail to return the response it + # is given to the client properly, instead erroring: + # + # https://issues.apache.org/bugzilla/show_bug.cgi?id=44782 + # + # To work round this we call rewind on the body here, which is added + # as a filter, to force it to be fetched from Apache into a file. + def fetch_body + request.body.rewind + end + + def preferred_editor + editor = if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor + else + DEFAULT_EDITOR + end + + if request.env['HTTP_USER_AGENT'] =~ /MSIE/ and editor == 'id' + editor = 'potlatch2' + end + + editor + end + + helper_method :preferred_editor + private # extract authorisation credentials from headers, returns user = nil if none