Send notifications to note subscribers instead of commenters

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1f3eb2f7a87e1d170dc60306da91bedc27f5ea49..63a83ad1da8ad9803c3980ade89dbe0755398bea 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,8 @@
 class UsersController < ApplicationController
 class UsersController < ApplicationController

+  include EmailMethods

   include SessionMethods
   include SessionMethods

+  include UserMethods
+  include PaginationMethods

 
   layout "site"
 
 
   layout "site"
 


@@ -11,173 +14,73 @@ class UsersController < ApplicationController
 
   authorize_resource
 
 
   authorize_resource
 

-  before_action :require_self, :only => [:account]
-  before_action :check_database_writable, :only => [:new, :account, :go_public]
+  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 :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"
+  allow_thirdparty_images :only => :show
+  allow_social_login :only => :new

 
 

-    if params[:decline] || !(params[:read_tou] && params[:read_ct])
-      if current_user
-        current_user.terms_seen = true
+  ##
+  # display a list of users matching specified criteria
+  def index
+    if request.post?
+      ids = params[:user].keys.collect(&:to_i)

 
 

-        flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
+      User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm]
+      User.where(:id => ids).update_all(:status => "deleted") if params[:hide]

 
 

-        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
+      redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
+    else
+      @params = params.permit(:status, :ip, :before, :after)

 
 

-        flash[:notice] = t "users.new.terms accepted" if current_user.save
-      end
+      users = User.all
+      users = users.where(:status => @params[:status]) if @params[:status]
+      users = users.where(:creation_address => @params[:ip]) if @params[:ip]

 
 

-      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
+      @users_count = users.limit(501).count
+      @users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500

 
 

-        if current_user.auth_uid.blank?
-          current_user.auth_provider = nil
-          current_user.auth_uid = nil
-        end
+      @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)

 
 

-        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 :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
-          end
-        else
-          render :action => "new", :referer => params[:referer]
-        end
-      end
+      render :partial => "page" if turbo_frame_request_id == "pagination"

     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]
-    )
+  def show
+    @user = User.find_by(:display_name => params[:display_name])

 
 

-    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
+    if @user &&
+       (@user.visible? || current_user&.administrator?)
+      @title = @user.display_name
+    else
+      render_unknown_user params[:display_name]

     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 new
   end
 
   def new

-    @title = t "users.new.title"
-    @referer = if params[:referer]
-                 safe_referer(params[:referer])
-               else
-                 session[:referer]
-               end
+    @title = t ".title"
+    @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
 
     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)
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)

+      @email_hmac = params[:email_hmac]
+

       self.current_user = User.new(:email => params[:email],
       self.current_user = User.new(:email => params[:email],

-                                   :email_confirmation => params[:email],

                                    :display_name => params[:nickname],
                                    :auth_provider => params[:auth_provider],
                                    :auth_uid => params[:auth_uid])
 
                                    :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
 
     else
       check_signup_allowed
 


@@ -189,13 +92,7 @@ class UsersController < ApplicationController
     self.current_user = User.new(user_params)
 
     if check_signup_allowed(current_user.email)
     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]}"
-
-      current_user.status = "pending"
-
-      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)
         # 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)


@@ -205,71 +102,94 @@ class UsersController < ApplicationController
       if current_user.invalid?
         # Something is wrong with a new user, so rerender the form
         render :action => "new"
       if current_user.invalid?
         # Something is wrong with a new user, so rerender the form
         render :action => "new"

-      elsif current_user.auth_provider.present?
-        # Verify external authenticator before moving on
-        session[:new_user] = current_user
-        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect

       else
         # Save the user record
       else
         # Save the user record

-        session[:new_user] = current_user
-        redirect_to :action => :terms
+        save_new_user params[:email_hmac], params[:referer]

       end
     end
   end
 
       end
     end
   end
 

-  def show
-    @user = User.find_by(:display_name => params[:display_name])
+  ##
+  # 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

 
 

-    if @user &&
-       (@user.visible? || current_user&.administrator?)
-      @title = @user.display_name
+  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
     else

