X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e0d501f8327d66a394b2ba3f23185af640e10630..dc28f1dccc5589afa667bf6959f12e6b18589459:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e389f6fbf..6d98c17f6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,6 @@ class UsersController < ApplicationController include SessionMethods + include UserMethods layout "site" @@ -11,201 +12,48 @@ class UsersController < ApplicationController authorize_resource - before_action :require_self, :only => [:account] - before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public] - before_action :require_cookies, :only => [:new, :confirm] + before_action :check_database_writable, :only => [:new, :go_public] + before_action :require_cookies, :only => [:new] before_action :lookup_user_by_name, :only => [:set_status, :destroy] - before_action :allow_thirdparty_images, :only => [:show, :account] - - def terms - @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || Settings.default_legale - @text = OSM.legal_text_for_country(@legale) - - if request.xhr? - render :partial => "terms" - else - @title = t "users.terms.title" - - 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? - redirect_to :action => :login, :referer => request.fullpath - end - end - end - - def save - @title = t "users.new.title" - - if params[:decline] || !(params[:read_tou] && params[:read_ct]) - if current_user - current_user.terms_seen = true - - flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save - - if params[:referer] - redirect_to safe_referer(params[:referer]) - else - redirect_to :action => :account, :display_name => current_user.display_name - end - elsif params[:decline] - redirect_to t("users.terms.declined") - else - redirect_to :action => :terms - end - elsif current_user - unless current_user.terms_agreed? - current_user.consider_pd = params[:user][:consider_pd] - current_user.tou_agreed = Time.now.getutc - current_user.terms_agreed = Time.now.getutc - current_user.terms_seen = true - - flash[:notice] = t "users.new.terms accepted" if current_user.save - end - - if params[:referer] - redirect_to safe_referer(params[:referer]) - else - redirect_to :action => :account, :display_name => current_user.display_name - end - else - self.current_user = session.delete(:new_user) - - if check_signup_allowed(current_user.email) - current_user.data_public = true - current_user.description = "" if current_user.description.nil? - current_user.creation_ip = request.remote_ip - current_user.languages = http_accept_language.user_preferred_languages - current_user.terms_agreed = Time.now.getutc - current_user.tou_agreed = Time.now.getutc - current_user.terms_seen = true - - if current_user.auth_uid.blank? - current_user.auth_provider = nil - current_user.auth_uid = nil - end - - if current_user.save - flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK) - - referer = welcome_path - - begin - uri = URI(session[:referer]) - %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m| - editor = Rack::Utils.parse_query(uri.query).slice("editor") - referer = welcome_path({ "zoom" => m[1], - "lat" => m[2], - "lon" => m[3] }.merge(editor)) - end - rescue StandardError - # Use default - end - - if current_user.status == "active" - session[:referer] = referer - successful_login(current_user) - else - session[:token] = current_user.tokens.create.token - UserMailer.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later - redirect_to :action => "confirm", :display_name => current_user.display_name - end - else - render :action => "new", :referer => params[:referer] - end - end - end - end - - def account - @tokens = current_user.oauth_tokens.authorized - - append_content_security_policy_directives( - :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] - ) + before_action :allow_thirdparty_images, :only => [:show] + ## + # display a list of users matching specified criteria + def index if request.post? - if params[:user][:auth_provider].blank? || - (params[:user][:auth_provider] == current_user.auth_provider && - params[:user][:auth_uid] == current_user.auth_uid) - update_user(current_user, params) - redirect_to user_account_url(current_user) if current_user.errors.count.zero? - else - session[:new_user_settings] = params - redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid]), :status => :temporary_redirect - end - elsif errors = session.delete(:user_errors) - errors.each do |attribute, error| - current_user.errors.add(attribute, error) - end - end - @title = t "users.account.title" - end - - def go_public - current_user.data_public = true - current_user.save - flash[:notice] = t "users.go_public.flash success" - redirect_to :action => "account", :display_name => current_user.display_name - end - - def lost_password - @title = t "users.lost_password.title" + ids = params[:user].keys.collect(&:to_i) - if request.post? - user = User.visible.find_by(:email => params[:email]) + User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm] + User.where(:id => ids).update_all(:status => "deleted") if params[:hide] - if user.nil? - users = User.visible.where("LOWER(email) = LOWER(?)", params[:email]) + redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page]) + else + @params = params.permit(:status, :ip) - user = users.first if users.count == 1 - end + conditions = {} + conditions[:status] = @params[:status] if @params[:status] + conditions[:creation_ip] = @params[:ip] if @params[:ip] - if user - token = user.tokens.create - UserMailer.lost_password(user, token).deliver_later - flash[:notice] = t "users.lost_password.notice email on way" - redirect_to login_path - else - flash.now[:error] = t "users.lost_password.notice email cannot find" - end + @user_pages, @users = paginate(:users, + :conditions => conditions, + :order => :id, + :per_page => 50) end end - def reset_password - @title = t "users.reset_password.title" - - if params[:token] - token = UserToken.find_by(:token => params[:token]) - - if token - self.current_user = token.user - - if params[:user] - current_user.pass_crypt = params[:user][:pass_crypt] - current_user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] - current_user.status = "active" if current_user.status == "pending" - current_user.email_valid = true + def show + @user = User.find_by(:display_name => params[:display_name]) - if current_user.save - token.destroy - session[:fingerprint] = current_user.fingerprint - flash[:notice] = t "users.reset_password.flash changed" - successful_login(current_user) - end - end - else - flash[:error] = t "users.reset_password.flash token bad" - redirect_to :action => "lost_password" - end + if @user && + (@user.visible? || current_user&.administrator?) + @title = @user.display_name else - head :bad_request + render_unknown_user params[:display_name] end end def new - @title = t "users.new.title" + @title = t ".title" @referer = if params[:referer] safe_referer(params[:referer]) else @@ -219,11 +67,7 @@ class UsersController < ApplicationController if current_user # The user is logged in already, so don't show them the signup # page, instead send them to the home page - if @referer - redirect_to @referer - else - redirect_to :controller => "site", :action => "index" - end + redirect_to @referer || { :controller => "site", :action => "index" } elsif params.key?(:auth_provider) && params.key?(:auth_uid) self.current_user = User.new(:email => params[:email], :email_confirmation => params[:email], @@ -247,8 +91,6 @@ class UsersController < ApplicationController Rails.logger.info "create: #{session[:referer]}" - current_user.status = "pending" - if current_user.auth_provider.present? && current_user.pass_crypt.empty? # We are creating an account with external authentication and # no password was specified so create a random one @@ -271,147 +113,129 @@ class UsersController < ApplicationController end end - def confirm - if request.post? - token = UserToken.find_by(:token => params[:confirm_string]) - if token&.user&.active? - flash[:error] = t("users.confirm.already active") - redirect_to login_path - elsif !token || token.expired? - flash[:error] = t("users.confirm.unknown token") - redirect_to :action => "confirm" - elsif !token.user.visible? - render_unknown_user token.user.display_name - else - user = token.user - user.status = "active" - user.email_valid = true - flash[:notice] = gravatar_status_message(user) if gravatar_enable(user) - user.save! - referer = safe_referer(token.referer) if token.referer - token.destroy - - if session[:token] - token = UserToken.find_by(:token => session[:token]) - session.delete(:token) - else - token = nil - end - - if token.nil? || token.user != user - flash[:notice] = t("users.confirm.success") - redirect_to login_path(:referer => referer) - else - token.destroy + ## + # destroy a user, marking them as deleted and removing personal data + def destroy + @user.soft_destroy! + redirect_to user_path(:display_name => params[:display_name]) + end - session[:user] = user.id - session[:fingerprint] = user.fingerprint + def terms + @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || Settings.default_legale + @text = OSM.legal_text_for_country(@legale) - redirect_to referer || welcome_path - end - end + if request.xhr? + render :partial => "terms" else - user = User.visible.find_by(:display_name => params[:display_name]) + @title = t ".title" - redirect_to root_path if user.nil? || user.active? + if current_user&.terms_agreed? + # Already agreed to terms, so just show settings + redirect_to edit_account_path + elsif current_user.nil? && session[:new_user].nil? + redirect_to login_path(:referer => request.fullpath) + end end end - def confirm_resend - user = User.visible.find_by(:display_name => params[:display_name]) - token = UserToken.find_by(:token => session[:token]) + def save + @title = t "users.new.title" + + if params[:decline] || !(params[:read_tou] && params[:read_ct]) + if current_user + current_user.terms_seen = true + + flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save - if user.nil? || token.nil? || token.user != user - flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name] + referer = safe_referer(params[:referer]) if params[:referer] + + redirect_to referer || edit_account_path + elsif params[:decline] + redirect_to t("users.terms.declined") + else + redirect_to :action => :terms + end + elsif current_user + unless current_user.terms_agreed? + current_user.consider_pd = params[:user][:consider_pd] + current_user.tou_agreed = Time.now.utc + current_user.terms_agreed = Time.now.utc + current_user.terms_seen = true + + flash[:notice] = t "users.new.terms accepted" if current_user.save + end + + referer = safe_referer(params[:referer]) if params[:referer] + + redirect_to referer || edit_account_path else - UserMailer.signup_confirm(user, user.tokens.create).deliver_later - flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email - end + self.current_user = session.delete(:new_user) - redirect_to login_path - end + if check_signup_allowed(current_user.email) + current_user.data_public = true + current_user.description = "" if current_user.description.nil? + current_user.creation_ip = request.remote_ip + current_user.languages = http_accept_language.user_preferred_languages + current_user.terms_agreed = Time.now.utc + current_user.tou_agreed = Time.now.utc + current_user.terms_seen = true + + if current_user.auth_uid.blank? + current_user.auth_provider = nil + current_user.auth_uid = nil + end - def confirm_email - if request.post? - token = UserToken.find_by(:token => params[:confirm_string]) - if token&.user&.new_email? - self.current_user = token.user - current_user.email = current_user.new_email - current_user.new_email = nil - current_user.email_valid = true - gravatar_enabled = gravatar_enable(current_user) if current_user.save - flash[:notice] = if gravatar_enabled - "#{t('users.confirm_email.success')} #{gravatar_status_message(current_user)}" - else - t("users.confirm_email.success") - end + flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo) + + referer = welcome_path + + begin + uri = URI(session[:referer]) + %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m| + editor = Rack::Utils.parse_query(uri.query).slice("editor") + referer = welcome_path({ "zoom" => m[1], + "lat" => m[2], + "lon" => m[3] }.merge(editor)) + end + rescue StandardError + # Use default + end + + if current_user.status == "active" + session[:referer] = referer + successful_login(current_user) + else + session[:token] = current_user.tokens.create.token + UserMailer.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later + redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name + end else - flash[:errors] = current_user.errors + render :action => "new", :referer => params[:referer] end - current_user.tokens.delete_all - session[:user] = current_user.id - session[:fingerprint] = current_user.fingerprint - redirect_to :action => "account", :display_name => current_user.display_name - elsif token - flash[:error] = t "users.confirm_email.failure" - redirect_to :action => "account", :display_name => token.user.display_name - else - flash[:error] = t "users.confirm_email.unknown_token" end end end - def show - @user = User.find_by(:display_name => params[:display_name]) - - if @user && - (@user.visible? || current_user&.administrator?) - @title = @user.display_name - else - render_unknown_user params[:display_name] - end + def go_public + current_user.data_public = true + current_user.save + flash[:notice] = t ".flash success" + redirect_to edit_account_path end ## # sets a user's status def set_status - @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 destroy - @user.delete + @user.activate! if params[:event] == "activate" + @user.confirm! if params[:event] == "confirm" + @user.unconfirm! if params[:event] == "unconfirm" + @user.hide! if params[:event] == "hide" + @user.unhide! if params[:event] == "unhide" + @user.unsuspend! if params[:event] == "unsuspend" redirect_to user_path(:display_name => params[:display_name]) end - ## - # display a list of users matching specified criteria - def index - if request.post? - ids = params[:user].keys.collect(&:to_i) - - User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm] - User.where(:id => ids).update_all(:status => "deleted") if params[:hide] - - redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page]) - else - @params = params.permit(:status, :ip) - - conditions = {} - conditions[:status] = @params[:status] if @params[:status] - conditions[:creation_ip] = @params[:ip] if @params[:ip] - - @user_pages, @users = paginate(:users, - :conditions => conditions, - :order => :id, - :per_page => 50) - end - end - ## # omniauth success callback def auth_success @@ -422,15 +246,15 @@ class UsersController < ApplicationController name = auth_info[:info][:name] email = auth_info[:info][:email] - case provider - when "openid" - email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || + email_verified = case provider + when "openid" + uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || uid.match(%r{https://me.yahoo.com/(.*)}) - when "google", "facebook" - email_verified = true - else - email_verified = false - end + when "google", "facebook" + true + else + false + end if settings = session.delete(:new_user_settings) current_user.auth_provider = provider @@ -442,12 +266,12 @@ class UsersController < ApplicationController session[:user_errors] = current_user.errors.as_json - redirect_to :action => "account", :display_name => current_user.display_name + redirect_to edit_account_path elsif session[:new_user] session[:new_user].auth_provider = provider session[:new_user].auth_uid = uid - session[:new_user].status = "active" if email_verified && email == session[:new_user].email + session[:new_user].activate if email_verified && email == session[:new_user].email redirect_to :action => "terms" else @@ -466,9 +290,9 @@ class UsersController < ApplicationController when "active", "confirmed" successful_login(user, request.env["omniauth.params"]["referer"]) when "suspended" - failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe + failed_login({ :partial => "sessions/suspended_flash" }) else - failed_login t("users.login.auth failure") + failed_login t("sessions.new.auth failure") end else redirect_to :action => "new", :nickname => name, :email => email, @@ -480,100 +304,14 @@ class UsersController < ApplicationController ## # omniauth failure callback def auth_failure - flash[:error] = t("users.auth_failure.#{params[:message]}") - redirect_to params[:origin] || login_url - end + flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t(".unknown_error")) - private + origin = safe_referer(params[:origin]) if params[:origin] - ## - # - def unconfirmed_login(user) - session[:token] = user.tokens.create.token - - redirect_to :action => "confirm", :display_name => user.display_name - - session.delete(:remember_me) - session.delete(:referer) + redirect_to origin || login_url end - ## - # update a user's details - def update_user(user, params) - user.display_name = params[:user][:display_name] - user.new_email = params[:user][:new_email] - - unless params[:user][:pass_crypt].empty? && params[:user][:pass_crypt_confirmation].empty? - user.pass_crypt = params[:user][:pass_crypt] - user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] - end - - if params[:user][:description] != user.description - user.description = params[:user][:description] - user.description_format = "markdown" - end - - user.languages = params[:user][:languages].split(",") - - case params[:avatar_action] - when "new" - user.avatar.attach(params[:user][:avatar]) - user.image_use_gravatar = false - when "delete" - user.avatar.purge_later - user.image_use_gravatar = false - when "gravatar" - user.avatar.purge_later - user.image_use_gravatar = true - end - - user.home_lat = params[:user][:home_lat] - user.home_lon = params[:user][:home_lon] - - user.preferred_editor = if params[:user][:preferred_editor] == "default" - nil - else - params[:user][:preferred_editor] - end - - if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank? - user.auth_provider = nil - user.auth_uid = nil - end - - if user.save - session[:fingerprint] = user.fingerprint - - set_locale(:reset => true) - - if user.new_email.blank? || user.new_email == user.email - flash[:notice] = t "users.account.flash update success" - else - user.email = user.new_email - - if user.valid? - flash[:notice] = t "users.account.flash update success confirm needed" - - begin - UserMailer.email_confirm(user, user.tokens.create).deliver_later - rescue StandardError - # Ignore errors sending email - end - else - current_user.errors.add(:new_email, current_user.errors[:email]) - current_user.errors.add(:email, []) - end - - user.restore_email! - end - end - end - - ## - # require that the user in the URL is the logged in user - def require_self - head :forbidden if params[:display_name] != current_user.display_name - end + private ## # ensure that there is a "user" instance variable @@ -622,34 +360,4 @@ class UsersController < ApplicationController dns.getresources(domain, Resolv::DNS::Resource::IN::MX).collect(&:exchange).collect(&:to_s) end end - - ## - # check if this user has a gravatar and set the user pref is true - def gravatar_enable(user) - # code from example https://en.gravatar.com/site/implement/images/ruby/ - return false if user.avatar.attached? - - begin - 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)) - available = response.success? - rescue StandardError - available = false - end - - oldsetting = user.image_use_gravatar - user.image_use_gravatar = available - oldsetting != user.image_use_gravatar - end - - ## - # display a message about th current status of the gravatar setting - def gravatar_status_message(user) - if user.image_use_gravatar - t "users.account.gravatar.enabled" - else - t "users.account.gravatar.disabled" - end - end end