gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Filter incoming Announce activities by relation to local activity (#10041)

Browse source 
* Filter incoming Announce activities by relation to local activity

Reject if announcer is not followed by local accounts, and is not
from an enabled relay, and the object is not a local status

Follow-up to #10005

* Fix tests
This commit is contained in:
Eugen Rochko 2019-02-15 18:19:45 +01:00 • committed by GitHub
parent 8ef50706a1
commit c417e8c198
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/lib/activitypub/activity/announce.rb
View file

@ -3,7 +3,8 @@
class ActivityPub::Activity::Announce < ActivityPub::Activity
def perform
original_status = status_from_object
return if original_status.nil? || delete_arrived_first?(@json['id']) || !announceable?(original_status)
return if original_status.nil? || delete_arrived_first?(@json['id']) || !announceable?(original_status) || !related_to_local_activity?
status = Status.find_by(account: @account, reblog: original_status)
@ -39,4 +40,12 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
def announceable?(status)
status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility?
end
def related_to_local_activity?
followed_by_local_accounts? || requested_through_relay? || reblog_of_local_status?
end
def reblog_of_local_status?
status_from_uri(object_uri)&.account&.local?
end
end

12
app/lib/activitypub/activity/create.rb
View file

@ -341,18 +341,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
responds_to_followed_account? || addresses_local_accounts?
end
def fetch?
!@options[:delivery]
end
def followed_by_local_accounts?
@account.passive_relationships.exists?
end
def requested_through_relay?
@options[:relayed_through_account] && Relay.find_by(inbox_url: @options[:relayed_through_account].inbox_url)&.enabled?
end
def responds_to_followed_account?
!replied_to_status.nil? && (replied_to_status.account.local? || replied_to_status.account.passive_relationships.exists?)
end