Check for blocked domain

master
Bob Mottram 2019-09-09 19:39:46 +01:00
parent aa56da14b6
commit 7612dac859
1 changed files with 9 additions and 0 deletions

View File

@ -71,6 +71,7 @@ from blocking import removeBlock
from blocking import addGlobalBlock from blocking import addGlobalBlock
from blocking import removeGlobalBlock from blocking import removeGlobalBlock
from blocking import isBlockedHashtag from blocking import isBlockedHashtag
from blocking import isBlockedDomain
from config import setConfigParam from config import setConfigParam
from config import getConfigParam from config import getConfigParam
from roles import outboxDelegate from roles import outboxDelegate
@ -288,6 +289,14 @@ class PubServer(BaseHTTPRequestHandler):
pprint(messageJson) pprint(messageJson)
print('DEBUG: POST to outbox - Create does not have the required parameters') print('DEBUG: POST to outbox - Create does not have the required parameters')
return False 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 # https://www.w3.org/TR/activitypub/#create-activity-outbox
messageJson['object']['attributedTo']=messageJson['actor'] messageJson['object']['attributedTo']=messageJson['actor']
if messageJson['object'].get('attachment'): if messageJson['object'].get('attachment'):