From 95328dd30a55cb66da05352131e7a981b44e1348 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 29 Sep 2021 13:00:00 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@14-3-stable-ee --- app/controllers/profiles/passwords_controller.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/controllers/profiles') diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb index c8c2dd1c7d6..85e901eb3eb 100644 --- a/app/controllers/profiles/passwords_controller.rb +++ b/app/controllers/profiles/passwords_controller.rb @@ -47,8 +47,6 @@ class Profiles::PasswordsController < Profiles::ApplicationController password_attributes[:password_automatically_set] = false unless @user.password_automatically_set || @user.valid_password?(user_params[:current_password]) - handle_invalid_current_password_attempt! - redirect_to edit_profile_password_path, alert: _('You must provide a valid current password') return end @@ -87,12 +85,6 @@ class Profiles::PasswordsController < Profiles::ApplicationController render_404 unless @user.allow_password_authentication? end - def handle_invalid_current_password_attempt! - Gitlab::AppLogger.info(message: 'Invalid current password when attempting to update user password', username: @user.username, ip: request.remote_ip) - - @user.increment_failed_attempts! - end - def user_params params.require(:user).permit(:current_password, :password, :password_confirmation) end -- cgit v1.2.3