Fix instance actor being incorrectly created when running migrations (#18109)

* Add migration test about instance actor key

* Fix old migration

* Work around incorrect database state

diff --git a/app/models/account.rb b/app/models/account.rb
index 1966c5a48bfd431406a9088eea5af5005bb27069..068ee7ae9c6fe431b2a31c9fb52b47d69abd8daa 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -561,6 +561,12 @@ class Account < ApplicationRecord
   before_validation :prepare_username, on: :create
   before_destroy :clean_feed_manager
 
+  def ensure_keys!
+    return unless local? && private_key.blank? && public_key.blank?
+    generate_keys
+    save!
+  end
+
   private
 
   def prepare_contents

diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb
index 7e165d3ab92cfe4ef1f4be6fd71c2f1a1a956071..c4f255b73b08238c10c257aa47b3db3962232eb2 100644 (file)
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -17,7 +17,7 @@ module AccountFinderConcern
     end
 
     def representative
-      Account.find(-99)
+      Account.find(-99).tap(&:ensure_keys!)
     rescue ActiveRecord::RecordNotFound
       Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
     end

diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index 8c0301d69d8bf3ec1fd7c15634bb37f51a0a14b6..0ae53199acbd52e779ff18e9a5d0484baba350ff 100644 (file)
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -2,6 +2,14 @@ class AddInstanceActor < ActiveRecord::Migration[5.2]
   class Account < ApplicationRecord
     # Dummy class, to make migration possible across version changes
     validates :username, uniqueness: { scope: :domain, case_sensitive: false }
+
+    before_create :generate_keys
+
+    def generate_keys
+      keypair = OpenSSL::PKey::RSA.new(2048)
+      self.private_key = keypair.to_pem
+      self.public_key  = keypair.public_key.to_pem
+    end
   end
 
   def up

diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 8082f32fb4ca6b9341f4a9ac98b6824e661cfa2f..0f3b44a7443f3dd8d1caad10b49bdc88394e02cb 100644 (file)
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -33,6 +33,11 @@ namespace :tests do
         puts 'AccountConversation records not created as expected'
         exit(1)
       end
+
+      if Account.find(-99).private_key.blank?
+        puts 'Instance actor does not have a private key'
+        exit(1)
+      end
     end
 
     desc 'Populate the database with test data for 2.4.0'