From 480c17be58ded999ecf4f2918777e1368e28932e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 26 Feb 2016 15:32:11 +0000 Subject: [PATCH] Preserve username and "remember me" when login fails Fixes #1159 --- app/controllers/user_controller.rb | 9 +- app/views/user/login.html.erb | 2 +- test/integration/user_login_test.rb | 558 +++++----------------------- 3 files changed, 96 insertions(+), 473 deletions(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 6dd3afb05..394f8676f 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -559,9 +559,9 @@ class UserController < ApplicationController elsif user = User.authenticate(:username => username, :password => password, :pending => true) unconfirmed_login(user) elsif User.authenticate(:username => username, :password => password, :suspended => true) - failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org") + failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org"), username else - failed_login t("user.login.auth failure") + failed_login t("user.login.auth failure"), username end end @@ -627,10 +627,11 @@ class UserController < ApplicationController ## # process a failed login - def failed_login(message) + def failed_login(message, username = nil) flash[:error] = message - redirect_to :action => "login", :referer => session[:referer] + redirect_to :action => "login", :referer => session[:referer], + :username => username, :remember_me => session[:remember_me] session.delete(:remember_me) session.delete(:referer) diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 3c9557ae0..e6efdc5ce 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -33,7 +33,7 @@
- <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> + <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index 4dc4ac8f3..155905ca9 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -18,22 +18,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_normal user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email, "test" - post "/login", :username => user.email, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test" end @@ -41,22 +27,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_normal_upcase user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.upcase, "test" - post "/login", :username => user.email.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "TEST" end @@ -64,22 +36,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_normal_titlecase user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.titlecase, "test" - post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" assert_select "span.username", false end @@ -87,22 +45,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_public user = users(:public_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email, "test" - post "/login", :username => user.email, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test2" end @@ -110,22 +54,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_public_upcase user = users(:public_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.upcase, "test" - post "/login", :username => user.email.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test2" end @@ -133,22 +63,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_public_titlecase user = users(:public_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.email.titlecase, "test" - post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test2" end @@ -156,223 +72,92 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_email_password_inactive user = users(:inactive_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email, "test2" - post "/login", :username => user.email, :password => "test2", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "confirm" + assert_select "span.username", false end def test_login_email_password_inactive_upcase user = users(:inactive_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.email.upcase, "test2" - post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.email.upcase, :password => "test2", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "confirm" + assert_select "span.username", false end def test_login_email_password_inactive_titlecase user = users(:inactive_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.titlecase, "test2" - post "/login", :username => user.email.titlecase, :password => "test2", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "confirm" + assert_select "span.username", false end def test_login_email_password_suspended user = users(:suspended_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email, "test" - post "/login", :username => user.email, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" + assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ end def test_login_email_password_suspended_upcase user = users(:suspended_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.upcase, "test" - post "/login", :username => user.email.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" + assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ end def test_login_email_password_suspended_titlecase user = users(:suspended_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.email.titlecase, "test" - post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" + assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ end def test_login_email_password_blocked user = users(:blocked_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email, "test" - post "/login", :username => user.email, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "user_blocks/show" + assert_select "span.username", "blocked" end def test_login_email_password_blocked_upcase user = users(:blocked_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.upcase, "test" - post "/login", :username => user.email.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "user_blocks/show" + assert_select "span.username", "blocked" end def test_login_email_password_blocked_titlecase user = users(:blocked_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.email.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.email.titlecase, "test" - post "/login", :username => user.email.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "user_blocks/show" + assert_select "span.username", "blocked" end def test_login_username_password_normal user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name, "test" - post "/login", :username => user.display_name, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test" end @@ -380,22 +165,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_normal_upcase user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.display_name.upcase, "test" - post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "TEST" end @@ -403,22 +174,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_normal_titlecase user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.display_name.titlecase, "test" - post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" assert_select "span.username", false end @@ -426,22 +183,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_public user = users(:public_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name, "test" - post "/login", :username => user.display_name, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test2" end @@ -449,22 +192,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_public_upcase user = users(:public_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name.upcase, "test" - post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test2" end @@ -472,22 +201,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_public_titlecase user = users(:public_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name.titlecase, "test" - post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test2" end @@ -495,217 +210,92 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_inactive user = users(:inactive_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name, "test2" - post "/login", :username => user.display_name, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name, :password => "test2", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "confirm" + assert_select "span.username", false end def test_login_username_password_inactive_upcase user = users(:inactive_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.display_name.upcase, "test2" - post "/login", :username => user.display_name.upcase, :password => "test2", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "confirm" + assert_select "span.username", false end def test_login_username_password_inactive_titlecase user = users(:inactive_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name.titlecase, "test2" - post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name.titlecase, :password => "test2", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "confirm" + assert_select "span.username", false end def test_login_username_password_suspended user = users(:suspended_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.display_name, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.display_name, "test" - post "/login", :username => user.display_name, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" + assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ end def test_login_username_password_suspended_upcase user = users(:suspended_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success - - post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" + try_password_login user.display_name.upcase, "test" - post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" + assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ end def test_login_username_password_suspended_titlecase user = users(:suspended_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name.titlecase, "test" - post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "login" + assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ end def test_login_username_password_blocked user = users(:blocked_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name.upcase, "test" - post "/login", :username => user.display_name, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "user_blocks/show" + assert_select "span.username", "blocked" end def test_login_username_password_blocked_upcase user = users(:blocked_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name, "test" - post "/login", :username => user.display_name.upcase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name.upcase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "user_blocks/show" + assert_select "span.username", "blocked" end def test_login_username_password_blocked_titlecase user = users(:blocked_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name.titlecase, "test" - post "/login", :username => user.display_name.titlecase, :password => "wrong", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "login" - - post "/login", :username => user.display_name.titlecase, :password => "test", :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "user_blocks/show" + assert_select "span.username", "blocked" end def test_login_email_password_remember_me user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.email, "test", "yes" - post "/login", :username => user.email, :password => "test", :remember_me => true, :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test" assert session.key?(:_remember_for) @@ -714,16 +304,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest def test_login_username_password_remember_me user = users(:normal_user) - get "/login" - assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :cookie_test => true - follow_redirect! - assert_response :success + try_password_login user.display_name, "test", "yes" - post "/login", :username => user.display_name, :password => "test", :remember_me => true, :referer => "/history" - assert_response :redirect - follow_redirect! - assert_response :success assert_template "changeset/history" assert_select "span.username", "test" assert session.key?(:_remember_for) @@ -1146,4 +728,44 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "user/new" assert_select "span.username", false end + + private + + def try_password_login(username, password, remember_me = nil) + get "/login" + assert_response :redirect + assert_redirected_to :controller => :user, :action => :login, :cookie_test => true + follow_redirect! + assert_response :success + assert_template "login" + assert_select "input#username", 1 do + assert_select "[value]", false + end + assert_select "input#password", 1 do + assert_select "[value=?]", "" + end + assert_select "input#remember_me", 1 do + assert_select "[checked]", false + end + + post "/login", :username => username, :password => "wrong", :remember_me => remember_me, :referer => "/history" + assert_response :redirect + follow_redirect! + assert_response :success + assert_template "login" + assert_select "input#username", 1 do + assert_select "[value=?]", username + end + assert_select "input#password", 1 do + assert_select "[value=?]", "" + end + assert_select "input#remember_me", 1 do + assert_select "[checked]", remember_me == "yes" + end + + post "/login", :username => username, :password => password, :remember_me => remember_me, :referer => "/history" + assert_response :redirect + follow_redirect! + assert_response :success + end end -- 2.43.2