X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5b33f3f8e31c62bc3e5db1d5b120533c3afdde68..942e62117ff7f12d40618a94ea3f4e86f8cb25af:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ebad7c2c6..db4ae9ad3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,15 +1,19 @@ class ApplicationController < ActionController::Base include SessionPersistence - protect_from_forgery + protect_from_forgery :with => :exception before_action :fetch_body + around_action :better_errors_allow_inline, :if => proc { Rails.env.development? } + + attr_accessor :current_user + helper_method :current_user def authorize_web if session[:user] - @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first + self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first - if @user.status == "suspended" + if current_user.status == "suspended" session.delete(:user) session_expires_automatically @@ -17,7 +21,7 @@ class ApplicationController < ActionController::Base # don't allow access to any auth-requiring part of the site unless # the new CTs have been seen (and accept/decline chosen). - elsif !@user.terms_seen && flash[:skip_terms].nil? + elsif !current_user.terms_seen && flash[:skip_terms].nil? flash[:notice] = t "user.terms.you need to accept or decline" if params[:referer] redirect_to :controller => "user", :action => "terms", :referer => params[:referer] @@ -26,28 +30,26 @@ class ApplicationController < ActionController::Base end end elsif session[:token] - if @user = User.authenticate(:token => session[:token]) - session[:user] = @user.id - end + session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token]) end rescue StandardError => ex logger.info("Exception authorizing user: #{ex}") reset_session - @user = nil + self.current_user = nil end def require_user - unless @user + unless current_user if request.get? redirect_to :controller => "user", :action => "login", :referer => request.fullpath else - render :text => "", :status => :forbidden + head :forbidden end end end def require_oauth - @oauth = @user.access_token(OAUTH_KEY) if @user && defined? OAUTH_KEY + @oauth = current_user.access_token(OAUTH_KEY) if current_user && defined? OAUTH_KEY end ## @@ -74,7 +76,7 @@ class ApplicationController < ActionController::Base if request.cookies["_osm_session"].to_s == "" if params[:cookie_test].nil? session[:cookie_test] = true - redirect_to Hash[params].merge(:cookie_test => "true") + redirect_to params.to_unsafe_h.merge(:cookie_test => "true") false else flash.now[:warning] = t "application.require_cookies.cookies_needed" @@ -100,7 +102,7 @@ class ApplicationController < ActionController::Base def require_allow_write_api require_capability(:allow_write_api) - if REQUIRE_TERMS_AGREED && @user.terms_agreed.nil? + if REQUIRE_TERMS_AGREED && current_user.terms_agreed.nil? report_error "You must accept the contributor terms before you can edit.", :forbidden return false end @@ -122,18 +124,18 @@ class ApplicationController < ActionController::Base # require that the user is a moderator, or fill out a helpful error message # and return them to the index for the controller this is wrapped from. def require_moderator - unless @user.moderator? + unless current_user.moderator? if request.get? flash[:error] = t("application.require_moderator.not_a_moderator") redirect_to :action => "index" else - render :text => "", :status => :forbidden + head :forbidden end end end ## - # sets up the @user object for use by other methods. this is mostly called + # sets up the current_user for use by other methods. this is mostly called # from the authorize method, but can be called elsewhere if authorisation # is optional. def setup_user_auth @@ -141,19 +143,19 @@ class ApplicationController < ActionController::Base unless Authenticator.new(self, [:token]).allow? username, passwd = get_auth_data # parse from headers # authenticate per-scheme - @user = if username.nil? - nil # no authentication provided - perhaps first connect (client should retry after 401) - elsif username == "token" - User.authenticate(:token => passwd) # preferred - random token for user from db, passed in basic auth - else - User.authenticate(:username => username, :password => passwd) # basic auth - end + self.current_user = if username.nil? + nil # no authentication provided - perhaps first connect (client should retry after 401) + elsif username == "token" + User.authenticate(:token => passwd) # preferred - random token for user from db, passed in basic auth + else + User.authenticate(:username => username, :password => passwd) # basic auth + end end # have we identified the user? - if @user + if current_user # check if the user has been banned - user_block = @user.blocks.active.take + user_block = current_user.blocks.active.take unless user_block.nil? set_locale if user_block.zero_hour? @@ -166,7 +168,7 @@ class ApplicationController < ActionController::Base # if the user hasn't seen the contributor terms then don't # allow editing - they have to go to the web site and see # (but can decline) the CTs to continue. - if REQUIRE_TERMS_SEEN && !@user.terms_seen && flash[:skip_terms].nil? + if REQUIRE_TERMS_SEEN && !current_user.terms_seen && flash[:skip_terms].nil? set_locale report_error t("application.setup_user_auth.need_to_see_terms"), :forbidden end @@ -174,14 +176,14 @@ class ApplicationController < ActionController::Base end def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you") - # make the @user object from any auth sources we have + # make the current_user object from any auth sources we have setup_user_auth # handle authenticate pass/fail - unless @user + unless current_user # no auth, the user does not exist or the password was wrong response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" - render :text => errormessage, :status => :unauthorized + render :plain => errormessage, :status => :unauthorized return false end end @@ -196,8 +198,8 @@ class ApplicationController < ActionController::Base # good idea to do that in this branch. def authorize_moderator(errormessage = "Access restricted to moderators") # check user is a moderator - unless @user.moderator? - render :text => errormessage, :status => :forbidden + unless current_user.moderator? + render :plain => errormessage, :status => :forbidden false end end @@ -266,7 +268,7 @@ class ApplicationController < ActionController::Base end def require_public_data - unless @user.data_public? + unless current_user.data_public? report_error "You must make your edits public to upload new data", :forbidden false end @@ -288,31 +290,32 @@ class ApplicationController < ActionController::Base result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}") result.root << (XML::Node.new("message") << message) - render :text => result.to_s, :content_type => "text/xml" + render :xml => result.to_s else - render :text => message, :status => status, :content_type => "text/plain" + render :plain => message, :status => status end end - def preferred_languages - @languages ||= if params[:locale] - Locale.list(params[:locale]) - elsif @user - @user.preferred_languages - else - Locale.list(http_accept_language.user_preferred_languages) - end + def preferred_languages(reset = false) + @preferred_languages = nil if reset + @preferred_languages ||= if params[:locale] + Locale.list(params[:locale]) + elsif current_user + current_user.preferred_languages + else + Locale.list(http_accept_language.user_preferred_languages) + end end helper_method :preferred_languages - def set_locale - if @user && @user.languages.empty? && !http_accept_language.user_preferred_languages.empty? - @user.languages = http_accept_language.user_preferred_languages - @user.save + def set_locale(reset = false) + if current_user && 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) + I18n.locale = Locale.available.preferred(preferred_languages(reset)) response.headers["Vary"] = "Accept-Language" response.headers["Content-Language"] = I18n.locale.to_s @@ -321,7 +324,7 @@ class ApplicationController < ActionController::Base def api_call_handle_error yield rescue ActiveRecord::RecordNotFound => ex - render :text => "", :status => :not_found + head :not_found rescue LibXML::XML::Error, ArgumentError => ex report_error ex.message, :bad_request rescue ActiveRecord::RecordInvalid => ex @@ -343,7 +346,7 @@ class ApplicationController < ActionController::Base # 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.new(method) unless ok + raise OSM::APIBadMethodError, method unless ok end ## @@ -363,7 +366,7 @@ class ApplicationController < ActionController::Base yield end rescue ActionView::Template::Error => ex - ex = ex.original_exception + ex = ex.cause if ex.is_a?(Timeout::Error) || (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/) @@ -376,11 +379,9 @@ class ApplicationController < ActionController::Base end ## - # ensure that there is a "this_user" instance variable - def lookup_this_user - unless @this_user = User.active.find_by(:display_name => params[:display_name]) - render_unknown_user params[:display_name] - end + # ensure that there is a "user" instance variable + def lookup_user + render_unknown_user params[:display_name] unless @user = User.active.find_by(:display_name => params[:display_name]) end ## @@ -391,7 +392,7 @@ class ApplicationController < ActionController::Base respond_to do |format| format.html { render :template => "user/no_such_user", :status => :not_found } - format.all { render :text => "", :status => :not_found } + format.all { head :not_found } end end @@ -410,8 +411,11 @@ class ApplicationController < ActionController::Base def map_layout append_content_security_policy_directives( - :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com], - :script_src => %w[graphhopper.com open.mapquestapi.com], + :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 => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org graphhopper.com], + :form_action => %w[render.openstreetmap.org], + :script_src => %w[open.mapquestapi.com], :img_src => %w[developer.mapquest.com] ) @@ -424,11 +428,15 @@ class ApplicationController < ActionController::Base request.xhr? ? "xhr" : "map" end + def allow_thirdparty_images + append_content_security_policy_directives(:img_src => %w[*]) + end + def preferred_editor editor = if params[:editor] params[:editor] - elsif @user && @user.preferred_editor - @user.preferred_editor + elsif current_user && current_user.preferred_editor + current_user.preferred_editor else DEFAULT_EDITOR end @@ -448,6 +456,17 @@ class ApplicationController < ActionController::Base end end + def better_errors_allow_inline + yield + rescue StandardError + append_content_security_policy_directives( + :script_src => %w['unsafe-inline'], + :style_src => %w['unsafe-inline'] + ) + + raise + end + private # extract authorisation credentials from headers, returns user = nil if none @@ -460,22 +479,10 @@ class ApplicationController < ActionController::Base authdata = request.env["HTTP_AUTHORIZATION"].to_s.split end # only basic authentication supported - if authdata && authdata[0] == "Basic" - user, pass = Base64.decode64(authdata[1]).split(":", 2) - end + user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic" [user, pass] end - # used by oauth plugin to get the current user - def current_user - @user - end - - # used by oauth plugin to set the current user - def current_user=(user) - @user = user - end - # override to stop oauth plugin sending errors def invalid_oauth_response; end end