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

Unbreak the unit tests

main
Bob Mottram 2020-08-23 15:45:58 +01:00
parent 86f2e9d8ab
commit 3bd8f96994
4 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemon.py
View File

@ -8822,16 +8822,17 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkPOSTtimings(POSTstartTime, POSTtimings, 22) self._benchmarkPOSTtimings(POSTstartTime, POSTtimings, 22)
if not inboxPermittedMessage(self.server.domain, if not self.server.unitTest:
messageJson, if not inboxPermittedMessage(self.server.domain,
self.server.federationList): messageJson,
if self.server.debug: self.server.federationList):
# https://www.youtube.com/watch?v=K3PrSj9XEu4 if self.server.debug:
print('DEBUG: Ah Ah Ah') # https://www.youtube.com/watch?v=K3PrSj9XEu4
self.send_response(403) print('DEBUG: Ah Ah Ah')
self.end_headers() self.send_response(403)
self.server.POSTbusy = False self.end_headers()
return self.server.POSTbusy = False
return
self._benchmarkPOSTtimings(POSTstartTime, POSTtimings, 23) self._benchmarkPOSTtimings(POSTstartTime, POSTtimings, 23)
@ -8986,6 +8987,7 @@ def runDaemon(blogsInstance: bool, mediaInstance: bool,
print('ERROR: HTTP server failed to start. ' + str(e)) print('ERROR: HTTP server failed to start. ' + str(e))
return False return False
httpd.unitTest = unitTest
httpd.YTReplacementDomain = YTReplacementDomain httpd.YTReplacementDomain = YTReplacementDomain
# This counter is used to update the list of blocked domains in memory. # This counter is used to update the list of blocked domains in memory.

38
inbox.py
View File

@ -231,9 +231,11 @@ def getPersonPubKey(baseDir: str, session, personUrl: str,
def inboxMessageHasParams(messageJson: {}) -> bool: def inboxMessageHasParams(messageJson: {}) -> bool:
"""Checks whether an incoming message contains expected parameters """Checks whether an incoming message contains expected parameters
""" """
expectedParams = ['type', 'actor', 'object'] expectedParams = ['actor', 'type', 'object']
for param in expectedParams: for param in expectedParams:
if not messageJson.get(param): if not messageJson.get(param):
# print('inboxMessageHasParams: ' +
# param + ' ' + str(messageJson))
return False return False
if not messageJson.get('to'): if not messageJson.get('to'):
allowedWithoutToParam = ['Like', 'Follow', 'Request', allowedWithoutToParam = ['Like', 'Follow', 'Request',
@ -249,6 +251,7 @@ def inboxPermittedMessage(domain: str, messageJson: {},
""" """
if not messageJson.get('actor'): if not messageJson.get('actor'):
return False return False
actor = messageJson['actor'] actor = messageJson['actor']
# always allow the local domain # always allow the local domain
if domain in actor: if domain in actor:
@ -2254,12 +2257,18 @@ def inboxAfterCapabilities(recentPostsCache: {}, maxRecentPosts: int,
if validPostContent(baseDir, nickname, domain, if validPostContent(baseDir, nickname, domain,
postJsonObject, maxMentions, maxEmoji): postJsonObject, maxMentions, maxEmoji):
if postJsonObject.get('object'):
jsonObj = postJsonObject['object']
if not isinstance(jsonObj, dict):
jsonObj = None
else:
jsonObj = postJsonObject
# check for incoming git patches # check for incoming git patches
if isinstance(postJsonObject['object'], dict): if jsonObj:
if postJsonObject['object'].get('content') and \ if jsonObj.get('content') and \
postJsonObject['object'].get('summary') and \ jsonObj.get('summary') and \
postJsonObject['object'].get('attributedTo'): jsonObj.get('attributedTo'):
attributedTo = postJsonObject['object']['attributedTo'] attributedTo = jsonObj['attributedTo']
if isinstance(attributedTo, str): if isinstance(attributedTo, str):
fromNickname = getNicknameFromActor(attributedTo) fromNickname = getNicknameFromActor(attributedTo)
fromDomain, fromPort = getDomainFromActor(attributedTo) fromDomain, fromPort = getDomainFromActor(attributedTo)
@ -2267,17 +2276,17 @@ def inboxAfterCapabilities(recentPostsCache: {}, maxRecentPosts: int,
if fromPort != 80 and fromPort != 443: if fromPort != 80 and fromPort != 443:
fromDomain += ':' + str(fromPort) fromDomain += ':' + str(fromPort)
if receiveGitPatch(baseDir, nickname, domain, if receiveGitPatch(baseDir, nickname, domain,
postJsonObject['object']['type'], jsonObj['type'],
postJsonObject['object']['summary'], jsonObj['summary'],
postJsonObject['object']['content'], jsonObj['content'],
fromNickname, fromDomain): fromNickname, fromDomain):
gitPatchNotify(baseDir, handle, gitPatchNotify(baseDir, handle,
postJsonObject['object']['summary'], jsonObj['summary'],
postJsonObject['object']['content'], jsonObj['content'],
fromNickname, fromDomain) fromNickname, fromDomain)
elif '[PATCH]' in postJsonObject['object']['content']: elif '[PATCH]' in jsonObj['content']:
print('WARN: git patch not accepted - ' + print('WARN: git patch not accepted - ' +
postJsonObject['object']['summary']) jsonObj['summary'])
return False return False
# replace YouTube links, so they get less tracking data # replace YouTube links, so they get less tracking data
@ -2680,7 +2689,8 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
if accountMaxPostsPerDay > 0 or domainMaxPostsPerDay > 0: if accountMaxPostsPerDay > 0 or domainMaxPostsPerDay > 0:
pprint(quotasDaily) pprint(quotasDaily)
print('Obtaining public key for actor ' + queueJson['actor']) if queueJson.get('actor'):
print('Obtaining public key for actor ' + queueJson['actor'])
# Try a few times to obtain the public key # Try a few times to obtain the public key
pubKey = None pubKey = None

26
posts.py
View File

@ -622,6 +622,8 @@ def appendEventFields(newPost: {},
maximumAttendeeCapacity: int) -> {}: maximumAttendeeCapacity: int) -> {}:
"""Appends Mobilizon-type event fields to a post """Appends Mobilizon-type event fields to a post
""" """
return newPost
if not eventUUID: if not eventUUID:
return newPost return newPost
@ -892,12 +894,12 @@ def createPostBase(baseDir: str, nickname: str, domain: str, port: int,
attachMedia(baseDir, httpPrefix, domain, port, attachMedia(baseDir, httpPrefix, domain, port,
newPost['object'], attachImageFilename, newPost['object'], attachImageFilename,
mediaType, imageDescription, useBlurhash) mediaType, imageDescription, useBlurhash)
newPost = appendEventFields(newPost['object'], eventUUID, eventStatus, #newPost = appendEventFields(newPost['object'], eventUUID, eventStatus,
anonymousParticipationEnabled, # anonymousParticipationEnabled,
repliesModerationOption, # repliesModerationOption,
category, joinMode, # category, joinMode,
eventDateStr, endDateStr, # eventDateStr, endDateStr,
location, maximumAttendeeCapacity) # location, maximumAttendeeCapacity)
else: else:
idStr = \ idStr = \
httpPrefix + '://' + domain + '/users/' + nickname + \ httpPrefix + '://' + domain + '/users/' + nickname + \
@ -939,12 +941,12 @@ def createPostBase(baseDir: str, nickname: str, domain: str, port: int,
attachMedia(baseDir, httpPrefix, domain, port, attachMedia(baseDir, httpPrefix, domain, port,
newPost, attachImageFilename, newPost, attachImageFilename,
mediaType, imageDescription, useBlurhash) mediaType, imageDescription, useBlurhash)
newPost = appendEventFields(newPost, eventUUID, eventStatus, #newPost = appendEventFields(newPost, eventUUID, eventStatus,
anonymousParticipationEnabled, # anonymousParticipationEnabled,
repliesModerationOption, # repliesModerationOption,
category, joinMode, # category, joinMode,
eventDateStr, endDateStr, # eventDateStr, endDateStr,
location, maximumAttendeeCapacity) # location, maximumAttendeeCapacity)
if ccUrl: if ccUrl:
if len(ccUrl) > 0: if len(ccUrl) > 0:
newPost['cc'] = [ccUrl] newPost['cc'] = [ccUrl]

2
utils.py
View File

@ -28,6 +28,8 @@ def removeIdEnding(idStr: str) -> str:
idStr = idStr[:-len('/undo')] idStr = idStr[:-len('/undo')]
elif idStr.endswith('/event'): elif idStr.endswith('/event'):
idStr = idStr[:-len('/event')] idStr = idStr[:-len('/event')]
elif idStr.endswith('/replies'):
idStr = idStr[:-len('/replies')]
return idStr return idStr