Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter incoming Announce activities by relation to local activity #10041

Merged
merged 2 commits into from Feb 15, 2019

Conversation

Projects
None yet
2 participants
@Gargron
Copy link
Member

Gargron commented Feb 14, 2019

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

@Gargron Gargron added the activitypub label Feb 14, 2019

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

@Gargron Gargron force-pushed the fix-filter-announce branch from 1469c6d to 508e514 Feb 14, 2019

@Gargron Gargron requested a review from ThibG Feb 14, 2019

@ThibG

ThibG approved these changes Feb 15, 2019

Copy link
Collaborator

ThibG left a comment

I'd still allow fetching Announce since other software might expose the Announce URI rather than that of the announced object itself.

Otherwise it looks fine to me.

@Gargron Gargron merged commit c417e8c into master Feb 15, 2019

11 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: check-i18n Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-webui Your tests passed on CircleCI!
Details
codeclimate All good!
Details

@Gargron Gargron deleted the fix-filter-announce branch Feb 15, 2019

Gargron added a commit that referenced this pull request Feb 17, 2019

Filter incoming Announce activities by relation to local activity (#1…
…0041)

* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.