Merge remote-tracking branch 'upstream/pull/3124'

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1cc27d9d9001e05214574abf1105e51db5a0847a..6aa98f7ee508b1a083132b567b5305d07aedeaa3 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -106,7 +106,7 @@ class UsersController < ApplicationController
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token

-            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later
+            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
             redirect_to :action => "confirm", :display_name => current_user.display_name
           end
         else


@@ -119,14 +119,19 @@ class UsersController < ApplicationController
   def account
     @tokens = current_user.oauth_tokens.authorized
 
   def account
     @tokens = current_user.oauth_tokens.authorized
 

-    if params[:user] && params[:user][:display_name] && params[:user][:description]
+    append_content_security_policy_directives(
+      :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
+    )
+
+    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)
       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
       else
         session[:new_user_settings] = params

-        redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
+        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|
       end
     elsif errors = session.delete(:user_errors)
       errors.each do |attribute, error|


@@ -146,7 +151,7 @@ class UsersController < ApplicationController
   def lost_password
     @title = t "users.lost_password.title"
 
   def lost_password
     @title = t "users.lost_password.title"
 

-    if params[:email]
+    if request.post?

       user = User.visible.find_by(:email => params[:email])
 
       if user.nil?
       user = User.visible.find_by(:email => params[:email])
 
       if user.nil?


@@ -157,9 +162,9 @@ class UsersController < ApplicationController
 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create

-        Notifier.lost_password(user, token).deliver_later
+        UserMailer.lost_password(user, token).deliver_later

         flash[:notice] = t "users.lost_password.notice email on way"
         flash[:notice] = t "users.lost_password.notice email on way"

-        redirect_to :action => "login"
+        redirect_to login_path

       else
         flash.now[:error] = t "users.lost_password.notice email cannot find"
       end
       else
         flash.now[:error] = t "users.lost_password.notice email cannot find"
       end


@@ -255,7 +260,7 @@ class UsersController < ApplicationController
       elsif current_user.auth_provider.present?
         # Verify external authenticator before moving on
         session[:new_user] = current_user
       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)
+        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect

       else
         # Save the user record
         session[:new_user] = current_user
       else
         # Save the user record
         session[:new_user] = current_user


@@ -265,9 +270,13 @@ class UsersController < ApplicationController
   end
 
   def login
   end
 
   def login

+    append_content_security_policy_directives(
+      :form_action => %w[*]
+    )
+

     session[:referer] = safe_referer(params[:referer]) if params[:referer]
 
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
 

-    if params[:username].present? && params[:password].present?
+    if request.post?

       session[:remember_me] ||= params[:remember_me]
       password_authentication(params[:username], params[:password])
     end
       session[:remember_me] ||= params[:remember_me]
       password_authentication(params[:username], params[:password])
     end


@@ -297,7 +306,7 @@ class UsersController < ApplicationController
       token = UserToken.find_by(:token => params[:confirm_string])
       if token&.user&.active?
         flash[:error] = t("users.confirm.already active")
       token = UserToken.find_by(:token => params[:confirm_string])
       if token&.user&.active?
         flash[:error] = t("users.confirm.already active")

-        redirect_to :action => "login"
+        redirect_to login_path

       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"
       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"


@@ -319,7 +328,7 @@ class UsersController < ApplicationController
 
         if token.nil? || token.user != user
           flash[:notice] = t("users.confirm.success")
 
         if token.nil? || token.user != user
           flash[:notice] = t("users.confirm.success")

-          redirect_to :action => :login, :referer => referer
+          redirect_to login_path(:referer => referer)

         else
           token.destroy
 
         else
           token.destroy
 


@@ -343,11 +352,11 @@ class UsersController < ApplicationController
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else

-      Notifier.signup_confirm(user, user.tokens.create).deliver_later
-      flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => Settings.support_email).html_safe
+      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
 
     end
 

-    redirect_to :action => "login"
+    redirect_to login_path

   end
 
   def confirm_email
   end
 
   def confirm_email


@@ -457,6 +466,8 @@ class UsersController < ApplicationController
 
       update_user(current_user, settings)
 
 
       update_user(current_user, settings)
 

+      flash.discard
+

       session[:user_errors] = current_user.errors.as_json
 
       redirect_to :action => "account", :display_name => current_user.display_name
       session[:user_errors] = current_user.errors.as_json
 
       redirect_to :action => "account", :display_name => current_user.display_name


@@ -648,18 +659,18 @@ class UsersController < ApplicationController
     if user.save
       session[:fingerprint] = user.fingerprint
 
     if user.save
       session[:fingerprint] = user.fingerprint
 

-      set_locale(true)
+      set_locale(:reset => true)

 
       if user.new_email.blank? || user.new_email == user.email
 
       if user.new_email.blank? || user.new_email == user.email

-        flash.now[:notice] = t "users.account.flash update success"
+        flash[:notice] = t "users.account.flash update success"

       else
         user.email = user.new_email
 
         if user.valid?
       else
         user.email = user.new_email
 
         if user.valid?

-          flash.now[:notice] = t "users.account.flash update success confirm needed"
+          flash[:notice] = t "users.account.flash update success confirm needed"

 
           begin
 
           begin

-            Notifier.email_confirm(user, user.tokens.create).deliver_later
+            UserMailer.email_confirm(user, user.tokens.create).deliver_later

           rescue StandardError
             # Ignore errors sending email
           end
           rescue StandardError
             # Ignore errors sending email
           end