Rake tasks db:encrypt and db:decrypt now supports TOTP secret keys (#1237, #33929).

git-svn-id: http://svn.redmine.org/redmine/trunk@20005 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/tasks/ciphering.rake b/lib/tasks/ciphering.rake
index 07e96b5d6..fb97cde30 100644
--- a/lib/tasks/ciphering.rake
+++ b/lib/tasks/ciphering.rake
@@ -20,7 +20,8 @@ namespace :db do
   desc 'Encrypts SCM and LDAP passwords in the database.'
   task :encrypt => :environment do
     unless (Repository.encrypt_all(:password) &&
-      AuthSource.encrypt_all(:account_password))
+      AuthSource.encrypt_all(:account_password) &&
+      User.encrypt_all(:twofa_totp_key))
       raise "Some objects could not be saved after encryption, update was rolled back."
     end
   end
@@ -28,7 +29,8 @@ namespace :db do
   desc 'Decrypts SCM and LDAP passwords in the database.'
   task :decrypt => :environment do
     unless (Repository.decrypt_all(:password) &&
-      AuthSource.decrypt_all(:account_password))
+      AuthSource.decrypt_all(:account_password) &&
+      User.decrypt_all(:twofa_totp_key))
       raise "Some objects could not be saved after decryption, update was rolled back."
     end
   end