indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Extra checks when removing inbox queue items

main2
Bob Mottram 2019-10-13 13:22:27 +01:00
parent b2b4d37517
commit 1f0a869fbe
1 changed files with 72 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
inbox.py
View File

@ -313,8 +313,10 @@ def inboxCheckCapabilities(baseDir :str,nickname :str,domain :str, \
if debug: if debug:
print('DEBUG: capabilities for '+ \ print('DEBUG: capabilities for '+ \
actor+' do not exist') actor+' do not exist')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
return False return False
tries=0 tries=0
@ -334,29 +336,37 @@ def inboxCheckCapabilities(baseDir :str,nickname :str,domain :str, \
if not oc.get('id'): if not oc.get('id'):
if debug: if debug:
print('DEBUG: capabilities for '+actor+' do not contain an id') print('DEBUG: capabilities for '+actor+' do not contain an id')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
return False return False
if oc['id']!=capabilityId: if oc['id']!=capabilityId:
if debug: if debug:
print('DEBUG: capability id mismatch') print('DEBUG: capability id mismatch')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
return False return False
if not oc.get('capability'): if not oc.get('capability'):
if debug: if debug:
print('DEBUG: missing capability list') print('DEBUG: missing capability list')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
return False return False
if not CapablePost(queueJson['post'],oc['capability'],debug): if not CapablePost(queueJson['post'],oc['capability'],debug):
if debug: if debug:
print('DEBUG: insufficient capabilities to write to inbox from '+actor) print('DEBUG: insufficient capabilities to write to inbox from '+actor)
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
return False return False
if debug: if debug:
@ -1111,7 +1121,8 @@ def receiveUndoAnnounce(session,handle: str,isGroup: bool,baseDir: str, \
print("DEBUG: Attempt to undo something which isn't an announcement") print("DEBUG: Attempt to undo something which isn't an announcement")
return False return False
undoAnnounceCollectionEntry(postFilename,messageJson['actor'],debug) undoAnnounceCollectionEntry(postFilename,messageJson['actor'],debug)
os.remove(postFilename) if os.path.isfile(postFilename):
os.remove(postFilename)
return True return True
def populateReplies(baseDir :str,httpPrefix :str,domain :str, \ def populateReplies(baseDir :str,httpPrefix :str,domain :str, \
@ -1683,7 +1694,8 @@ def runInboxQueue(projectVersion: str, \
if not os.path.isfile(queueFilename): if not os.path.isfile(queueFilename):
if debug: if debug:
print("DEBUG: queue item rejected because it has no file: "+queueFilename) print("DEBUG: queue item rejected because it has no file: "+queueFilename)
queue.pop(0) if len(queue)>0:
queue.pop(0)
continue continue
print('Loading queue item '+queueFilename) print('Loading queue item '+queueFilename)
@ -1698,10 +1710,12 @@ def runInboxQueue(projectVersion: str, \
if itemReadFailed>4: if itemReadFailed>4:
# After a few tries we can assume that the file # After a few tries we can assume that the file
# is probably corrupt/unreadable # is probably corrupt/unreadable
queue.pop(0) if len(queue)>0:
queue.pop(0)
itemReadFailed=0 itemReadFailed=0
# delete the queue file # delete the queue file
os.remove(queueFilename) if os.path.isfile(queueFilename):
os.remove(queueFilename)
continue continue
itemReadFailed=0 itemReadFailed=0
@ -1721,7 +1735,8 @@ def runInboxQueue(projectVersion: str, \
if quotas['domains'][postDomain]>domainMaxPostsPerDay: if quotas['domains'][postDomain]>domainMaxPostsPerDay:
if debug: if debug:
print('DEBUG: Maximum posts for '+postDomain+' reached') print('DEBUG: Maximum posts for '+postDomain+' reached')
queue.pop(0) if len(queue)>0:
queue.pop(0)
continue continue
quotas['domains'][postDomain]+=1 quotas['domains'][postDomain]+=1
else: else:
@ -1733,7 +1748,8 @@ def runInboxQueue(projectVersion: str, \
if quotas['accounts'][postHandle]>accountMaxPostsPerDay: if quotas['accounts'][postHandle]>accountMaxPostsPerDay:
if debug: if debug:
print('DEBUG: Maximum posts for '+postHandle+' reached') print('DEBUG: Maximum posts for '+postHandle+' reached')
queue.pop(0) if len(queue)>0:
queue.pop(0)
continue continue
quotas['accounts'][postHandle]+=1 quotas['accounts'][postHandle]+=1
else: else:
@ -1760,8 +1776,10 @@ def runInboxQueue(projectVersion: str, \
if debug: if debug:
print('DEBUG: No keyId in signature: '+ \ print('DEBUG: No keyId in signature: '+ \
queueJson['httpHeaders']['signature']) queueJson['httpHeaders']['signature'])
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
pubKey= \ pubKey= \
@ -1780,8 +1798,10 @@ def runInboxQueue(projectVersion: str, \
if not pubKey: if not pubKey:
if debug: if debug:
print('DEBUG: public key could not be obtained from '+keyId) print('DEBUG: public key could not be obtained from '+keyId)
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
# check the signature # check the signature
@ -1796,8 +1816,10 @@ def runInboxQueue(projectVersion: str, \
json.dumps(queueJson['post'])): json.dumps(queueJson['post'])):
if debug: if debug:
print('DEBUG: Header signature check failed') print('DEBUG: Header signature check failed')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
if debug: if debug:
@ -1819,8 +1841,10 @@ def runInboxQueue(projectVersion: str, \
acceptedCaps=["inbox:write","objects:read"]): acceptedCaps=["inbox:write","objects:read"]):
if debug: if debug:
print('DEBUG: Undo accepted from '+keyId) print('DEBUG: Undo accepted from '+keyId)
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
if debug: if debug:
@ -1834,8 +1858,10 @@ def runInboxQueue(projectVersion: str, \
federationList, \ federationList, \
debug,projectVersion, \ debug,projectVersion, \
acceptedCaps=["inbox:write","objects:read"]): acceptedCaps=["inbox:write","objects:read"]):
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
if debug: if debug:
print('DEBUG: Follow activity for '+keyId+' removed from accepted from queue') print('DEBUG: Follow activity for '+keyId+' removed from accepted from queue')
continue continue
@ -1853,8 +1879,10 @@ def runInboxQueue(projectVersion: str, \
debug): debug):
if debug: if debug:
print('DEBUG: Accept/Reject received from '+keyId) print('DEBUG: Accept/Reject received from '+keyId)
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
if receiveUpdate(session, \ if receiveUpdate(session, \
@ -1868,8 +1896,10 @@ def runInboxQueue(projectVersion: str, \
debug): debug):
if debug: if debug:
print('DEBUG: Update accepted from '+keyId) print('DEBUG: Update accepted from '+keyId)
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
# get recipients list # get recipients list
@ -1881,8 +1911,10 @@ def runInboxQueue(projectVersion: str, \
if debug: if debug:
pprint(queueJson['post']) pprint(queueJson['post'])
print('DEBUG: no recipients were resolved for post arriving in inbox') print('DEBUG: no recipients were resolved for post arriving in inbox')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
# if there are only a small number of followers then process them as if they # if there are only a small number of followers then process them as if they
@ -1910,8 +1942,10 @@ def runInboxQueue(projectVersion: str, \
if not isinstance(queueJson['post']['capability'], list): if not isinstance(queueJson['post']['capability'], list):
if debug: if debug:
print('DEBUG: capability on post should be a list') print('DEBUG: capability on post should be a list')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)
continue continue
# Copy any posts addressed to followers into the shared inbox # Copy any posts addressed to followers into the shared inbox
@ -1985,5 +2019,7 @@ def runInboxQueue(projectVersion: str, \
if debug: if debug:
print('DEBUG: Queue post accepted') print('DEBUG: Queue post accepted')
os.remove(queueFilename) if os.path.isfile(queueFilename):
queue.pop(0) os.remove(queueFilename)
if len(queue)>0:
queue.pop(0)