From 2e04a93a2195ae179a933ce120d8ab00a9e0188a Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Tue, 23 Oct 2018 10:51:00 +0000 Subject: Merge branch 'security-if-51113-hash_tokens-11-2' into 'security-11-2' [11.2] Persist only SHA digest of PersonalAccessToken#token See merge request gitlab/gitlabhq!2553 --- lib/tasks/tokens.rake | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib/tasks') diff --git a/lib/tasks/tokens.rake b/lib/tasks/tokens.rake index 81829668de8..eec024f9bbb 100644 --- a/lib/tasks/tokens.rake +++ b/lib/tasks/tokens.rake @@ -1,4 +1,7 @@ require_relative '../../app/models/concerns/token_authenticatable.rb' +require_relative '../../app/models/concerns/token_authenticatable_strategies/base.rb' +require_relative '../../app/models/concerns/token_authenticatable_strategies/insecure.rb' +require_relative '../../app/models/concerns/token_authenticatable_strategies/digest.rb' namespace :tokens do desc "Reset all GitLab incoming email tokens" @@ -26,13 +29,6 @@ class TmpUser < ActiveRecord::Base self.table_name = 'users' - def reset_incoming_email_token! - write_new_token(:incoming_email_token) - save!(validate: false) - end - - def reset_feed_token! - write_new_token(:feed_token) - save!(validate: false) - end + add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) } + add_authentication_token_field :feed_token end -- cgit v1.2.3