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

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 676f8d8f997f97e7816b02fd869fc1816d613bdb..ed9c124b14b2b1983dee504132f7e69e612152d8 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -43,7 +43,7 @@ class UsersController < ApplicationController
         flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save
 
         if params[:referer]
         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 params[:referer]
+          redirect_to safe_referer(params[:referer])

         else
           redirect_to :action => :account, :display_name => current_user.display_name
         end
         else
           redirect_to :action => :account, :display_name => current_user.display_name
         end


@@ -63,7 +63,7 @@ class UsersController < ApplicationController
       end
 
       if params[:referer]
       end
 
       if params[:referer]

-        redirect_to params[:referer]
+        redirect_to safe_referer(params[:referer])

       else
         redirect_to :action => :account, :display_name => current_user.display_name
       end
       else
         redirect_to :action => :account, :display_name => current_user.display_name
       end


@@ -198,7 +198,11 @@ class UsersController < ApplicationController
 
   def new
     @title = t "users.new.title"
 
   def new
     @title = t "users.new.title"

-    @referer = params[:referer] || session[:referer]
+    @referer = if params[:referer]
+                 safe_referer(params[:referer])
+               else
+                 session[:referer]
+               end

 
     append_content_security_policy_directives(
       :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
 
     append_content_security_policy_directives(
       :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]


@@ -231,7 +235,9 @@ 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] = params[:referer]
+      session[:referer] = safe_referer(params[:referer]) if params[:referer]
+
+      Rails.logger.info "create: #{session[:referer]}"

 
       current_user.status = "pending"
 
 
       current_user.status = "pending"
 


@@ -258,7 +264,7 @@ class UsersController < ApplicationController
   end
 
   def login
   end
 
   def login

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

 
     if params[:username].present? && params[:password].present?
       session[:remember_me] ||= params[:remember_me]
 
     if params[:username].present? && params[:password].present?
       session[:remember_me] ||= params[:remember_me]


@@ -278,7 +284,7 @@ class UsersController < ApplicationController
       session.delete(:user)
       session_expires_automatically
       if params[:referer]
       session.delete(:user)
       session_expires_automatically
       if params[:referer]

-        redirect_to params[:referer]
+        redirect_to safe_referer(params[:referer])

       else
         redirect_to :controller => "site", :action => "index"
       end
       else
         redirect_to :controller => "site", :action => "index"
       end


@@ -300,7 +306,7 @@ class UsersController < ApplicationController
         user.email_valid = true
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!
         user.email_valid = true
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!

-        referer = token.referer
+        referer = safe_referer(token.referer) if token.referer

         token.destroy
 
         if session[:token]
         token.destroy
 
         if session[:token]


@@ -353,7 +359,7 @@ class UsersController < ApplicationController
         gravatar_enabled = gravatar_enable(current_user)
         if current_user.save
           flash[:notice] = if gravatar_enabled
         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)
+                             "#{t('users.confirm_email.success')} #{gravatar_status_message(current_user)}"

                            else
                              t("users.confirm_email.success")
                            end
                            else
                              t("users.confirm_email.success")
                            end


@@ -488,7 +494,7 @@ class UsersController < ApplicationController
   ##
   # omniauth failure callback
   def auth_failure
   ##
   # omniauth failure callback
   def auth_failure

-    flash[:error] = t("users.auth_failure." + params[:message])
+    flash[:error] = t("users.auth_failure.#{params[:message]}")

     redirect_to params[:origin] || login_url
   end
 
     redirect_to params[:origin] || login_url
   end
 


@@ -518,7 +524,7 @@ class UsersController < ApplicationController
     if referer.nil?
       params[:origin] = request.path
     else
     if referer.nil?
       params[:origin] = request.path
     else

-      params[:origin] = request.path + "?referer=" + CGI.escape(referer)
+      params[:origin] = "#{request.path}?referer=#{CGI.escape(referer)}"

       params[:referer] = referer
     end
 
       params[:referer] = referer
     end