about summary refs log tree commit diff
path: root/app/lib/activitypub/activity/delete.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-01-18 15:56:55 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-01-18 15:56:55 +0100
commit75b1488cf4dfe54260deff8df20e5e9b9fd90aea (patch)
treeda5c67eabed97c45a55d6943a203a8fec8683095 /app/lib/activitypub/activity/delete.rb
parent31f396b57dea684685d0affc3727a75eed2f38c9 (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/activity/delete.rb')
-rw-r--r--app/lib/activitypub/activity/delete.rb14
1 files changed, 12 insertions, 2 deletions
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