X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c8ad2f86edefed72052b402742cadedb0d674d9..34e3e51456774127d43408b7ab65c24f41373f62:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 067fc6a51..c335dcaf4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,20 +5,11 @@ class ApplicationController < ActionController::Base before_filter :fetch_body - if STATUS == :database_readonly or STATUS == :database_offline - def self.cache_sweeper(*sweepers) - end - end - def authorize_web if session[:user] @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first - if @user.display_name != cookies["_osm_username"] - logger.info "Session user '#{@user.display_name}' does not match cookie user '#{cookies['_osm_username']}'" - reset_session - @user = nil - elsif @user.status == "suspended" + if @user.status == "suspended" session.delete(:user) session_expires_automatically @@ -50,7 +41,7 @@ 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 @@ -60,8 +51,8 @@ class ApplicationController < ActionController::Base 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 + # 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 # directly, since it's cumbersome to call filters with arguments in rails. to # make it easier to read and write the code, there are some utility methods # below. @@ -82,7 +73,7 @@ class ApplicationController < ActionController::Base if request.cookies["_osm_session"].to_s == "" if params[:cookie_test].nil? session[:cookie_test] = true - redirect_to params.merge(:cookie_test => "true") + redirect_to Hash[params].merge(:cookie_test => "true") return false else flash.now[:warning] = t 'application.require_cookies.cookies_needed' @@ -129,7 +120,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 @@ -170,18 +161,18 @@ class ApplicationController < ActionController::Base end end - def authorize(realm='Web Password', errormessage="Couldn't authenticate you") + def authorize(realm='Web Password', errormessage="Couldn't authenticate you") # make the @user object from any auth sources we have setup_user_auth # handle authenticate pass/fail unless @user # no auth, the user does not exist or the password was wrong - response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" + response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" render :text => errormessage, :status => :unauthorized return false - end - end + end + end ## # to be used as a before_filter *after* authorize. this checks that @@ -189,26 +180,34 @@ class ApplicationController < ActionController::Base # # NOTE: this isn't a very good way of doing it - it duplicates logic # from require_moderator - but what we really need to do is a fairly - # drastic refactoring based on :format and respond_to? but not a + # drastic refactoring based on :format and respond_to? but not a # good idea to do that in this branch. - def authorize_moderator(errormessage="Access restricted to moderators") + def authorize_moderator(errormessage="Access restricted to moderators") # check user is a moderator unless @user.moderator? render :text => errormessage, :status => :forbidden return false - end - end + end + end def check_database_readable(need_api = false) if STATUS == :database_offline or (need_api and STATUS == :api_offline) - redirect_to :controller => 'site', :action => 'offline' + if request.xhr? + report_error "Database offline for maintenance", :service_unavailable + else + redirect_to :controller => 'site', :action => 'offline' + end end end def check_database_writable(need_api = false) if STATUS == :database_offline or STATUS == :database_readonly or (need_api and (STATUS == :api_offline or STATUS == :api_readonly)) - redirect_to :controller => 'site', :action => 'offline' + if request.xhr? + report_error "Database offline for maintenance", :service_unavailable + else + redirect_to :controller => 'site', :action => 'offline' + end end end @@ -231,7 +230,7 @@ class ApplicationController < ActionController::Base :offline elsif STATUS == :database_readonly :readonly - else + else :online end end @@ -265,7 +264,7 @@ class ApplicationController < ActionController::Base # Report and error to the user # (If anyone ever fixes Rails so it can set a http status "reason phrase", - # rather than only a status code and having the web engine make up a + # rather than only a status code and having the web engine make up a # phrase from that, we can also put the error message into the status # message. For now, rails won't let us) def report_error(message, status = :bad_request) @@ -281,51 +280,56 @@ class ApplicationController < ActionController::Base render :text => result.to_s, :content_type => "text/xml" else - render :text => message, :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? + http_accept_language.user_preferred_languages = @user.languages + response.header['Vary'] = '*' + end + + I18n.locale = select_locale + + if @user && @user.languages.empty? && !http_accept_language.user_preferred_languages.empty? + @user.languages = http_accept_language.user_preferred_languages + @user.save end - if request.compatible_language_from(I18n.available_locales).nil? - request.user_preferred_languages = request.user_preferred_languages.collect do |pl| + response.headers['Content-Language'] = I18n.locale.to_s + end + + def select_locale(locales = I18n.available_locales) + if params[:locale] + http_accept_language.user_preferred_languages = [ params[:locale] ] + end + + if http_accept_language.compatible_language_from(locales).nil? + http_accept_language.user_preferred_languages = http_accept_language.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 + http_accept_language.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 @@ -370,7 +374,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 @@ -383,40 +387,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? @@ -439,7 +409,7 @@ 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 @@ -456,23 +426,45 @@ class ApplicationController < ActionController::Base request.body.rewind end -private + def map_layout + request.xhr? ? 'xhr' : 'map' + 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|Trident/ and editor == 'id' + editor = 'potlatch2' + end + + editor + end + + helper_method :preferred_editor + +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 - authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split - elsif request.env.has_key? 'REDIRECT_X_HTTP_AUTHORIZATION' # mod_fcgi - authdata = request.env['REDIRECT_X_HTTP_AUTHORIZATION'].to_s.split + def get_auth_data + if request.env.has_key? 'X-HTTP_AUTHORIZATION' # where mod_rewrite might have put it + authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split + elsif request.env.has_key? 'REDIRECT_X_HTTP_AUTHORIZATION' # mod_fcgi + authdata = request.env['REDIRECT_X_HTTP_AUTHORIZATION'].to_s.split elsif request.env.has_key? 'HTTP_AUTHORIZATION' # regular location authdata = request.env['HTTP_AUTHORIZATION'].to_s.split - end + end # only basic authentication supported - if authdata and authdata[0] == 'Basic' + if authdata and authdata[0] == 'Basic' user, pass = Base64.decode64(authdata[1]).split(':',2) - end - return [user, pass] - end + end + return [user, pass] + end # used by oauth plugin to get the current user def current_user