diff options
author | ThibG <thib@sitedethib.com> | 2019-01-18 15:56:55 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-01-18 15:56:55 +0100 |
commit | 75b1488cf4dfe54260deff8df20e5e9b9fd90aea (patch) | |
tree | da5c67eabed97c45a55d6943a203a8fec8683095 /app/lib/activitypub | |
parent | 31f396b57dea684685d0affc3727a75eed2f38c9 (diff) |
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
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 1 | ||||
-rw-r--r-- | app/lib/activitypub/activity/delete.rb | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 665a9fbdc..b49657d4b 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -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? diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index ca3cf387e..dc76dd3e2 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -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 |