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

Implement instance blocklist #85

Merged
dessalines merged 1 commits from instance-blocklist into main 2020-08-13 20:26:53 +00:00
Conversation 0 Commits 1 Files Changed 3 +47 -25
nutomic commented 2020-08-13 13:54:40 +00:00
Owner
Copy Link

Federation tests are passing, and blocklist seems to work fine during manual testing.

Federation tests are passing, and blocklist seems to work fine during manual testing.
dessalines reviewed 2020-08-13 20:25:56 +00:00
server/src/apub/mod.rs
@ -101,2 +98,3 @@
Err(anyhow!("{} not in federation allowlist", domain).into())
}
None => Err(anyhow!("federation allowlist is empty").into()),
} else if !blocked_instances.is_empty() {
dessalines commented 2020-08-13 20:25:56 +00:00
Owner
Copy Link

I suppose we only have 3 scenarios, so an else if is okay here.

  • Empty allowlist, empty blocklist. IE full federation.
  • Full allowlist, empty blocklist. Explicit allows.
  • Empty allowlist, full blocklist. Explicit blocks.
I suppose we only have 3 scenarios, so an else if is okay here. - Empty allowlist, empty blocklist. IE full federation. - Full allowlist, empty blocklist. Explicit allows. - Empty allowlist, full blocklist. Explicit blocks.
nutomic commented 2020-08-14 12:23:14 +00:00
Author
Owner
Copy Link

Ah I'm not handling the case of empty allowlist and empty blocklist.

Ah I'm not handling the case of empty allowlist and empty blocklist.
dessalines merged commit 164a9c29fe into main 2020-08-13 20:26:53 +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#85
No description provided.
Delete Branch "instance-blocklist"

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?