Validate any origin passed the auth failure callback

Fixes #3375

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b90fbea11c761f4b611368cb75b6ae5a074d8741..23263ebba2267a8815988d43ca06fae1afcf28e4 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -332,7 +332,10 @@ class UsersController < ApplicationController
   # omniauth failure callback
   def auth_failure
     flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error"))
   # omniauth failure callback
   def auth_failure
     flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error"))

-    redirect_to params[:origin] || login_url
+
+    origin = safe_referer(params[:origin]) if params[:origin]
+
+    redirect_to origin || login_url

   end
 
   private
   end
 
   private

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 23c67794a4d6465bbffff988203f1bdea78d056e..44b5471ac35ce7128c3dc5bb7e8056690a230c2e 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -896,4 +896,18 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status
   end
     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status
   end

+
+  def test_auth_failure_callback
+    get auth_failure_path
+    assert_response :redirect
+    assert_redirected_to login_path
+
+    get auth_failure_path, :params => { :origin => "/" }
+    assert_response :redirect
+    assert_redirected_to root_path
+
+    get auth_failure_path, :params => { :origin => "http://www.google.com" }
+    assert_response :redirect
+    assert_redirected_to login_path
+  end

 end
 end