X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/24fc94944bc62de99ddf5ad81ed2598cc0d72680..5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index d3ed53c1b..78299dccf 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,23 +1,24 @@ class UserController < ApplicationController layout "site", :except => [:api_details] - skip_before_action :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files, :auth_success] + skip_before_action :verify_authenticity_token, :only => [:api_read, :api_users, :api_details, :api_gpx_files, :auth_success] before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details] before_action :authorize, :only => [:api_details, :api_gpx_files] - before_action :authorize_web, :except => [:api_read, :api_details, :api_gpx_files] - before_action :set_locale, :except => [:api_read, :api_details, :api_gpx_files] + before_action :authorize_web, :except => [:api_read, :api_users, :api_details, :api_gpx_files] + before_action :set_locale, :except => [:api_read, :api_users, :api_details, :api_gpx_files] before_action :require_user, :only => [:account, :go_public, :make_friend, :remove_friend] before_action :require_self, :only => [:account] - before_action :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files] + before_action :check_database_readable, :except => [:login, :api_read, :api_users, :api_details, :api_gpx_files] before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend] - before_action :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files] + before_action :check_api_readable, :only => [:api_read, :api_users, :api_details, :api_gpx_files] before_action :require_allow_read_prefs, :only => [:api_details] before_action :require_allow_read_gpx, :only => [:api_gpx_files] before_action :require_cookies, :only => [:new, :login, :confirm] - before_action :require_administrator, :only => [:set_status, :delete, :list] - around_action :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files] + before_action :require_administrator, :only => [:set_status, :delete, :index] + around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files] before_action :lookup_user_by_id, :only => [:api_read] before_action :lookup_user_by_name, :only => [:set_status, :delete] + before_action :allow_thirdparty_images, :only => [:show, :account] def terms @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE @@ -28,7 +29,7 @@ class UserController < ApplicationController else @title = t "user.terms.title" - if current_user && current_user.terms_agreed? + if current_user&.terms_agreed? # Already agreed to terms, so just show settings redirect_to :action => :account, :display_name => current_user.display_name elsif current_user.nil? && session[:new_user].nil? @@ -44,9 +45,7 @@ class UserController < ApplicationController if current_user current_user.terms_seen = true - if current_user.save - flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe - end + flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save if params[:referer] redirect_to params[:referer] @@ -99,7 +98,7 @@ class UserController < ApplicationController "lat" => m[2], "lon" => m[3] }.merge(editor)) end - rescue + rescue StandardError # Use default end @@ -119,7 +118,6 @@ class UserController < ApplicationController end def account - @title = t "user.account.title" @tokens = current_user.oauth_tokens.authorized if params[:user] && params[:user][:display_name] && params[:user][:description] @@ -136,6 +134,7 @@ class UserController < ApplicationController current_user.errors.add(attribute, error) end end + @title = t "user.account.title" end def go_public @@ -202,6 +201,10 @@ class UserController < ApplicationController @title = t "user.new.title" @referer = params[:referer] || session[:referer] + append_content_security_policy_directives( + :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] + ) + if current_user # The user is logged in already, so don't show them the signup # page, instead send them to the home page @@ -273,7 +276,7 @@ class UserController < ApplicationController if params[:session] == session.id if session[:token] token = UserToken.find_by(:token => session[:token]) - token.destroy if token + token&.destroy session.delete(:token) end session.delete(:user) @@ -289,7 +292,7 @@ class UserController < ApplicationController def confirm if request.post? token = UserToken.find_by(:token => params[:confirm_string]) - if token && token.user.active? + if token&.user&.active? flash[:error] = t("user.confirm.already active") redirect_to :action => "login" elsif !token || token.expired? @@ -346,7 +349,7 @@ class UserController < ApplicationController def confirm_email if request.post? token = UserToken.find_by(:token => params[:confirm_string]) - if token && token.user.new_email? + if token&.user&.new_email? self.current_user = token.user current_user.email = current_user.new_email current_user.new_email = nil @@ -374,7 +377,7 @@ class UserController < ApplicationController end def api_read - if @this_user.visible? + if @user.visible? render :action => :api_read, :content_type => "text/xml" else head :gone @@ -382,10 +385,22 @@ class UserController < ApplicationController end def api_details - @this_user = current_user + @user = current_user render :action => :api_read, :content_type => "text/xml" end + def api_users + raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"] + + ids = params["users"].split(",").collect(&:to_i) + + raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty? + + @users = User.visible.find(ids) + + render :action => :api_users, :content_type => "text/xml" + end + def api_gpx_files doc = OSM::API.new.get_xml_doc current_user.traces.reload.each do |trace| @@ -394,12 +409,12 @@ class UserController < ApplicationController render :xml => doc.to_s end - def view - @this_user = User.find_by(:display_name => params[:display_name]) + def show + @user = User.find_by(:display_name => params[:display_name]) - if @this_user && - (@this_user.visible? || (current_user && current_user.administrator?)) - @title = @this_user.display_name + if @user && + (@user.visible? || (current_user&.administrator?)) + @title = @user.display_name else render_unknown_user params[:display_name] end @@ -411,8 +426,8 @@ class UserController < ApplicationController if @new_friend if request.post? friend = Friend.new - friend.user_id = current_user.id - friend.friend_user_id = @new_friend.id + friend.befriender = current_user + friend.befriendee = @new_friend if current_user.is_friends_with?(@new_friend) flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name elsif friend.save @@ -425,7 +440,7 @@ class UserController < ApplicationController if params[:referer] redirect_to params[:referer] else - redirect_to :action => "view" + redirect_to :action => "show" end end else @@ -448,7 +463,7 @@ class UserController < ApplicationController if params[:referer] redirect_to params[:referer] else - redirect_to :action => "view" + redirect_to :action => "show" end end else @@ -459,21 +474,21 @@ class UserController < ApplicationController ## # sets a user's status def set_status - @this_user.status = params[:status] - @this_user.save - redirect_to :action => "view", :display_name => params[:display_name] + @user.status = params[:status] + @user.save + redirect_to user_path(:display_name => params[:display_name]) end ## # delete a user, marking them as deleted and removing personal data def delete - @this_user.delete - redirect_to :action => "view", :display_name => params[:display_name] + @user.delete + redirect_to user_path(:display_name => params[:display_name]) end ## # display a list of users matching specified criteria - def list + def index if request.post? ids = params[:user].keys.collect(&:to_i) @@ -528,9 +543,7 @@ class UserController < ApplicationController session[:new_user].auth_provider = provider session[:new_user].auth_uid = uid - if email_verified && email == session[:new_user].email - session[:new_user].status = "active" - end + session[:new_user].status = "active" if email_verified && email == session[:new_user].email redirect_to :action => "terms" else @@ -539,7 +552,7 @@ class UserController < ApplicationController if user.nil? && provider == "google" openid_url = auth_info[:extra][:id_info]["openid_id"] user = User.find_by(:auth_provider => "openid", :auth_uid => openid_url) if openid_url - user.update(:auth_provider => provider, :auth_uid => uid) if user + user&.update(:auth_provider => provider, :auth_uid => uid) end if user @@ -711,7 +724,7 @@ class UserController < ApplicationController end if user.save - set_locale + set_locale(true) if user.new_email.blank? || user.new_email == user.email flash.now[:notice] = t "user.account.flash update success" @@ -723,7 +736,7 @@ class UserController < ApplicationController begin Notifier.email_confirm(user, user.tokens.create).deliver_now - rescue + rescue StandardError # Ignore errors sending email end else @@ -744,7 +757,7 @@ class UserController < ApplicationController flash[:error] = t("user.filter.not_an_administrator") if params[:display_name] - redirect_to :action => "view", :display_name => params[:display_name] + redirect_to user_path(:display_name => params[:display_name]) else redirect_to :action => "login", :referer => request.fullpath end @@ -760,17 +773,17 @@ class UserController < ApplicationController end ## - # ensure that there is a "this_user" instance variable + # ensure that there is a "user" instance variable def lookup_user_by_id - @this_user = User.find(params[:id]) + @user = User.find(params[:id]) end ## - # ensure that there is a "this_user" instance variable + # ensure that there is a "user" instance variable def lookup_user_by_name - @this_user = User.find_by(:display_name => params[:display_name]) + @user = User.find_by(:display_name => params[:display_name]) rescue ActiveRecord::RecordNotFound - redirect_to :action => "view", :display_name => params[:display_name] unless @this_user + redirect_to :action => "view", :display_name => params[:display_name] unless @user end ## @@ -813,6 +826,7 @@ class UserController < ApplicationController def gravatar_enable(user) # code from example https://en.gravatar.com/site/implement/images/ruby/ return false if user.image.present? + hash = Digest::MD5.hexdigest(user.email.downcase) url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back response = OSM.http_client.get(URI.parse(url))