-      render_unknown_user params[:display_name]
+      @title = t ".title"
+
+      if current_user&.terms_agreed?
+        # Already agreed to terms, so just show settings
+        redirect_to edit_account_path
+      elsif current_user.nil?
+        redirect_to login_path(:referer => request.fullpath)
+      end

     end
   end
 
     end
   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
+  def save
+    @title = t "users.new.title"

 
 

-  ##
-  # delete a user, marking them as deleted and removing personal data
-  def destroy
-    @user.delete
-    redirect_to user_path(:display_name => params[:display_name])
-  end
+    if params[:decline] || !(params[:read_tou] && params[:read_ct])
+      if current_user
+        current_user.terms_seen = true

 
 

-  ##
-  # display a list of users matching specified criteria
-  def index
-    if request.post?
-      ids = params[:user].keys.collect(&:to_i)
+        flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save

 
 

-      User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm]
-      User.where(:id => ids).update_all(:status => "deleted") if params[:hide]
+        referer = safe_referer(params[:referer]) if params[:referer]

 
 

-      redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
-    else
-      @params = params.permit(:status, :ip)
+        redirect_to referer || edit_account_path
+      elsif params[:decline]
+        redirect_to t("users.terms.declined"), :allow_other_host => true
+      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

 
 

-      conditions = {}
-      conditions[:status] = @params[:status] if @params[:status]
-      conditions[:creation_ip] = @params[:ip] if @params[:ip]
+        flash[:notice] = t "users.new.terms accepted" if current_user.save
+      end

 
 

-      @user_pages, @users = paginate(:users,
-                                     :conditions => conditions,
-                                     :order => :id,
-                                     :per_page => 50)
+      referer = safe_referer(params[:referer]) if params[:referer]
+
+      redirect_to referer || edit_account_path

     end
   end
 
     end
   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.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
+

   ##
   # omniauth success callback
   def auth_success
   ##
   # omniauth success callback
   def auth_success

+    referer = request.env["omniauth.params"]["referer"]

     auth_info = request.env["omniauth.auth"]
 
     provider = auth_info[:provider]
     auth_info = request.env["omniauth.auth"]
 
     provider = auth_info[:provider]


@@ -277,15 +197,15 @@ class UsersController < ApplicationController
     name = auth_info[:info][:name]
     email = auth_info[:info][:email]
 
     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/(.*)})
                        uid.match(%r{https://me.yahoo.com/(.*)})

-    when "google", "facebook"
-      email_verified = true
-    else
-      email_verified = false
-    end
+                     when "google", "facebook", "microsoft", "github", "wikipedia"
+                       true
+                     else
+                       false
+                     end

 
     if settings = session.delete(:new_user_settings)
       current_user.auth_provider = provider
 
     if settings = session.delete(:new_user_settings)
       current_user.auth_provider = provider


@@ -297,14 +217,7 @@ class UsersController < ApplicationController
 
       session[:user_errors] = current_user.errors.as_json
 
 
       session[:user_errors] = current_user.errors.as_json
 

-      redirect_to :action => "account", :display_name => current_user.display_name
-    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
-
-      redirect_to :action => "terms"
+      redirect_to edit_account_path

     else
       user = User.find_by(:auth_provider => provider, :auth_uid => uid)
 
     else
       user = User.find_by(:auth_provider => provider, :auth_uid => uid)
 


@@ -317,17 +230,18 @@ class UsersController < ApplicationController
       if user
         case user.status
         when "pending"
       if user
         case user.status
         when "pending"

-          unconfirmed_login(user)
+          unconfirmed_login(user, referer)

         when "active", "confirmed"
         when "active", "confirmed"

-          successful_login(user, request.env["omniauth.params"]["referer"])
+          successful_login(user, referer)

         when "suspended"
         when "suspended"

-          failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
+          failed_login({ :partial => "sessions/suspended_flash" }, user.display_name, referer)

         else
         else

-          failed_login t("sessions.new.auth failure")
+          failed_login(t("sessions.new.auth failure"), user.display_name, referer)

         end
       else
         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
       end
     end
   end


@@ -335,91 +249,73 @@ class UsersController < ApplicationController
   ##
   # omniauth failure callback
   def auth_failure
   ##
   # 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
 
   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
+  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

 
 

-    if params[:user][:description] != user.description
-      user.description = params[:user][:description]
-      user.description_format = "markdown"
-    end
+  private

 
 

-    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
+  def save_new_user(email_hmac, referer = nil)
+    current_user.data_public = true
+    current_user.description = "" if current_user.description.nil?
+    current_user.creation_address = 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
+    elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email))
+      current_user.activate

     end
 
     end
 

