mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check for blocked actors within arriving announce posts

main
Bob Mottram 2020-05-25 10:21:34 +01:00
parent 8b4e5450ca
commit 4c356b2fe9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inbox.py
View File

@ -1356,6 +1356,8 @@ def receiveAnnounce(recentPostsCache: {},
'"users", "channel" or "profile" missing in ' + '"users", "channel" or "profile" missing in ' +
messageJson['type']) messageJson['type'])
return False return False
# is the domain of the announce actor blocked?
objectDomain = \ objectDomain = \
messageJson['object'].replace('https://', '') messageJson['object'].replace('https://', '')
objectDomain = objectDomain.replace('http://', '') objectDomain = objectDomain.replace('http://', '')
@ -1370,9 +1372,18 @@ def receiveAnnounce(recentPostsCache: {},
return False return False
if not os.path.isdir(baseDir + '/accounts/' + handle): if not os.path.isdir(baseDir + '/accounts/' + handle):
print('DEBUG: unknown recipient of announce - ' + handle) print('DEBUG: unknown recipient of announce - ' + handle)
# is this post in the outbox of the person?
# is the announce actor blocked?
nickname = handle.split('@')[0] nickname = handle.split('@')[0]
postFilename = locatePost(baseDir, nickname, handle.split('@')[1], actorNickname = getNicknameFromActor(messageJson['actor'])
actorDomain, actorPort = getDomainFromActor(messageJson['actor'])
if isBlocked(baseDir, nickname, domain, actorNickname, actorDomain):
print('Receive announce blocked for actor: ' +
actorNickname + '@' + actorDomain)
return False
# is this post in the outbox of the person?
postFilename = locatePost(baseDir, nickname, domain,
messageJson['object']) messageJson['object'])
if not postFilename: if not postFilename:
if debug: if debug: