Project

General

Profile

Patch #44368 » 0001-Revert-Removes-ignored-and-unnecessary-scope-in-twof.patch

Jens Krämer, 2026-08-24 11:21

View differences:

lib/redmine/twofa/base.rb
code = code.to_s.remove(/[[:space:]]/).downcase
user_from_code = Token.find_active_user('twofa_backup_code', code)
# invalidate backup code after usage
Token.find_token('twofa_backup_code', code).try(:delete)
Token.where(user_id: @user.id).find_token('twofa_backup_code', code).try(:delete)
# make sure the user using the backup code is the same it's been issued to
return false unless @user.present? && @user == user_from_code
test/unit/lib/redmine/twofa_test.rb
# frozen_string_literal: true
require File.expand_path('../../../../test_helper', __FILE__)
class Redmine::TwofaTest < ActiveSupport::TestCase
fixtures :users, :email_addresses
def setup
@user = User.find_by_login 'jsmith'
@other_user = User.find_by_login 'dlopper'
end
test "verify_backup_code! accepts and invalidates the user's own backup code" do
token = backup_code_for @user, 'abcdef123456'
assert Redmine::Twofa::Totp.new(@user).verify_backup_code!('abcdef123456')
assert_nil Token.find_by_id(token.id)
end
test "verify_backup_code! rejects but keeps another user's backup code" do
token = backup_code_for @other_user, 'abcdef654321'
assert_not Redmine::Twofa::Totp.new(@user).verify_backup_code!('abcdef654321')
assert Token.find_by_id(token.id), "backup code of another user must not be deleted"
end
private
# creates a backup code token the same way Redmine::Twofa::Base#init_backup_codes! does
def backup_code_for(user, value)
token = Token.create!(user_id: user.id, action: 'twofa_backup_code')
token.update_columns value: value
token
end
end
    (1-1/1)