From 7612dac859f78a3a0f9e6cf8449ccf7d5a761dfc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 9 Sep 2019 19:39:46 +0100 Subject: [PATCH] Check for blocked domain --- daemon.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/daemon.py b/daemon.py index cc4dea4ab..70744f0a2 100644 --- a/daemon.py +++ b/daemon.py @@ -71,6 +71,7 @@ from blocking import removeBlock from blocking import addGlobalBlock from blocking import removeGlobalBlock from blocking import isBlockedHashtag +from blocking import isBlockedDomain from config import setConfigParam from config import getConfigParam from roles import outboxDelegate @@ -288,6 +289,14 @@ class PubServer(BaseHTTPRequestHandler): pprint(messageJson) print('DEBUG: POST to outbox - Create does not have the required parameters') return False + testDomain,testPort=getDomainFromActor(messageJson['actor']) + if testPort: + if testPort!=80 and testPort!=443: + testDomain=testDomain+':'+str(testPort) + if isBlockedDomain(self.server.baseDir,testDomain): + if self.server.debug: + print('DEBUG: domain is blocked: '+messageJson['actor']) + return False # https://www.w3.org/TR/activitypub/#create-activity-outbox messageJson['object']['attributedTo']=messageJson['actor'] if messageJson['object'].get('attachment'):