-    user.home_lat = params[:user][:home_lat]
-    user.home_lon = params[:user][:home_lon]
+    if current_user.save
+      SIGNUP_IP_LIMITER&.update(request.remote_ip)
+      SIGNUP_EMAIL_LIMITER&.update(canonical_email(current_user.email))

 
 

-    if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
-      user.auth_provider = nil
-      user.auth_uid = nil
-    end
+      flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)

 
 

-    if user.save
-      session[:fingerprint] = user.fingerprint
+      referer = welcome_path(welcome_options(referer))

 
 

-      if user.new_email.blank? || user.new_email == user.email
-        flash[:notice] = t "users.account.flash update success"
+      if current_user.status == "active"
+        successful_login(current_user, referer)

       else
       else

-        user.email = user.new_email
+        session[:pending_user] = current_user.id
+        UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later
+        redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
+      end
+    else
+      render :action => "new", :referer => params[:referer]
+    end
+  end

 
 

-        if user.valid?
-          flash[:notice] = t "users.account.flash update success confirm needed"
+  def welcome_options(referer = nil)
+    uri = URI(referer) if referer.present?

 
 

-          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
+    return { "oauth_return_url" => uri&.to_s } if uri&.path == oauth_authorization_path

 
 

-        user.restore_email!
+    begin
+      %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m|
+        editor = Rack::Utils.parse_query(uri.query).slice("editor")
+        return { "zoom" => m[1], "lat" => m[2], "lon" => m[3] }.merge(editor)

       end
       end

+    rescue StandardError
+      # Use default

     end
   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
-

   ##
   # ensure that there is a "user" instance variable
   def lookup_user_by_name
   ##
   # ensure that there is a "user" instance variable
   def lookup_user_by_name


@@ -431,9 +327,10 @@ class UsersController < ApplicationController
   ##
   # return permitted user parameters
   def user_params
   ##
   # return permitted user parameters
   def user_params

-    params.require(:user).permit(:email, :email_confirmation, :display_name,
+    params.require(:user).permit(:email, :display_name,

                                  :auth_provider, :auth_uid,
                                  :auth_provider, :auth_uid,

-                                 :pass_crypt, :pass_crypt_confirmation)
+                                 :pass_crypt, :pass_crypt_confirmation,
+                                 :consider_pd)

   end
 
   ##
   end
 
   ##


@@ -451,7 +348,15 @@ class UsersController < ApplicationController
                    domain_mx_servers(domain)
                  end
 
                    domain_mx_servers(domain)
                  end
 

-    if blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
+    return true if Acl.allow_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
+
+    blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
+
+    blocked ||= SIGNUP_IP_LIMITER && !SIGNUP_IP_LIMITER.allow?(request.remote_ip)
+
+    blocked ||= email && SIGNUP_EMAIL_LIMITER && !SIGNUP_EMAIL_LIMITER.allow?(canonical_email(email))
+
+    if blocked

       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
       render :action => "blocked"
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
       render :action => "blocked"


@@ -459,12 +364,4 @@ class UsersController < ApplicationController
 
     !blocked
   end
 
     !blocked
   end

-
-  ##
-  # get list of MX servers for a domains
-  def domain_mx_servers(domain)
-    Resolv::DNS.open do |dns|
-      dns.getresources(domain, Resolv::DNS::Resource::IN::MX).collect(&:exchange).collect(&:to_s)
-    end
-  end

 end
 end