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

Extra checks on announce actor and object

main
Bob Mottram 2020-03-01 10:06:55 +00:00
parent 5e1e5f8961
commit c84fae54f1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
posts.py
View File

@ -2762,11 +2762,19 @@ def downloadAnnounce(session,baseDir: str,httpPrefix: str, \
asHeader={'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} asHeader={'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'}
actorNickname=getNicknameFromActor(postJsonObject['actor']) actorNickname=getNicknameFromActor(postJsonObject['actor'])
actorDomain,actorPort=getDomainFromActor(postJsonObject['actor']) actorDomain,actorPort=getDomainFromActor(postJsonObject['actor'])
if not actorDomain:
print('Announce actor does not contain a valid domain or port number: '+ \
str(postJsonObject['actor']))
return None
if isBlocked(baseDir,nickname,domain,actorNickname,actorDomain): if isBlocked(baseDir,nickname,domain,actorNickname,actorDomain):
print('Announce download blocked actor: '+actorNickname+'@'+actorDomain) print('Announce download blocked actor: '+actorNickname+'@'+actorDomain)
return None return None
objectNickname=getNicknameFromActor(postJsonObject['object']) objectNickname=getNicknameFromActor(postJsonObject['object'])
objectDomain,objectPort=getDomainFromActor(postJsonObject['object']) objectDomain,objectPort=getDomainFromActor(postJsonObject['object'])
if not objectDomain:
print('Announce object does not contain a valid domain or port number: '+ \
str(postJsonObject['object']))
return None
if isBlocked(baseDir,nickname,domain,objectNickname,objectDomain): if isBlocked(baseDir,nickname,domain,objectNickname,objectDomain):
if objectNickname and objectDomain: if objectNickname and objectDomain:
print('Announce download blocked object: '+objectNickname+'@'+objectDomain) print('Announce download blocked object: '+objectNickname+'@'+objectDomain)