X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f8a606869e50752b4112b1dbc88d80251e261b44..d3d0da03286d7bf9dc06027f8edb802a3102bb0b:/app/controllers/users_controller.rb?ds=sidebyside diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4974d99f1..341679763 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,7 +17,9 @@ class UsersController < ApplicationController 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] + + allow_thirdparty_images :only => :show + allow_social_login :only => :new ## # display a list of users matching specified criteria @@ -54,27 +56,27 @@ class UsersController < ApplicationController def new @title = t ".title" - @referer = if params[:referer] - safe_referer(params[:referer]) - else - session[:referer] - end + @referer = safe_referer(params[:referer]) - append_content_security_policy_directives( - :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] - ) + parse_oauth_referer @referer if current_user # The user is logged in already, so don't show them the signup # page, instead send them to the home page redirect_to @referer || { :controller => "site", :action => "index" } elsif params.key?(:auth_provider) && params.key?(:auth_uid) + @email_hmac = params[:email_hmac] + self.current_user = User.new(:email => params[:email], :display_name => params[:nickname], :auth_provider => params[:auth_provider], :auth_uid => params[:auth_uid]) - flash.now[:notice] = render_to_string :partial => "auth_association" + if current_user.valid? || current_user.errors[:email].empty? + flash.now[:notice] = render_to_string :partial => "auth_association" + else + flash.now[:warning] = t ".duplicate_social_email" + end else check_signup_allowed @@ -86,11 +88,7 @@ class UsersController < ApplicationController self.current_user = User.new(user_params) if check_signup_allowed(current_user.email) - session[:referer] = safe_referer(params[:referer]) if params[:referer] - - Rails.logger.info "create: #{session[:referer]}" - - if current_user.auth_provider.present? && current_user.pass_crypt.empty? + if current_user.auth_uid.present? # We are creating an account with external authentication and # no password was specified so create a random one current_user.pass_crypt = SecureRandom.base64(16) @@ -102,12 +100,12 @@ class UsersController < ApplicationController render :action => "new" elsif current_user.auth_provider.present? # Verify external authenticator before moving on - session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation", "consider_pd") - redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect + session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation") + redirect_to auth_url(current_user.auth_provider, current_user.auth_uid, params[:referer]), :status => :temporary_redirect else # Save the user record - session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation", "consider_pd") - save_new_user + session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation") + save_new_user params[:email_hmac], params[:referer] end end end @@ -131,7 +129,7 @@ class UsersController < ApplicationController 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? + elsif current_user.nil? redirect_to login_path(:referer => request.fullpath) end end @@ -192,6 +190,7 @@ class UsersController < ApplicationController ## # omniauth success callback def auth_success + referer = request.env["omniauth.params"]["referer"] auth_info = request.env["omniauth.auth"] provider = auth_info[:provider] @@ -223,9 +222,9 @@ class UsersController < ApplicationController elsif session[:new_user] session[:new_user]["auth_provider"] = provider session[:new_user]["auth_uid"] = uid - session[:new_user]["verified_email"] = email if email_verified - save_new_user + email_hmac = UsersController.message_hmac(email) if email_verified && email + save_new_user email_hmac, referer else user = User.find_by(:auth_provider => provider, :auth_uid => uid) @@ -238,17 +237,18 @@ class UsersController < ApplicationController if user case user.status when "pending" - unconfirmed_login(user) + unconfirmed_login(user, referer) when "active", "confirmed" - successful_login(user, request.env["omniauth.params"]["referer"]) + successful_login(user, referer) when "suspended" - failed_login({ :partial => "sessions/suspended_flash" }) + failed_login({ :partial => "sessions/suspended_flash" }, user.display_name, referer) else - failed_login t("sessions.new.auth failure") + failed_login(t("sessions.new.auth failure"), user.display_name, referer) end else - redirect_to :action => "new", :nickname => name, :email => email, - :auth_provider => provider, :auth_uid => uid + email_hmac = UsersController.message_hmac(email) if email_verified && email + redirect_to :action => "new", :nickname => name, :email => email, :email_hmac => email_hmac, + :auth_provider => provider, :auth_uid => uid, :referer => referer end end end @@ -263,14 +263,18 @@ class UsersController < ApplicationController redirect_to origin || login_url end + def self.message_hmac(text) + sha256 = Digest::SHA256.new + sha256 << Rails.application.key_generator.generate_key("openstreetmap/email_address") + sha256 << text + Base64.urlsafe_encode64(sha256.digest) + end + private - def save_new_user + def save_new_user(email_hmac, referer = nil) new_user = session.delete(:new_user) - verified_email = new_user.delete("verified_email") - self.current_user = User.new(new_user) - if check_signup_allowed(current_user.email) current_user.data_public = true current_user.description = "" if current_user.description.nil? @@ -283,7 +287,7 @@ class UsersController < ApplicationController if current_user.auth_uid.blank? current_user.auth_provider = nil current_user.auth_uid = nil - elsif current_user.email == verified_email + elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email)) current_user.activate end @@ -293,11 +297,10 @@ class UsersController < ApplicationController flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo) - referer = welcome_path(welcome_options) + referer = welcome_path(welcome_options(referer)) if current_user.status == "active" - session[:referer] = referer - successful_login(current_user) + successful_login(current_user, referer) else session[:pending_user] = current_user.id UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later @@ -309,8 +312,8 @@ class UsersController < ApplicationController end end - def welcome_options - uri = URI(session[:referer]) if session[:referer].present? + def welcome_options(referer = nil) + uri = URI(referer) if referer.present? return { "oauth_return_url" => uri&.to_s } if uri&.path == oauth_authorization_path