LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Add check to make sure that inbox doesnt receive local activities (ref #1283) #147

Merged
dessalines merged 2 commits from inbox-not-local into main 2020-12-01 18:30:19 +00:00
Conversation 0 Commits 2 Files Changed 4 +26 -1
nutomic commented 2020-11-30 21:04:38 +00:00
Owner
Copy Link
No description provided.
dessalines reviewed 2020-12-01 02:10:58 +00:00
lemmy_apub/src/inbox/mod.rs
@ -154,0 +160,4 @@
let activity_domain = id.domain().context(location_info!())?;
if activity_domain != Settings::get().hostname {
return Err(
dessalines commented 2020-12-01 02:10:58 +00:00
Owner
Copy Link

Shouldn't it throw the error if it IS a local activity, IE activity_domain == my.hostname

Shouldn't it throw the error if it IS a local activity, IE activity_domain == my.hostname
nutomic commented 2020-12-01 13:43:46 +00:00
Author
Owner
Copy Link

Damn you're right. I dont know how the tests passed with this.

Damn you're right. I dont know how the tests passed with this.
nutomic commented 2020-12-01 14:43:47 +00:00
Author
Owner
Copy Link

Fixed, also pushed to github. Please squash when merging.

Fixed, also pushed to github. Please squash when merging.
dessalines commented 2020-12-01 14:44:38 +00:00
Owner
Copy Link

Cool, once tests pass I'll squash and merge.

Cool, once tests pass I'll squash and merge.
nutomic commented 2020-12-01 14:45:31 +00:00
Author
Owner
Copy Link

When I tested the original commit locally, I still had assert!() instead of return Err(), so I must have rewritten it wrong (and didnt run tests again).

When I tested the original commit locally, I still had `assert!()` instead of `return Err()`, so I must have rewritten it wrong (and didnt run tests again).
dessalines merged commit 2b5c69d678 into main 2020-12-01 18:30:19 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: LemmyNet/lemmy#147
No description provided.
Delete Branch "inbox-not-local"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?