]> cat aescling's git repositories - mastodon.git/commitdiff
Fix tootctl accounts rotate not updating public keys (#9556)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 18 Dec 2018 00:22:29 +0000 (01:22 +0100)
committerGitHub <noreply@github.com>
Tue, 18 Dec 2018 00:22:29 +0000 (01:22 +0100)
This allowed you to brick your system when running that command, because the accounts would continue to advertise the old public key, but sign things with the new one

lib/mastodon/accounts_cli.rb

index 9f7870bcd33126c47ee9ecbefa635135b9c6c2fd..b219682232cd75f0a5b89989a023a6d49be7ed57 100644 (file)
@@ -309,8 +309,8 @@ module Mastodon
       end
 
       old_key = account.private_key
-      new_key = OpenSSL::PKey::RSA.new(2048).to_pem
-      account.update(private_key: new_key)
+      new_key = OpenSSL::PKey::RSA.new(2048)
+      account.update(private_key: new_key.to_pem, public_key: new_key.public_key.to_pem)
       ActivityPub::UpdateDistributionWorker.perform_in(delay, account.id, sign_with: old_key)
     end
   end