Browse Source

Add tombstones for remote statuses (#9830)

* Add Tombstone model to remember object deletion

* Do not recreate a status if it has been deleted

* Record Tombstone for remote deleted items

Also, only record deleted items from same-host actors

* Clear an user's tombstones when their key change
tags/v2.7.0rc2
ThibG 7 months ago
parent
commit
75b1488cf4

+ 1
- 0
app/lib/activitypub/activity/create.rb View File

@@ -6,6 +6,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity

def perform
return if unsupported_object_type? || invalid_origin?(@object['id'])
return if Tombstone.exists?(uri: @object['id'])

RedisLock.acquire(lock_options) do |lock|
if lock.acquired?

+ 12
- 2
app/lib/activitypub/activity/delete.rb View File

@@ -21,8 +21,9 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
def delete_note
return if object_uri.nil?

RedisLock.acquire(lock_options) do |_lock|
delete_later!(object_uri)
unless invalid_origin?(object_uri)
RedisLock.acquire(lock_options) { |_lock| delete_later!(object_uri) }
Tombstone.find_or_create_by(uri: object_uri, account: @account)
end

@status = Status.find_by(uri: object_uri, account: @account)
@@ -74,4 +75,13 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
def lock_options
{ redis: Redis.current, key: "create:#{object_uri}" }
end

def invalid_origin?(url)
return true if unsupported_uri_scheme?(url)

needle = Addressable::URI.parse(url).host
haystack = Addressable::URI.parse(@account.uri).host

!haystack.casecmp(needle).zero?
end
end

+ 15
- 0
app/models/tombstone.rb View File

@@ -0,0 +1,15 @@
# frozen_string_literal: true

# == Schema Information
#
# Table name: tombstones
#
# id :bigint(8) not null, primary key
# account_id :bigint(8)
# uri :string not null
# created_at :datetime not null
# updated_at :datetime not null
#

class Tombstone < ApplicationRecord
end

+ 6
- 0
app/services/activitypub/process_account_service.rb View File

@@ -33,6 +33,8 @@ class ActivityPub::ProcessAccountService < BaseService

after_protocol_change! if protocol_changed?
after_key_change! if key_changed? && !@options[:signed_with_known_key]
clear_tombstones! if key_changed?

unless @options[:only_key]
check_featured_collection! if @account.featured_collection_url.present?
check_links! unless @account.fields.empty?
@@ -209,6 +211,10 @@ class ActivityPub::ProcessAccountService < BaseService
!@old_public_key.nil? && @old_public_key != @account.public_key
end

def clear_tombstones!
Tombstone.delete_all(account_id: @account.id)
end

def protocol_changed?
!@old_protocol.nil? && @old_protocol != @account.protocol
end

+ 12
- 0
db/migrate/20190117114553_create_tombstones.rb View File

@@ -0,0 +1,12 @@
class CreateTombstones < ActiveRecord::Migration[5.2]
def change
create_table :tombstones do |t|
t.belongs_to :account, foreign_key: { on_delete: :cascade }
t.string :uri, null: false

t.timestamps
end

add_index :tombstones, :uri
end
end

+ 11
- 1
db/schema.rb View File

@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2019_01_03_124754) do
ActiveRecord::Schema.define(version: 2019_01_17_114553) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -615,6 +615,15 @@ ActiveRecord::Schema.define(version: 2019_01_03_124754) do
t.index ["name"], name: "index_tags_on_name", unique: true
end

create_table "tombstones", force: :cascade do |t|
t.bigint "account_id"
t.string "uri", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["account_id"], name: "index_tombstones_on_account_id"
t.index ["uri"], name: "index_tombstones_on_uri"
end

create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.datetime "created_at", null: false
@@ -743,6 +752,7 @@ ActiveRecord::Schema.define(version: 2019_01_03_124754) do
add_foreign_key "statuses_tags", "tags", name: "fk_3081861e21", on_delete: :cascade
add_foreign_key "stream_entries", "accounts", name: "fk_5659b17554", on_delete: :cascade
add_foreign_key "subscriptions", "accounts", name: "fk_9847d1cbb5", on_delete: :cascade
add_foreign_key "tombstones", "accounts", on_delete: :cascade
add_foreign_key "users", "accounts", name: "fk_50500f500d", on_delete: :cascade
add_foreign_key "users", "invites", on_delete: :nullify
add_foreign_key "users", "oauth_applications", column: "created_by_application_id", on_delete: :nullify

Loading…
Cancel
Save