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

Tidying

master
Bob Mottram 2019-07-10 14:32:47 +01:00
parent 9c13891dc7
commit 2558ec297d
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inbox.py
View File

@ -405,9 +405,9 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
postLog: [],cachedWebfingers: {},personCache: {}, \ postLog: [],cachedWebfingers: {},personCache: {}, \
queue: [],domain: str,port: int,useTor: bool, \ queue: [],domain: str,port: int,useTor: bool, \
federationList: [],ocapAlways: bool,debug: bool, \ federationList: [],ocapAlways: bool,debug: bool, \
acceptedCaps: []) -> bool: acceptedCaps: [],
queueFilename :str,destinationFilename :str) -> bool:
""" Anything which needs to be done after capabilities checks have passed """ Anything which needs to be done after capabilities checks have passed
Returns True if the incoming item should be moved to the inbox
""" """
if receiveLike(session,handle, \ if receiveLike(session,handle, \
baseDir,httpPrefix, \ baseDir,httpPrefix, \
@ -422,6 +422,10 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
print('DEBUG: Like accepted from '+keyId) print('DEBUG: Like accepted from '+keyId)
return False return False
if debug:
print('DEBUG: object capabilities passed')
print('copy from '+queueFilename+' to '+destinationFilename)
copyfile(queueFilename,destinationFilename)
return True return True
def runInboxQueue(baseDir: str,httpPrefix: str,sendThreads: [],postLog: [],cachedWebfingers: {},personCache: {},queue: [],domain: str,port: int,useTor: bool,federationList: [],ocapAlways: bool,debug: bool,acceptedCaps=["inbox:write","objects:read"]) -> None: def runInboxQueue(baseDir: str,httpPrefix: str,sendThreads: [],postLog: [],cachedWebfingers: {},personCache: {},queue: [],domain: str,port: int,useTor: bool,federationList: [],ocapAlways: bool,debug: bool,acceptedCaps=["inbox:write","objects:read"]) -> None:
@ -579,16 +583,13 @@ def runInboxQueue(baseDir: str,httpPrefix: str,sendThreads: [],postLog: [],cache
# Here the capability id begins with the handle, so this could also # Here the capability id begins with the handle, so this could also
# be matched separately, but it's probably not necessary # be matched separately, but it's probably not necessary
if capsId in capabilityIdList: if capsId in capabilityIdList:
if inboxAfterCapabilities(session,keyId,handle,queueJson['post'], \ inboxAfterCapabilities(session,keyId,handle,queueJson['post'], \
baseDir,httpPrefix, \ baseDir,httpPrefix, \
sendThreads,postLog,cachedWebfingers, \ sendThreads,postLog,cachedWebfingers, \
personCache,queue,domain,port,useTor, \ personCache,queue,domain,port,useTor, \
federationList,ocapAlways,debug, \ federationList,ocapAlways,debug, \
acceptedCaps): acceptedCaps,
if debug: queueFilename,queueJson['destination'].replace(inboxHandle,handle))
print('DEBUG: object capabilities passed')
print('copy from '+queueFilename+' to '+queueJson['destination'].replace(inboxHandle,handle))
copyfile(queueFilename,queueJson['destination'].replace(inboxHandle,handle))
else: else:
if debug: if debug:
print('DEBUG: object capabilities check failed') print('DEBUG: object capabilities check failed')
@ -600,11 +601,8 @@ def runInboxQueue(baseDir: str,httpPrefix: str,sendThreads: [],postLog: [],cache
sendThreads,postLog,cachedWebfingers, \ sendThreads,postLog,cachedWebfingers, \
personCache,queue,domain,port,useTor, \ personCache,queue,domain,port,useTor, \
federationList,ocapAlways,debug, \ federationList,ocapAlways,debug, \
acceptedCaps): acceptedCaps, \
if debug: queueFilename,queueJson['destination'].replace(inboxHandle,handle)):
print('DEBUG: not enforcing object capabilities')
print('copy from '+queueFilename+' to '+queueJson['destination'].replace(inboxHandle,handle))
copyfile(queueFilename,queueJson['destination'].replace(inboxHandle,handle))
continue continue
if debug: if debug:
print('DEBUG: object capabilities check failed') print('DEBUG: object capabilities check failed')