From fc2732a5edb922ca63b06e08995e4abfcec853a5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 3 Nov 2019 13:43:47 +0000 Subject: [PATCH] Tidying --- acceptreject.py | 12 +- announce.py | 13 +- availability.py | 3 +- cache.py | 11 +- capabilities.py | 27 ++- config.py | 2 +- content.py | 79 +++++-- daemon.py | 609 +++++++++++++++++++++++++++++++++--------------- inbox.py | 13 +- posts.py | 91 +++++--- 10 files changed, 587 insertions(+), 273 deletions(-) diff --git a/acceptreject.py b/acceptreject.py index 952b8382..0d9c1d60 100644 --- a/acceptreject.py +++ b/acceptreject.py @@ -58,9 +58,13 @@ def createAcceptReject(baseDir: str,federationList: [], \ def createAccept(baseDir: str,federationList: [], \ nickname: str,domain: str,port: int, \ toUrl: str,ccUrl: str,httpPrefix: str, \ - objectJson: {},acceptedCaps=["inbox:write","objects:read"]) -> {}: + objectJson: {}, \ + acceptedCaps=["inbox:write","objects:read"]) -> {}: # create capabilities accept - ocapNew=capabilitiesAccept(baseDir,httpPrefix,nickname,domain,port,toUrl,True,acceptedCaps) + ocapNew= \ + capabilitiesAccept(baseDir,httpPrefix, \ + nickname,domain,port, \ + toUrl,True,acceptedCaps) return createAcceptReject(baseDir,federationList, \ nickname,domain,port, \ toUrl,ccUrl,httpPrefix, \ @@ -126,7 +130,7 @@ def acceptFollow(baseDir: str,domain : str,messageJson: {}, \ print('DEBUG: nickname not found in '+thisActor) return if acceptedPort: - if not '/'+acceptedDomain+':'+str(acceptedPort)+'/users/'+nickname in thisActor: + if '/'+acceptedDomain+':'+str(acceptedPort)+'/users/'+nickname not in thisActor: if debug: print('Port: '+str(acceptedPort)) print('Expected: /'+acceptedDomain+':'+str(acceptedPort)+'/users/'+nickname) @@ -134,7 +138,7 @@ def acceptFollow(baseDir: str,domain : str,messageJson: {}, \ print('DEBUG: unrecognized actor '+thisActor) return else: - if not '/'+acceptedDomain+'/users/'+nickname in thisActor: + if '/'+acceptedDomain+'/users/'+nickname not in thisActor: if debug: print('Expected: /'+acceptedDomain+'/users/'+nickname) print('Actual: '+thisActor) diff --git a/announce.py b/announce.py index 5071660b..70e99576 100644 --- a/announce.py +++ b/announce.py @@ -62,7 +62,8 @@ def outboxAnnounce(baseDir: str,messageJson: {},debug: bool) -> bool: return True return False -def undoAnnounceCollectionEntry(postFilename: str,actor: str,debug: bool) -> None: +def undoAnnounceCollectionEntry(postFilename: str,actor: str, \ + debug: bool) -> None: """Undoes an announce for a particular actor by removing it from the "shares" collection within a post. Note that the "shares" collection has no relation to shared items in shares.py. It's shares of posts, not shares of physical objects. @@ -102,14 +103,15 @@ def undoAnnounceCollectionEntry(postFilename: str,actor: str,debug: bool) -> Non print('DEBUG: shares (announcements) was removed from post') del postJsonObject['object']['shares'] else: - postJsonObject['object']['shares']['totalItems']=len(postJsonObject['object']['shares']['items']) + postJsonObject['object']['shares']['totalItems']= \ + len(postJsonObject['object']['shares']['items']) with open(postFilename, 'w') as fp: commentjson.dump(postJsonObject, fp, indent=4, sort_keys=True) def updateAnnounceCollection(postFilename: str,actor: str,debug: bool) -> None: """Updates the announcements collection within a post - Confusingly this is known as "shares", but isn't the same as shared items within shares.py - It's shares of posts, not shares of physical objects. + Confusingly this is known as "shares", but isn't the same as shared + items within shares.py. It's shares of posts, not shares of physical objects. """ with open(postFilename, 'r') as fp: postJsonObject=commentjson.load(fp) @@ -146,7 +148,8 @@ def updateAnnounceCollection(postFilename: str,actor: str,debug: bool) -> None: 'actor': actor } postJsonObject['object']['shares']['items'].append(newAnnounce) - postJsonObject['object']['shares']['totalItems']=len(postJsonObject['object']['shares']['items']) + postJsonObject['object']['shares']['totalItems']= \ + len(postJsonObject['object']['shares']['items']) else: if debug: print('DEBUG: shares (announcements) section of post has no items list') diff --git a/availability.py b/availability.py index e7d338e3..8b73bdff 100644 --- a/availability.py +++ b/availability.py @@ -46,7 +46,8 @@ def getAvailability(baseDir: str,nickname: str,domain: str) -> str: return actorJson['availability'] return None -def outboxAvailability(baseDir: str,nickname: str,messageJson: {},debug: bool) -> bool: +def outboxAvailability(baseDir: str,nickname: str,messageJson: {}, \ + debug: bool) -> bool: """Handles receiving an availability update """ if not messageJson.get('type'): diff --git a/cache.py b/cache.py index 5b9dbe42..abb3eb45 100644 --- a/cache.py +++ b/cache.py @@ -11,7 +11,8 @@ import time import datetime import commentjson -def storePersonInCache(baseDir: str,personUrl: str,personJson: {},personCache: {}) -> None: +def storePersonInCache(baseDir: str,personUrl: str, \ + personJson: {},personCache: {}) -> None: """Store an actor in the cache """ currTime=datetime.datetime.utcnow() @@ -35,7 +36,8 @@ def getPersonFromCache(baseDir: str,personUrl: str,personCache: {}) -> {}: # if the actor is not in memory then try to load it from file loadedFromFile=False if not personCache.get(personUrl): - cacheFilename=baseDir+'/cache/actors/'+personUrl.replace('/','#')+'.json' + cacheFilename= \ + baseDir+'/cache/actors/'+personUrl.replace('/','#')+'.json' if os.path.isfile(cacheFilename): personJson=None try: @@ -52,11 +54,12 @@ def getPersonFromCache(baseDir: str,personUrl: str,personCache: {}) -> {}: if not loadedFromFile: # update the timestamp for the last time the actor was retrieved currTime=datetime.datetime.utcnow() - personCache[personUrl]['timestamp']=currTime.strftime("%Y-%m-%dT%H:%M:%SZ") + personCache[personUrl]['timestamp']= \ + currTime.strftime("%Y-%m-%dT%H:%M:%SZ") return personCache[personUrl]['actor'] return None -def expirePersonCache(personCache: {}): +def expirePersonCache(personCache: {}) -> None: """Expires old entries from the cache in memory """ currTime=datetime.datetime.utcnow() diff --git a/capabilities.py b/capabilities.py index d96e3933..74f28123 100644 --- a/capabilities.py +++ b/capabilities.py @@ -15,7 +15,8 @@ from auth import createPassword from utils import getNicknameFromActor from utils import getDomainFromActor -def getOcapFilename(baseDir :str,nickname: str,domain: str,actor :str,subdir: str) -> str: +def getOcapFilename(baseDir :str,nickname: str,domain: str, \ + actor :str,subdir: str) -> str: """Returns the filename for a particular capability accepted or granted Also creates directories as needed """ @@ -40,7 +41,8 @@ def getOcapFilename(baseDir :str,nickname: str,domain: str,actor :str,subdir: st if not os.path.isdir(ocDir): os.mkdir(ocDir) - return baseDir+'/accounts/'+nickname+'@'+domain+'/ocap/'+subdir+'/'+actor.replace('/','#')+'.json' + return baseDir+'/accounts/'+nickname+'@'+domain+'/ocap/'+ \ + subdir+'/'+actor.replace('/','#')+'.json' def CapablePost(postJson: {}, capabilityList: [], debug :bool) -> bool: """Determines whether a post arriving in the inbox @@ -120,7 +122,8 @@ def capabilitiesAccept(baseDir: str,httpPrefix: str, \ fullDomain=domain+':'+str(port) # make directories to store capabilities - ocapFilename=getOcapFilename(baseDir,nickname,fullDomain,acceptedActor,'accept') + ocapFilename= \ + getOcapFilename(baseDir,nickname,fullDomain,acceptedActor,'accept') if not ocapFilename: return None ocapAccept=None @@ -137,9 +140,11 @@ def capabilitiesAccept(baseDir: str,httpPrefix: str, \ return None acceptedActorDomain,acceptedActorPort=getDomainFromActor(acceptedActor) if acceptedActorPort: - ocapId=acceptedActorNickname+'@'+acceptedActorDomain+':'+str(acceptedActorPort)+'#'+createPassword(32) + ocapId=acceptedActorNickname+'@'+acceptedActorDomain+':'+ \ + str(acceptedActorPort)+'#'+createPassword(32) else: - ocapId=acceptedActorNickname+'@'+acceptedActorDomain+'#'+createPassword(32) + ocapId=acceptedActorNickname+'@'+acceptedActorDomain+'#'+ \ + createPassword(32) ocapAccept = { "@context": "https://www.w3.org/ns/activitystreams", "id": httpPrefix+"://"+fullDomain+"/caps/"+ocapId, @@ -156,13 +161,15 @@ def capabilitiesAccept(baseDir: str,httpPrefix: str, \ commentjson.dump(ocapAccept, fp, indent=4, sort_keys=False) return ocapAccept -def capabilitiesGrantedSave(baseDir :str,nickname :str,domain :str,ocap: {}) -> bool: +def capabilitiesGrantedSave(baseDir :str, \ + nickname :str,domain :str,ocap: {}) -> bool: """A capabilities accept is received, so stor it for reference when sending to the actor """ if not ocap.get('actor'): return False - ocapFilename=getOcapFilename(baseDir,nickname,domain,ocap['actor'],'granted') + ocapFilename= \ + getOcapFilename(baseDir,nickname,domain,ocap['actor'],'granted') if not ocapFilename: return False with open(ocapFilename, 'w') as fp: @@ -189,7 +196,8 @@ def capabilitiesUpdate(baseDir: str,httpPrefix: str, \ fullDomain=domain+':'+str(port) # Get the filename of the capability - ocapFilename=getOcapFilename(baseDir,nickname,fullDomain,updateActor,'accept') + ocapFilename= \ + getOcapFilename(baseDir,nickname,fullDomain,updateActor,'accept') if not ocapFilename: return None @@ -221,7 +229,8 @@ def capabilitiesUpdate(baseDir: str,httpPrefix: str, \ return None updateActorDomain,updateActorPort=getDomainFromActor(updateActor) if updateActorPort: - ocapId=updateActorNickname+'@'+updateActorDomain+':'+str(updateActorPort)+'#'+createPassword(32) + ocapId=updateActorNickname+'@'+updateActorDomain+':'+ \ + str(updateActorPort)+'#'+createPassword(32) else: ocapId=updateActorNickname+'@'+updateActorDomain+'#'+createPassword(32) ocapJson['id']=httpPrefix+"://"+fullDomain+"/caps/"+ocapId diff --git a/config.py b/config.py index b809d4f9..5fa210d1 100644 --- a/config.py +++ b/config.py @@ -32,7 +32,7 @@ def setConfigParam(baseDir: str, variableName: str, variableValue) -> None: with open(configFilename, 'w') as fp: commentjson.dump(configJson, fp, indent=4, sort_keys=True) -def getConfigParam(baseDir: str, variableName: str): +def getConfigParam(baseDir: str, variableName: str) -> None: """Gets a configuration value """ createConfig(baseDir) diff --git a/content.py b/content.py index 586e00bc..7b89f9ef 100644 --- a/content.py +++ b/content.py @@ -30,13 +30,17 @@ def addMusicTag(content: str,tag: str) -> str: def addWebLinks(content: str) -> str: """Adds markup for web links """ - if not ('https://' in content or 'http://' in content or 'dat://' in content): + if not ('https://' in content or \ + 'http://' in content or \ + 'dat://' in content): return content words=content.replace('\n',' --linebreak--').split(' ') replaceDict={} for w in words: - if w.startswith('https://') or w.startswith('http://') or w.startswith('dat://'): + if w.startswith('https://') or \ + w.startswith('http://') or \ + w.startswith('dat://'): if w.endswith('.') or w.endswith(';'): w=w[:-1] markup='' @@ -46,7 +50,9 @@ def addWebLinks(content: str) -> str: markup+='' elif w.startswith('dat://'): markup+='' - markup+=''+w.replace('https://','').replace('http://','').replace('dat://','')+'' + markup+=''+ \ + w.replace('https://','').replace('http://','').replace('dat://','')+ \ + '' replaceDict[w]=markup for url,markup in replaceDict.items(): content=content.replace(url,markup) @@ -56,12 +62,15 @@ def addWebLinks(content: str) -> str: def validHashTag(hashtag: str) -> bool: """Returns true if the give hashtag contains valid characters """ - validChars = set('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') + validChars = \ + set('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') if set(hashtag).issubset(validChars): return True return False -def addHashTags(wordStr: str,httpPrefix: str,domain: str,replaceHashTags: {},postHashtags: {}) -> bool: +def addHashTags(wordStr: str, \ + httpPrefix: str,domain: str, \ + replaceHashTags: {},postHashtags: {}) -> bool: """Detects hashtags and adds them to the replacements dict Also updates the hashtags list to be added to the post """ @@ -81,7 +90,9 @@ def addHashTags(wordStr: str,httpPrefix: str,domain: str,replaceHashTags: {},pos 'type': 'Hashtag' } replaceHashTags[wordStr]= \ - "#"+hashtag+"" + "#"+ \ + hashtag+"" return True def loadEmojiDict(emojiDataFilename: str,emojiDict: {}) -> None: @@ -104,12 +115,15 @@ def loadEmojiDict(emojiDataFilename: str,emojiDict: {}) -> None: continue if '..' in emojiUnicode: emojiUnicode=emojiUnicode.split('..')[0] - emojiName=line.split(')',1)[1].strip().replace('\n','').replace(' ','').replace('-','') + emojiName= \ + line.split(')',1)[1].strip().replace('\n','').replace(' ','').replace('-','') if '..' in emojiName: emojiName=emojiName.split('..')[0] emojiDict[emojiName.lower()]=emojiUnicode -def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji: {},postTags: {},emojiDict: {}) -> bool: +def addEmoji(baseDir: str,wordStr: str, \ + httpPrefix: str,domain: str, \ + replaceEmoji: {},postTags: {},emojiDict: {}) -> bool: """Detects Emoji and adds them to the replacements dict Also updates the tags list to be added to the post """ @@ -142,7 +156,9 @@ def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji: } return True -def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},recipients: [],tags: {}) -> bool: +def addMention(wordStr: str, \ + httpPrefix: str,following: str, \ + replaceMentions: {},recipients: [],tags: {}) -> bool: """Detects mentions and adds them to the replacements dict and recipients list """ if not wordStr.startswith('@'): @@ -158,7 +174,8 @@ def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},r for follow in following: if follow.startswith(possibleNickname+'@'): replaceDomain=follow.replace('\n','').split('@')[1] - recipientActor=httpPrefix+"://"+replaceDomain+"/users/"+possibleNickname + recipientActor= \ + httpPrefix+"://"+replaceDomain+"/users/"+possibleNickname if recipientActor not in recipients: recipients.append(recipientActor) tags[wordStr]={ @@ -166,7 +183,11 @@ def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},r 'name': wordStr, 'type': 'Mention' } - replaceMentions[wordStr]="@"+possibleNickname+"" + replaceMentions[wordStr]= \ + "@"+ \ + possibleNickname+"" return True return False possibleNickname=possibleHandle.split('@')[0] @@ -175,7 +196,8 @@ def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},r for follow in following: if follow.replace('\n','')!=possibleHandle: continue - recipientActor=httpPrefix+"://"+possibleDomain+"/users/"+possibleNickname + recipientActor= \ + httpPrefix+"://"+possibleDomain+"/users/"+possibleNickname if recipientActor not in recipients: recipients.append(recipientActor) tags[wordStr]={ @@ -183,13 +205,18 @@ def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},r 'name': wordStr, 'type': 'Mention' } - replaceMentions[wordStr]="@"+possibleNickname+"" + replaceMentions[wordStr]= \ + "@"+possibleNickname+ \ + "" return True # @nick@domain if '@' in possibleHandle: if not (possibleDomain=='localhost' or '.' in possibleDomain): return False - recipientActor=httpPrefix+"://"+possibleDomain+"/users/"+possibleNickname + recipientActor= \ + httpPrefix+"://"+possibleDomain+"/users/"+possibleNickname if recipientActor not in recipients: recipients.append(recipientActor) tags[wordStr]={ @@ -197,7 +224,11 @@ def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},r 'name': wordStr, 'type': 'Mention' } - replaceMentions[wordStr]="@"+possibleNickname+"" + replaceMentions[wordStr]= \ + "@"+possibleNickname+ \ + "" return True return False @@ -244,22 +275,27 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \ # extract mentions and tags from words for wordStr in words: - if addMention(wordStr,httpPrefix,following,replaceMentions,recipients,hashtags): + if addMention(wordStr,httpPrefix,following, \ + replaceMentions,recipients,hashtags): continue - if addHashTags(wordStr,httpPrefix,originalDomain,replaceHashTags,hashtags): + if addHashTags(wordStr,httpPrefix,originalDomain, \ + replaceHashTags,hashtags): continue - if len(wordStr)>2 and wordStr.startswith(':') and wordStr.endswith(':') and not emojiDict: + if len(wordStr)>2 and wordStr.startswith(':') and \ + wordStr.endswith(':') and not emojiDict: print('Loading emoji lookup') # emoji.json is generated so that it can be customized and the changes # will be retained even if default_emoji.json is subsequently updated if not os.path.isfile(baseDir+'/emoji/emoji.json'): - copyfile(baseDir+'/emoji/default_emoji.json',baseDir+'/emoji/emoji.json') + copyfile(baseDir+'/emoji/default_emoji.json', \ + baseDir+'/emoji/emoji.json') with open(baseDir+'/emoji/emoji.json', 'r') as fp: emojiDict=commentjson.load(fp) - addEmoji(baseDir,wordStr,httpPrefix,originalDomain,replaceEmoji,hashtags,emojiDict) + addEmoji(baseDir,wordStr,httpPrefix,originalDomain, \ + replaceEmoji,hashtags,emojiDict) # replace words with their html versions for wordStr,replaceStr in replaceMentions.items(): @@ -273,7 +309,8 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \ content=content.replace(' --linebreak-- ','

') return '

'+content+'

' -def getMentionsFromHtml(htmlText: str,matchStr=" []: +def getMentionsFromHtml(htmlText: str, \ + matchStr=" []: """Extracts mentioned actors from the given html content string """ mentions=[] diff --git a/daemon.py b/daemon.py index 70744f0a..ff4cbf38 100644 --- a/daemon.py +++ b/daemon.py @@ -135,7 +135,7 @@ followsPerPage=12 # number of item shares per page sharesPerPage=12 -def readFollowList(filename: str): +def readFollowList(filename: str) -> []: """Returns a list of ActivityPub addresses to follow """ followlist=[] @@ -171,7 +171,8 @@ class PubServer(BaseHTTPRequestHandler): self.send_header('Content-type', fileFormat) self.send_header('Content-Length', str(length)) self.send_header('Host', self.server.domainFull) - self.send_header('WWW-Authenticate', 'title="Login to Epicyon", Basic realm="epicyon"') + self.send_header('WWW-Authenticate', \ + 'title="Login to Epicyon", Basic realm="epicyon"') self.send_header('X-Robots-Tag','noindex') self.end_headers() @@ -229,7 +230,8 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: WEBFINGER host-meta') if self.path.startswith('/.well-known/host-meta'): - wfResult=webfingerMeta(self.server.httpPrefix,self.server.domainFull) + wfResult= \ + webfingerMeta(self.server.httpPrefix,self.server.domainFull) if wfResult: msg=wfResult.encode('utf-8') self._set_headers('application/xrd+xml',len(msg),None) @@ -237,8 +239,11 @@ class PubServer(BaseHTTPRequestHandler): return if self.server.debug: - print('DEBUG: WEBFINGER lookup '+self.path+' '+str(self.server.baseDir)) - wfResult=webfingerLookup(self.path,self.server.baseDir,self.server.port,self.server.debug) + print('DEBUG: WEBFINGER lookup '+self.path+' '+ \ + str(self.server.baseDir)) + wfResult= \ + webfingerLookup(self.path,self.server.baseDir, \ + self.server.port,self.server.debug) if wfResult: msg=json.dumps(wfResult).encode('utf-8') self._set_headers('application/jrd+json',len(msg),None) @@ -303,35 +308,41 @@ class PubServer(BaseHTTPRequestHandler): attachmentIndex=0 if messageJson['object']['attachment'][attachmentIndex].get('mediaType'): fileExtension='png' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('jpeg'): + mediaTypeStr= \ + messageJson['object']['attachment'][attachmentIndex]['mediaType'] + if mediaTypeStr.endswith('jpeg'): fileExtension='jpg' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('gif'): + elif mediaTypeStr.endswith('gif'): fileExtension='gif' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('audio/mpeg'): + elif mediaTypeStr.endswith('audio/mpeg'): fileExtension='mp3' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('ogg'): + elif mediaTypeStr.endswith('ogg'): fileExtension='ogg' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('mp4'): + elif mediaTypeStr.endswith('mp4'): fileExtension='mp4' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('webm'): + elif mediaTypeStr.endswith('webm'): fileExtension='webm' - if messageJson['object']['attachment'][attachmentIndex]['mediaType'].endswith('ogv'): + elif mediaTypeStr.endswith('ogv'): fileExtension='ogv' - mediaDir=self.server.baseDir+'/accounts/'+self.postToNickname+'@'+self.server.domain + mediaDir= \ + self.server.baseDir+'/accounts/'+ \ + self.postToNickname+'@'+self.server.domain uploadMediaFilename=mediaDir+'/upload.'+fileExtension if not os.path.isfile(uploadMediaFilename): del messageJson['object']['attachment'] else: # generate a path for the uploaded image mPath=getMediaPath() - mediaPath=mPath+'/'+createPassword(32)+'.'+fileExtension + mediaPath= \ + mPath+'/'+createPassword(32)+'.'+fileExtension createMediaDirs(self.server.baseDir,mPath) mediaFilename=self.server.baseDir+'/'+mediaPath # move the uploaded image to its new path os.rename(uploadMediaFilename,mediaFilename) # change the url of the attachment messageJson['object']['attachment'][attachmentIndex]['url']= \ - self.server.httpPrefix+'://'+self.server.domainFull+'/'+mediaPath + self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/'+mediaPath permittedOutboxTypes=[ 'Create','Announce','Like','Follow','Undo', \ @@ -366,7 +377,8 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session for c2s') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain,self.server.port, \ + self.server.useTor) if self.server.debug: print('DEBUG: sending c2s post to followers') sendToFollowers(self.server.session,self.server.baseDir, \ @@ -385,13 +397,16 @@ class PubServer(BaseHTTPRequestHandler): outboxUndoFollow(self.server.baseDir,messageJson,self.server.debug) if self.server.debug: print('DEBUG: handle delegation requests') - outboxDelegate(self.server.baseDir,self.postToNickname,messageJson,self.server.debug) + outboxDelegate(self.server.baseDir,self.postToNickname,messageJson, \ + self.server.debug) if self.server.debug: print('DEBUG: handle skills changes requests') - outboxSkills(self.server.baseDir,self.postToNickname,messageJson,self.server.debug) + outboxSkills(self.server.baseDir,self.postToNickname,messageJson, \ + self.server.debug) if self.server.debug: print('DEBUG: handle availability changes requests') - outboxAvailability(self.server.baseDir,self.postToNickname,messageJson,self.server.debug) + outboxAvailability(self.server.baseDir,self.postToNickname,messageJson, \ + self.server.debug) if self.server.debug: print('DEBUG: handle any like requests') outboxLike(self.server.baseDir,self.server.httpPrefix, \ @@ -434,7 +449,8 @@ class PubServer(BaseHTTPRequestHandler): messageJson,self.server.debug) if self.server.debug: print('DEBUG: sending c2s post to named addresses') - print('c2s sender: '+self.postToNickname+'@'+self.server.domain+':'+str(self.server.port)) + print('c2s sender: '+self.postToNickname+'@'+self.server.domain+ \ + ':'+str(self.server.port)) sendToNamedAddresses(self.server.session,self.server.baseDir, \ self.postToNickname,self.server.domain, \ self.server.port, \ @@ -472,7 +488,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.outboxThread[accountOutboxThreadName].start() return True - def _inboxQueueCleardown(self): + def _inboxQueueCleardown(self) -> None: """ Check if the queue is full and remove oldest items if it is """ if len(self.server.inboxQueue)>=self.server.maxQueueLength: @@ -499,11 +515,15 @@ class PubServer(BaseHTTPRequestHandler): if self.headers.get('Content-type'): headersDict['Content-type']=self.headers['Content-type'] - # For follow activities add a 'to' field, which is a copy of the object field - messageJson,toFieldExists=addToField('Follow',messageJson,self.server.debug) + # For follow activities add a 'to' field, which is a copy of + # the object field + messageJson,toFieldExists= \ + addToField('Follow',messageJson,self.server.debug) - # For like activities add a 'to' field, which is a copy of the actor within the object field - messageJson,toFieldExists=addToField('Like',messageJson,self.server.debug) + # For like activities add a 'to' field, which is a copy of + # the actor within the object field + messageJson,toFieldExists= \ + addToField('Like',messageJson,self.server.debug) pprint(messageJson) @@ -535,9 +555,9 @@ class PubServer(BaseHTTPRequestHandler): tokenStr=self.headers['Cookie'].split('=',1)[1] if self.server.tokensLookup.get(tokenStr): nickname=self.server.tokensLookup[tokenStr] - # check that the path contains the same nickname as the cookie - # otherwise it would be possible to be authorized to use - # an account you don't own + # check that the path contains the same nickname as + # the cookie otherwise it would be possible to be + # authorized to use an account you don't own if '/'+nickname+'/' in self.path: return True if self.path.endswith('/'+nickname): @@ -579,7 +599,8 @@ class PubServer(BaseHTTPRequestHandler): if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain,self.server.port, \ + self.server.useTor) # is this a html request? htmlGET=False @@ -633,8 +654,11 @@ class PubServer(BaseHTTPRequestHandler): # remove a shared item if htmlGET and '?rmshare=' in self.path: shareName=self.path.split('?rmshare=')[1] - actor=self.server.httpPrefix+'://'+self.server.domainFull+self.path.split('?rmshare=')[0] - msg=htmlRemoveSharedItem(self.server.translate,self.server.baseDir,actor,shareName).encode() + actor=self.server.httpPrefix+'://'+self.server.domainFull+ \ + self.path.split('?rmshare=')[0] + msg=htmlRemoveSharedItem(self.server.translate, \ + self.server.baseDir,actor, \ + shareName).encode() if not msg: self._redirect_headers(actor+'/inbox',cookie) self.server.GETbusy=False @@ -689,7 +713,8 @@ class PubServer(BaseHTTPRequestHandler): divertToLoginScreen=False if divertToLoginScreen and not authorized: if self.server.debug: - print('DEBUG: divertToLoginScreen='+str(divertToLoginScreen)) + print('DEBUG: divertToLoginScreen='+ \ + str(divertToLoginScreen)) print('DEBUG: authorized='+str(authorized)) print('DEBUG: path='+self.path) self.send_response(303) @@ -766,7 +791,8 @@ class PubServer(BaseHTTPRequestHandler): mediaImageType='gif' with open(emojiFilename, 'rb') as avFile: mediaBinary = avFile.read() - self._set_headers('image/'+mediaImageType,len(mediaBinary),cookie) + self._set_headers('image/'+mediaImageType, \ + len(mediaBinary),cookie) self.wfile.write(mediaBinary) self.wfile.flush() return @@ -828,7 +854,8 @@ class PubServer(BaseHTTPRequestHandler): mediaFileType='gif' with open(mediaFilename, 'rb') as avFile: mediaBinary = avFile.read() - self._set_headers('image/'+mediaFileType,len(mediaBinary),cookie) + self._set_headers('image/'+mediaFileType, \ + len(mediaBinary),cookie) self.wfile.write(mediaBinary) self.wfile.flush() return @@ -845,7 +872,8 @@ class PubServer(BaseHTTPRequestHandler): if mediaFilename.endswith('.png'): with open(mediaFilename, 'rb') as avFile: mediaBinary = avFile.read() - self._set_headers('image/png',len(mediaBinary),cookie) + self._set_headers('image/png', \ + len(mediaBinary),cookie) self.wfile.write(mediaBinary) self.wfile.flush() return @@ -875,7 +903,8 @@ class PubServer(BaseHTTPRequestHandler): mediaImageType='gif' with open(avatarFilename, 'rb') as avFile: mediaBinary = avFile.read() - self._set_headers('image/'+mediaImageType,len(mediaBinary),cookie) + self._set_headers('image/'+mediaImageType, \ + len(mediaBinary),cookie) self.wfile.write(mediaBinary) self.wfile.flush() return @@ -907,7 +936,8 @@ class PubServer(BaseHTTPRequestHandler): if self.path.startswith('/login') or self.path=='/': # request basic auth - msg=htmlLogin(self.server.translate,self.server.baseDir).encode('utf-8') + msg=htmlLogin(self.server.translate, \ + self.server.baseDir).encode('utf-8') self._login_headers('text/html',len(msg)) self.wfile.write(msg) self.server.GETbusy=False @@ -947,7 +977,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.GETbusy=False return - # search for a fediverse address, shared item or emoji from the web interface by selecting search icon + # search for a fediverse address, shared item or emoji from + # the web interface by selecting search icon if htmlGET and '/users/' in self.path: if self.path.endswith('/search'): # show the search screen @@ -987,11 +1018,13 @@ class PubServer(BaseHTTPRequestHandler): if not self.postToNickname: print('WARN: unable to find nickname in '+actor) self.server.GETbusy=False - self._redirect_headers(actor+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers(actor+'/inbox?page='+ \ + str(pageNumber),cookie) return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain,self.server.port, \ + self.server.useTor) announceJson= \ createAnnounce(self.server.session, \ self.server.baseDir, \ @@ -1034,8 +1067,11 @@ class PubServer(BaseHTTPRequestHandler): return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) - undoAnnounceActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+self.postToNickname + createSession(self.server.domain,self.server.port, \ + self.server.useTor) + undoAnnounceActor= \ + self.server.httpPrefix+'://'+self.server.domainFull+ \ + '/users/'+self.postToNickname newUndoAnnounce = { "@context": "https://www.w3.org/ns/activitystreams", 'actor': undoAnnounceActor, @@ -1056,18 +1092,23 @@ class PubServer(BaseHTTPRequestHandler): return # send a follow request approval from the web interface - if authorized and '/followapprove=' in self.path and self.path.startswith('/users/'): + if authorized and '/followapprove=' in self.path and \ + self.path.startswith('/users/'): originPathStr=self.path.split('/followapprove=')[0] followerNickname=originPathStr.replace('/users/','') followingHandle=self.path.split('/followapprove=')[1] if '@' in followingHandle: if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port, \ + self.server.useTor) manualApproveFollowRequest(self.server.session, \ self.server.baseDir, \ self.server.httpPrefix, \ - followerNickname,self.server.domain,self.server.port, \ + followerNickname, \ + self.server.domain, \ + self.server.port, \ followingHandle, \ self.server.federationList, \ self.server.sendThreads, \ @@ -1082,7 +1123,8 @@ class PubServer(BaseHTTPRequestHandler): return # deny a follow request from the web interface - if authorized and '/followdeny=' in self.path and self.path.startswith('/users/'): + if authorized and '/followdeny=' in self.path and \ + self.path.startswith('/users/'): originPathStr=self.path.split('/followdeny=')[0] followerNickname=originPathStr.replace('/users/','') followingHandle=self.path.split('/followdeny=')[1] @@ -1090,7 +1132,9 @@ class PubServer(BaseHTTPRequestHandler): manualDenyFollowRequest(self.server.session, \ self.server.baseDir, \ self.server.httpPrefix, \ - followerNickname,self.server.domain,self.server.port, \ + followerNickname, \ + self.server.domain, \ + self.server.port, \ followingHandle, \ self.server.federationList, \ self.server.sendThreads, \ @@ -1121,12 +1165,16 @@ class PubServer(BaseHTTPRequestHandler): if not self.postToNickname: print('WARN: unable to find nickname in '+actor) self.server.GETbusy=False - self._redirect_headers(actor+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers(actor+'/inbox?page='+ \ + str(pageNumber),cookie) return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) - likeActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+self.postToNickname + createSession(self.server.domain,self.server.port, \ + self.server.useTor) + likeActor= \ + self.server.httpPrefix+'://'+self.server.domainFull+ \ + '/users/'+self.postToNickname actorLiked=likeUrl.split('/statuses/')[0] likeJson= { "@context": "https://www.w3.org/ns/activitystreams", @@ -1156,12 +1204,16 @@ class PubServer(BaseHTTPRequestHandler): if not self.postToNickname: print('WARN: unable to find nickname in '+actor) self.server.GETbusy=False - self._redirect_headers(actor+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers(actor+'/inbox?page='+ \ + str(pageNumber),cookie) return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) - undoActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+self.postToNickname + createSession(self.server.domain,self.server.port, \ + self.server.useTor) + undoActor= \ + self.server.httpPrefix+'://'+self.server.domainFull+ \ + '/users/'+self.postToNickname actorLiked=likeUrl.split('/statuses/')[0] undoLikeJson= { "@context": "https://www.w3.org/ns/activitystreams", @@ -1190,7 +1242,8 @@ class PubServer(BaseHTTPRequestHandler): deleteUrl=self.path.split('?delete=')[1] if '?' in deleteUrl: deleteUrl=deleteUrl.split('?')[0] - actor=self.server.httpPrefix+'://'+self.server.domainFull+self.path.split('?delete=')[0] + actor=self.server.httpPrefix+'://'+self.server.domainFull+ \ + self.path.split('?delete=')[0] if self.server.allowDeletion or \ deleteUrl.startswith(actor): if self.server.debug: @@ -1282,7 +1335,8 @@ class PubServer(BaseHTTPRequestHandler): replyPageNumber=int(replyPageStr) inReplyToUrl=mentionsList[0] if inReplyToUrl.startswith('sharedesc:'): - shareDescription=inReplyToUrl.replace('sharedesc:','').replace('%20',' ').replace('%40','@').replace('%3A',':').replace('%23','#') + shareDescription= \ + inReplyToUrl.replace('sharedesc:','').replace('%20',' ').replace('%40','@').replace('%3A',':').replace('%23','#') self.path=self.path.split('?replydm=')[0]+'/newdm' if self.server.debug: print('DEBUG: replydm path '+self.path) @@ -1330,14 +1384,18 @@ class PubServer(BaseHTTPRequestHandler): statusNumber=postSections[1] if len(statusNumber)>10 and statusNumber.isdigit(): postFilename= \ - self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/outbox/'+ \ - self.server.httpPrefix+':##'+self.server.domainFull+'#users#'+nickname+'#statuses#'+statusNumber+'.json' + self.server.baseDir+'/accounts/'+nickname+'@'+ \ + self.server.domain+'/outbox/'+ \ + self.server.httpPrefix+':##'+ \ + self.server.domainFull+'#users#'+nickname+ \ + '#statuses#'+statusNumber+'.json' if os.path.isfile(postFilename): postJsonObject={} with open(postFilename, 'r') as fp: postJsonObject=commentjson.load(fp) - # Only authorized viewers get to see likes on posts - # Otherwize marketers could gain more social graph info + # Only authorized viewers get to see likes on + # posts Otherwize marketers could gain more + # social graph info if not authorized: if postJsonObject.get('likes'): postJsonObject['likes']={'items': []} @@ -1345,8 +1403,10 @@ class PubServer(BaseHTTPRequestHandler): msg= \ htmlIndividualPost(self.server.translate, \ self.server.session, \ - self.server.cachedWebfingers,self.server.personCache, \ - nickname,self.server.domain,self.server.port, \ + self.server.cachedWebfingers, \ + self.server.personCache, \ + nickname,self.server.domain, \ + self.server.port, \ authorized,postJsonObject, \ self.server.httpPrefix, \ self.server.projectVersion).encode('utf-8') @@ -1354,7 +1414,8 @@ class PubServer(BaseHTTPRequestHandler): self.wfile.write(msg) else: msg=json.dumps(postJsonObject).encode('utf-8') - self._set_headers('application/json',len(msg),None) + self._set_headers('application/json', \ + len(msg),None) self.wfile.write(msg) self.server.GETbusy=False return @@ -1375,17 +1436,26 @@ class PubServer(BaseHTTPRequestHandler): if len(statusNumber)>10 and statusNumber.isdigit(): #get the replies file boxname='outbox' - postDir=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/'+boxname + postDir=self.server.baseDir+'/accounts/'+ \ + nickname+'@'+self.server.domain+'/'+boxname postRepliesFilename= \ postDir+'/'+ \ - self.server.httpPrefix+':##'+self.server.domainFull+'#users#'+nickname+'#statuses#'+statusNumber+'.replies' + self.server.httpPrefix+':##'+ \ + self.server.domainFull+'#users#'+nickname+ \ + '#statuses#'+statusNumber+'.replies' if not os.path.isfile(postRepliesFilename): # There are no replies, so show empty collection repliesJson = { '@context': 'https://www.w3.org/ns/activitystreams', - 'first': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber+'/replies?page=true', - 'id': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber+'/replies', - 'last': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber+'/replies?page=true', + 'first': self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/users/'+nickname+ \ + '/statuses/'+statusNumber+'/replies?page=true', + 'id': self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/users/'+nickname+ \ + '/statuses/'+statusNumber+'/replies', + 'last': self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/users/'+nickname+ \ + '/statuses/'+statusNumber+'/replies?page=true', 'totalItems': 0, 'type': 'OrderedCollection'} if self._requestHTTP(): @@ -1393,7 +1463,9 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port, \ + self.server.useTor) msg=htmlPostReplies(self.server.translate, \ self.server.baseDir, \ self.server.session, \ @@ -1411,7 +1483,8 @@ class PubServer(BaseHTTPRequestHandler): self.wfile.write(msg) else: msg=json.dumps(repliesJson).encode('utf-8') - self._set_headers('application/json',len(msg),None) + self._set_headers('application/json', \ + len(msg),None) self.wfile.write(msg) self.server.GETbusy=False return @@ -1419,10 +1492,14 @@ class PubServer(BaseHTTPRequestHandler): # replies exist. Itterate through the text file containing message ids repliesJson = { '@context': 'https://www.w3.org/ns/activitystreams', - 'id': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber+'?page=true', + 'id': self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/users/'+nickname+ \ + '/statuses/'+statusNumber+'?page=true', 'orderedItems': [ ], - 'partOf': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber, + 'partOf': self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/users/'+nickname+ \ + '/statuses/'+statusNumber, 'type': 'OrderedCollectionPage'} # populate the items list with replies @@ -1439,7 +1516,9 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port, \ + self.server.useTor) msg=htmlPostReplies(self.server.translate, \ self.server.baseDir, \ self.server.session, \ @@ -1465,14 +1544,17 @@ class PubServer(BaseHTTPRequestHandler): if '/' in namedStatus: postSections=namedStatus.split('/') nickname=postSections[0] - actorFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'.json' + actorFilename= \ + self.server.baseDir+'/accounts/'+nickname+'@'+ \ + self.server.domain+'.json' if os.path.isfile(actorFilename): with open(actorFilename, 'r') as fp: actorJson=commentjson.load(fp) if actorJson.get('roles'): if self._requestHTTP(): getPerson = \ - personLookup(self.server.domain,self.path.replace('/roles',''), \ + personLookup(self.server.domain, \ + self.path.replace('/roles',''), \ self.server.baseDir) if getPerson: msg=htmlProfile(self.server.translate, \ @@ -1502,14 +1584,17 @@ class PubServer(BaseHTTPRequestHandler): if '/' in namedStatus: postSections=namedStatus.split('/') nickname=postSections[0] - actorFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'.json' + actorFilename= \ + self.server.baseDir+'/accounts/'+nickname+'@'+ \ + self.server.domain+'.json' if os.path.isfile(actorFilename): with open(actorFilename, 'r') as fp: actorJson=commentjson.load(fp) if actorJson.get('skills'): if self._requestHTTP(): getPerson = \ - personLookup(self.server.domain,self.path.replace('/skills',''), \ + personLookup(self.server.domain, \ + self.path.replace('/skills',''), \ self.server.baseDir) if getPerson: msg=htmlProfile(self.server.translate, \ @@ -1547,8 +1632,11 @@ class PubServer(BaseHTTPRequestHandler): statusNumber=postSections[2] if len(statusNumber)>10 and statusNumber.isdigit(): postFilename= \ - self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/outbox/'+ \ - self.server.httpPrefix+':##'+self.server.domainFull+'#users#'+nickname+'#statuses#'+statusNumber+'.json' + self.server.baseDir+'/accounts/'+nickname+'@'+ \ + self.server.domain+'/outbox/'+ \ + self.server.httpPrefix+':##'+ \ + self.server.domainFull+'#users#'+nickname+ \ + '#statuses#'+statusNumber+'.json' if os.path.isfile(postFilename): postJsonObject={} readPost=False @@ -1573,8 +1661,10 @@ class PubServer(BaseHTTPRequestHandler): msg=htmlIndividualPost(self.server.translate, \ self.server.baseDir, \ self.server.session, \ - self.server.cachedWebfingers,self.server.personCache, \ - nickname,self.server.domain,self.server.port, \ + self.server.cachedWebfingers, \ + self.server.personCache, \ + nickname,self.server.domain, \ + self.server.port, \ authorized,postJsonObject, \ self.server.httpPrefix, \ self.server.projectVersion).encode('utf-8') @@ -1604,7 +1694,8 @@ class PubServer(BaseHTTPRequestHandler): True,self.server.ocapAlways) if inboxFeed: if self._requestHTTP(): - nickname=self.path.replace('/users/','').replace('/inbox','') + nickname= \ + self.path.replace('/users/','').replace('/inbox','') pageNumber=1 if '?page=' in nickname: pageNumber=nickname.split('?page=')[1] @@ -1670,7 +1761,8 @@ class PubServer(BaseHTTPRequestHandler): True,self.server.ocapAlways) if inboxDMFeed: if self._requestHTTP(): - nickname=self.path.replace('/users/','').replace('/dm','') + nickname= \ + self.path.replace('/users/','').replace('/dm','') pageNumber=1 if '?page=' in nickname: pageNumber=nickname.split('?page=')[1] @@ -1743,8 +1835,10 @@ class PubServer(BaseHTTPRequestHandler): pageNumber=1 if 'page=' not in self.path: # if a page wasn't specified then show the first one - outboxFeed=personBoxJson(self.server.baseDir,self.server.domain, \ - self.server.port,self.path+'?page=1', \ + outboxFeed=personBoxJson(self.server.baseDir, \ + self.server.domain, \ + self.server.port, \ + self.path+'?page=1', \ self.server.httpPrefix, \ maxPostsInFeed, 'outbox', \ authorized, \ @@ -1772,7 +1866,8 @@ class PubServer(BaseHTTPRequestHandler): return # get the moderation feed for a moderator - if self.path.endswith('/moderation') or '/moderation?page=' in self.path: + if self.path.endswith('/moderation') or \ + '/moderation?page=' in self.path: if '/users/' in self.path: if authorized: moderationFeed= \ @@ -1785,7 +1880,8 @@ class PubServer(BaseHTTPRequestHandler): True,self.server.ocapAlways) if moderationFeed: if self._requestHTTP(): - nickname=self.path.replace('/users/','').replace('/moderation','') + nickname= \ + self.path.replace('/users/','').replace('/moderation','') pageNumber=1 if '?page=' in nickname: pageNumber=nickname.split('?page=')[1] @@ -1827,7 +1923,8 @@ class PubServer(BaseHTTPRequestHandler): return else: if self.server.debug: - nickname=self.path.replace('/users/','').replace('/moderation','') + nickname= \ + self.path.replace('/users/','').replace('/moderation','') print('DEBUG: '+nickname+ \ ' was not authorized to access '+self.path) if self.server.debug: @@ -1848,8 +1945,10 @@ class PubServer(BaseHTTPRequestHandler): if '?page=' not in self.path: searchPath=self.path # get a page of shares, not the summary - shares=getSharesFeedForPerson(self.server.baseDir,self.server.domain, \ - self.server.port,self.path+'?page=true', \ + shares=getSharesFeedForPerson(self.server.baseDir, \ + self.server.domain, \ + self.server.port, \ + self.path+'?page=true', \ self.server.httpPrefix, \ sharesPerPage) else: @@ -1857,14 +1956,17 @@ class PubServer(BaseHTTPRequestHandler): if pageNumberStr.isdigit(): pageNumber=int(pageNumberStr) searchPath=self.path.split('?page=')[0] - getPerson = personLookup(self.server.domain,searchPath.replace('/shares',''), \ - self.server.baseDir) + getPerson = \ + personLookup(self.server.domain, \ + searchPath.replace('/shares',''), \ + self.server.baseDir) if getPerson: if not self.server.session: if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port,self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ self.server.baseDir, \ @@ -1898,8 +2000,10 @@ class PubServer(BaseHTTPRequestHandler): if '?page=' not in self.path: searchPath=self.path # get a page of following, not the summary - following=getFollowingFeed(self.server.baseDir,self.server.domain, \ - self.server.port,self.path+'?page=true', \ + following=getFollowingFeed(self.server.baseDir, \ + self.server.domain, \ + self.server.port, \ + self.path+'?page=true', \ self.server.httpPrefix, \ authorized,followsPerPage) else: @@ -1907,14 +2011,17 @@ class PubServer(BaseHTTPRequestHandler): if pageNumberStr.isdigit(): pageNumber=int(pageNumberStr) searchPath=self.path.split('?page=')[0] - getPerson = personLookup(self.server.domain,searchPath.replace('/following',''), \ - self.server.baseDir) + getPerson = \ + personLookup(self.server.domain, \ + searchPath.replace('/following',''), \ + self.server.baseDir) if getPerson: if not self.server.session: if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port,self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ @@ -1948,8 +2055,10 @@ class PubServer(BaseHTTPRequestHandler): if '?page=' not in self.path: searchPath=self.path # get a page of followers, not the summary - followers=getFollowingFeed(self.server.baseDir,self.server.domain, \ - self.server.port,self.path+'?page=1', \ + followers=getFollowingFeed(self.server.baseDir, \ + self.server.domain, \ + self.server.port, \ + self.path+'?page=1', \ self.server.httpPrefix, \ authorized,followsPerPage,'followers') else: @@ -1957,14 +2066,18 @@ class PubServer(BaseHTTPRequestHandler): if pageNumberStr.isdigit(): pageNumber=int(pageNumberStr) searchPath=self.path.split('?page=')[0] - getPerson = personLookup(self.server.domain,searchPath.replace('/followers',''), \ - self.server.baseDir) + getPerson = \ + personLookup(self.server.domain, \ + searchPath.replace('/followers',''), \ + self.server.baseDir) if getPerson: if not self.server.session: if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port, \ + self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ self.server.baseDir, \ @@ -1996,7 +2109,9 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain, \ + self.server.port, \ + self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ self.server.baseDir, \ @@ -2038,7 +2153,7 @@ class PubServer(BaseHTTPRequestHandler): self._404() self.server.GETbusy=False - def do_HEAD(self): + def do_HEAD(self) -> None: self._set_headers('application/json',0,None) def _receiveNewPost(self,authorized: bool,postType: str) -> (int,int): @@ -2047,7 +2162,8 @@ class PubServer(BaseHTTPRequestHandler): # -1 = new post failed # 2 = new post canceled pageNumber=1 - if authorized and '/users/' in self.path and '?'+postType+'?' in self.path: + if authorized and '/users/' in self.path and \ + '?'+postType+'?' in self.path: if '?page=' in self.path: pageNumberStr=self.path.split('?page=')[1] if '?' in pageNumberStr: @@ -2076,9 +2192,10 @@ class PubServer(BaseHTTPRequestHandler): # Instead we use the multipart mime parser from the email module postBytes=self.rfile.read(length) msg = email.parser.BytesParser().parsebytes(postBytes) - # why don't we just use msg.is_multipart(), rather than splitting? - # TL;DR it doesn't work for this use case because we're not using - # email style encoding message/rfc822 + # why don't we just use msg.is_multipart(), + # rather than splitting? TL;DR it doesn't work for this + # use case because we're not using email style encoding + # message/rfc822 messageFields=msg.get_payload(decode=False).split(boundary) fields={} filename=None @@ -2120,14 +2237,17 @@ class PubServer(BaseHTTPRequestHandler): elif extension=='ogg': searchStr=b'Content-Type: audio/ogg' imageLocation=postBytes.find(searchStr) - filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload' + filenameBase= \ + self.server.baseDir+'/accounts/'+ \ + nickname+'@'+self.server.domain+'/upload' if imageLocation>-1: if extension=='jpeg': extension='jpg' if extension=='mpeg': extension='mp3' filename=filenameBase+'.'+extension - attachmentMediaType=searchStr.decode().split('/')[0].replace('Content-Type: ','') + attachmentMediaType= \ + searchStr.decode().split('/')[0].replace('Content-Type: ','') break if filename and imageLocation>-1: # locate the beginning of the image, after any @@ -2146,7 +2266,8 @@ class PubServer(BaseHTTPRequestHandler): filename=None # send the post - if not fields.get('message') and not fields.get('imageDescription'): + if not fields.get('message') and \ + not fields.get('imageDescription'): return -1,pageNumber if fields.get('submitPost'): if fields['submitPost']!='Submit': @@ -2168,8 +2289,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain,self.server.port, \ self.server.httpPrefix, \ fields['message'],False,False,False, \ - filename,attachmentMediaType,fields['imageDescription'],True, \ - fields['replyTo'], fields['replyTo'],fields['subject']) + filename,attachmentMediaType, \ + fields['imageDescription'],True, \ + fields['replyTo'], \ + fields['replyTo'],fields['subject']) if messageJson: self.postToNickname=nickname if self._postToOutbox(messageJson,__version__): @@ -2190,8 +2313,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain,self.server.port, \ self.server.httpPrefix, \ fields['message'],False,False,False, \ - filename,attachmentMediaType,fields['imageDescription'],True, \ - fields['replyTo'], fields['replyTo'],fields['subject']) + filename,attachmentMediaType, \ + fields['imageDescription'],True, \ + fields['replyTo'], \ + fields['replyTo'],fields['subject']) if messageJson: self.postToNickname=nickname if self._postToOutbox(messageJson,__version__): @@ -2212,8 +2337,10 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain,self.server.port, \ self.server.httpPrefix, \ fields['message'],True,False,False, \ - filename,attachmentMediaType,fields['imageDescription'],True, \ - fields['replyTo'], fields['replyTo'],fields['subject']) + filename,attachmentMediaType, \ + fields['imageDescription'],True, \ + fields['replyTo'], \ + fields['replyTo'],fields['subject']) if messageJson: self.postToNickname=nickname if self._postToOutbox(messageJson,__version__): @@ -2233,18 +2360,24 @@ class PubServer(BaseHTTPRequestHandler): messageJson= \ createDirectMessagePost(self.server.baseDir, \ nickname, \ - self.server.domain,self.server.port, \ + self.server.domain, \ + self.server.port, \ self.server.httpPrefix, \ - fields['message'],True,False,False, \ - filename,attachmentMediaType, \ - fields['imageDescription'],True, \ - fields['replyTo'],fields['replyTo'], \ + fields['message'], \ + True,False,False, \ + filename, \ + attachmentMediaType, \ + fields['imageDescription'], \ + True, \ + fields['replyTo'], \ + fields['replyTo'], \ fields['subject'], \ self.server.debug) if messageJson: self.postToNickname=nickname if self.server.debug: - print('DEBUG: new DM to '+str(messageJson['object']['to'])) + print('DEBUG: new DM to '+ \ + str(messageJson['object']['to'])) if self._postToOutbox(messageJson,__version__): populateReplies(self.server.baseDir, \ self.server.httpPrefix, \ @@ -2316,7 +2449,8 @@ class PubServer(BaseHTTPRequestHandler): def do_POST(self): if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.domain,self.server.port, \ + self.server.useTor) if self.server.debug: print('DEBUG: POST to from '+self.server.baseDir+ \ @@ -2340,7 +2474,8 @@ class PubServer(BaseHTTPRequestHandler): # remove any trailing slashes from the path if not self.path.endswith('confirm'): - self.path=self.path.replace('/outbox/','/outbox').replace('/inbox/','/inbox').replace('/shares/','/shares').replace('/sharedInbox/','/sharedInbox') + self.path= \ + self.path.replace('/outbox/','/outbox').replace('/inbox/','/inbox').replace('/shares/','/shares').replace('/sharedInbox/','/sharedInbox') cookie=None if self.headers.get('Cookie'): @@ -2370,18 +2505,23 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy=False return loginParams=self.rfile.read(length).decode('utf-8') - loginNickname,loginPassword,register=htmlGetLoginCredentials(loginParams,self.server.lastLoginTime) + loginNickname,loginPassword,register= \ + htmlGetLoginCredentials(loginParams,self.server.lastLoginTime) if loginNickname: self.server.lastLoginTime=int(time.time()) if register: - if not registerAccount(self.server.baseDir,self.server.httpPrefix, \ - self.server.domain,self.server.port, \ + if not registerAccount(self.server.baseDir, \ + self.server.httpPrefix, \ + self.server.domain, \ + self.server.port, \ loginNickname,loginPassword): self.server.POSTbusy=False self._redirect_headers('/login',cookie) return authHeader=createBasicAuthHeader(loginNickname,loginPassword) - if not authorizeBasic(self.server.baseDir,'/users/'+loginNickname+'/outbox',authHeader,False): + if not authorizeBasic(self.server.baseDir, \ + '/users/'+loginNickname+'/outbox', \ + authHeader,False): print('Login failed: '+loginNickname) # remove any token if self.server.tokens.get(loginNickname): @@ -2414,10 +2554,16 @@ class PubServer(BaseHTTPRequestHandler): # any password changes. if not self.server.salts.get(loginNickname): self.server.salts[loginNickname]=createPassword(32) - self.server.tokens[loginNickname]=sha256((loginNickname+loginPassword+self.server.salts[loginNickname]).encode('utf-8')).hexdigest() + self.server.tokens[loginNickname]= \ + sha256((loginNickname+loginPassword+ \ + self.server.salts[loginNickname]).encode('utf-8')).hexdigest() self.server.tokensLookup[self.server.tokens[loginNickname]]=loginNickname - self.send_header('Set-Cookie', 'epicyon='+self.server.tokens[loginNickname]+'; SameSite=Strict') - self.send_header('Location', '/users/'+loginNickname+'/inbox') + self.send_header('Set-Cookie', \ + 'epicyon='+ \ + self.server.tokens[loginNickname]+ \ + '; SameSite=Strict') + self.send_header('Location', \ + '/users/'+loginNickname+'/inbox') self.send_header('Content-Length', '0') self.send_header('X-Robots-Tag','noindex') self.end_headers() @@ -2486,20 +2632,27 @@ class PubServer(BaseHTTPRequestHandler): # directly search the binary array for the beginning # of an image searchStr=b'Content-Type: image/png' - imageLocation=postBytes.find(searchStr,lastImageLocation) - filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/'+postKey + imageLocation= \ + postBytes.find(searchStr,lastImageLocation) + filenameBase= \ + self.server.baseDir+'/accounts/'+ \ + nickname+'@'+self.server.domain+'/'+postKey # Note: a .temp extension is used here so that at no time is # an image with metadata publicly exposed, even for a few mS if imageLocation>-1: filename=filenameBase+'.png.temp' else: searchStr=b'Content-Type: image/jpeg' - imageLocation=postBytes.find(searchStr,lastImageLocation) + imageLocation= \ + postBytes.find(searchStr, \ + lastImageLocation) if imageLocation>-1: filename=filenameBase+'.jpg.temp' else: searchStr=b'Content-Type: image/gif' - imageLocation=postBytes.find(searchStr,lastImageLocation) + imageLocation= \ + postBytes.find(searchStr, \ + lastImageLocation) if imageLocation>-1: filename=filenameBase+'.gif.temp' if filename and imageLocation>-1: @@ -2513,7 +2666,9 @@ class PubServer(BaseHTTPRequestHandler): break # look for the end of the image - imageLocationEnd=postBytes.find(b'-------',imageLocation+1) + imageLocationEnd= \ + postBytes.find(b'-------', \ + imageLocation+1) fd = open(filename, 'wb') if imageLocationEnd>-1: @@ -2523,11 +2678,14 @@ class PubServer(BaseHTTPRequestHandler): fd.close() # remove exif/metadata - removeMetaData(filename,filename.replace('.temp','')) + removeMetaData(filename, \ + filename.replace('.temp','')) os.remove(filename) lastImageLocation=imageLocation+1 - actorFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'.json' + actorFilename= \ + self.server.baseDir+'/accounts/'+ \ + nickname+'@'+self.server.domain+'.json' if os.path.isfile(actorFilename): with open(actorFilename, 'r') as fp: actorJson=commentjson.load(fp) @@ -2546,11 +2704,13 @@ class PubServer(BaseHTTPRequestHandler): if not actorJson['skills'].get(skillName): actorChanged=True else: - if actorJson['skills'][skillName]!=int(skillValue): + if actorJson['skills'][skillName]!= \ + int(skillValue): actorChanged=True newSkills[skillName]=int(skillValue) skillCtr+=1 - if len(actorJson['skills'].items())!=len(newSkills.items()): + if len(actorJson['skills'].items())!= \ + len(newSkills.items()): actorChanged=True actorJson['skills']=newSkills if fields.get('displayNickname'): @@ -2574,39 +2734,58 @@ class PubServer(BaseHTTPRequestHandler): if fields.get('moderators'): adminNickname=getConfigParam(self.server.baseDir,'admin') if self.path.startswith('/users/'+adminNickname+'/'): - moderatorsFile=self.server.baseDir+'/accounts/moderators.txt' + moderatorsFile= \ + self.server.baseDir+'/accounts/moderators.txt' clearModeratorStatus(self.server.baseDir) if ',' in fields['moderators']: # if the list was given as comma separated modFile=open(moderatorsFile,"w+") for modNick in fields['moderators'].split(','): modNick=modNick.strip() - if os.path.isdir(self.server.baseDir+'/accounts/'+modNick+'@'+self.server.domain): + if os.path.isdir(self.server.baseDir+ \ + '/accounts/'+modNick+ \ + '@'+self.server.domain): modFile.write(modNick+'\n') modFile.close() for modNick in fields['moderators'].split(','): modNick=modNick.strip() - if os.path.isdir(self.server.baseDir+'/accounts/'+modNick+'@'+self.server.domain): - setRole(self.server.baseDir,modNick,self.server.domain,'instance','moderator') + if os.path.isdir(self.server.baseDir+ \ + '/accounts/'+modNick+ \ + '@'+self.server.domain): + setRole(self.server.baseDir, \ + modNick, \ + self.server.domain, \ + 'instance','moderator') else: # nicknames on separate lines modFile=open(moderatorsFile,"w+") for modNick in fields['moderators'].split('\n'): modNick=modNick.strip() - if os.path.isdir(self.server.baseDir+'/accounts/'+modNick+'@'+self.server.domain): + if os.path.isdir(self.server.baseDir+ \ + '/accounts/'+ \ + modNick+'@'+ \ + self.server.domain): modFile.write(modNick+'\n') modFile.close() for modNick in fields['moderators'].split('\n'): modNick=modNick.strip() - if os.path.isdir(self.server.baseDir+'/accounts/'+modNick+'@'+self.server.domain): - setRole(self.server.baseDir,modNick,self.server.domain,'instance','moderator') + if os.path.isdir(self.server.baseDir+ \ + '/accounts/'+ \ + modNick+'@'+ \ + self.server.domain): + setRole(self.server.baseDir, \ + modNick, \ + self.server.domain, \ + 'instance','moderator') approveFollowers=False if fields.get('approveFollowers'): if fields['approveFollowers']=='on': approveFollowers=True - if approveFollowers!=actorJson['manuallyApprovesFollowers']: - actorJson['manuallyApprovesFollowers']=approveFollowers + if approveFollowers!= \ + actorJson['manuallyApprovesFollowers']: + actorJson['manuallyApprovesFollowers']= \ + approveFollowers actorChanged=True if fields.get('isBot'): if fields['isBot']=='on': @@ -2618,7 +2797,9 @@ class PubServer(BaseHTTPRequestHandler): actorJson['type']='Person' actorChanged=True # save filtered words list - filterFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/filters.txt' + filterFilename= \ + self.server.baseDir+'/accounts/'+nickname+ \ + '@'+self.server.domain+'/filters.txt' if fields.get('filteredWords'): with open(filterFilename, "w") as filterfile: filterfile.write(fields['filteredWords']) @@ -2626,7 +2807,9 @@ class PubServer(BaseHTTPRequestHandler): if os.path.isfile(filterFilename): os.remove(filterFilename) # save blocked accounts list - blockedFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/blocking.txt' + blockedFilename= \ + self.server.baseDir+'/accounts/'+nickname+ \ + '@'+self.server.domain+'/blocking.txt' if fields.get('blocked'): with open(blockedFilename, "w") as blockedfile: blockedfile.write(fields['blocked']) @@ -2634,7 +2817,10 @@ class PubServer(BaseHTTPRequestHandler): if os.path.isfile(blockedFilename): os.remove(blockedFilename) # save allowed instances list - allowedInstancesFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/allowedinstances.txt' + allowedInstancesFilename= \ + self.server.baseDir+'/accounts/'+ \ + nickname+'@'+self.server.domain+ \ + '/allowedinstances.txt' if fields.get('allowedInstances'): with open(allowedInstancesFilename, "w") as allowedInstancesFile: allowedInstancesFile.write(fields['allowedInstances']) @@ -2646,8 +2832,13 @@ class PubServer(BaseHTTPRequestHandler): with open(actorFilename, 'w') as fp: commentjson.dump(actorJson, fp, indent=4, sort_keys=False) # also copy to the actors cache and personCache in memory - storePersonInCache(self.server.baseDir,actorJson['id'],actorJson,self.server.personCache) - actorCacheFilename=self.server.baseDir+'/cache/actors/'+actorJson['id'].replace('/','#')+'.json' + storePersonInCache(self.server.baseDir, \ + actorJson['id'], \ + actorJson, \ + self.server.personCache) + actorCacheFilename= \ + self.server.baseDir+'/cache/actors/'+ \ + actorJson['id'].replace('/','#')+'.json' with open(actorCacheFilename, 'w') as fp: commentjson.dump(actorJson, fp, indent=4, sort_keys=False) # send actor update to followers @@ -2679,7 +2870,8 @@ class PubServer(BaseHTTPRequestHandler): if moderationStr.startswith('moderationAction'): if '=' in moderationStr: moderationText=moderationStr.split('=')[1].strip() - moderationText=moderationText.replace('+',' ').replace('%40','@').replace('%3A',':').replace('%23','#').strip() + moderationText= \ + moderationText.replace('+',' ').replace('%40','@').replace('%3A',':').replace('%23','#').strip() elif moderationStr.startswith('submitInfo'): msg=htmlModerationInfo(self.server.translate, \ self.server.baseDir).encode('utf-8') @@ -2708,19 +2900,22 @@ class PubServer(BaseHTTPRequestHandler): if '@' in nickname: nickname=nickname.split('@')[0] if moderationButton=='suspend': - suspendAccount(self.server.baseDir,nickname,self.server.salts) + suspendAccount(self.server.baseDir,nickname, \ + self.server.salts) if moderationButton=='unsuspend': unsuspendAccount(self.server.baseDir,nickname) if moderationButton=='block': fullBlockDomain=None if moderationText.startswith('http') or \ moderationText.startswith('dat'): - blockDomain,blockPort=getDomainFromActor(moderationText) + blockDomain,blockPort= \ + getDomainFromActor(moderationText) fullBlockDomain=blockDomain if blockPort: if blockPort!=80 and blockPort!=443: if ':' not in blockDomain: - fullBlockDomain=blockDomain+':'+str(blockPort) + fullBlockDomain= \ + blockDomain+':'+str(blockPort) if '@' in moderationText: fullBlockDomain=moderationText.split('@')[1] if fullBlockDomain or nickname.startswith('#'): @@ -2778,7 +2973,8 @@ class PubServer(BaseHTTPRequestHandler): # a search was made if (authorized or searchForEmoji) and \ - (self.path.endswith('/searchhandle') or '/searchhandle?page=' in self.path): + (self.path.endswith('/searchhandle') or \ + '/searchhandle?page=' in self.path): # get the page number pageNumber=1 if '/searchhandle?page=' in self.path: @@ -2787,14 +2983,17 @@ class PubServer(BaseHTTPRequestHandler): pageNumber=int(pageNumberStr) self.path=self.path.split('?page=')[0] - actorStr=self.server.httpPrefix+'://'+self.server.domainFull+self.path.replace('/searchhandle','') + actorStr= \ + self.server.httpPrefix+'://'+self.server.domainFull+ \ + self.path.replace('/searchhandle','') length = int(self.headers['Content-length']) searchParams=self.rfile.read(length).decode('utf-8') if 'searchtext=' in searchParams: searchStr=searchParams.split('searchtext=')[1] if '&' in searchStr: searchStr=searchStr.split('&')[0] - searchStr=searchStr.replace('+',' ').replace('%40','@').replace('%3A',':').replace('%23','#').replace('%2F','/').strip() + searchStr= \ + searchStr.replace('+',' ').replace('%40','@').replace('%3A',':').replace('%23','#').replace('%2F','/').strip() if self.server.debug: print('searchStr: '+searchStr) if searchForEmoji: @@ -2803,7 +3002,8 @@ class PubServer(BaseHTTPRequestHandler): # hashtag search hashtagStr= \ htmlHashtagSearch(self.server.translate, \ - self.server.baseDir,searchStr[1:],1, \ + self.server.baseDir, \ + searchStr[1:],1, \ maxPostsInFeed,self.server.session, \ self.server.cachedWebfingers, \ self.server.personCache, \ @@ -2867,7 +3067,8 @@ class PubServer(BaseHTTPRequestHandler): searchStr=searchStr.lower().strip('\n').replace(' emoji','') # emoji search emojiStr= \ - htmlSearchEmoji(self.server.translate,self.server.baseDir,searchStr) + htmlSearchEmoji(self.server.translate, \ + self.server.baseDir,searchStr) if emojiStr: msg=emojiStr.encode('utf-8') self._login_headers('text/html',len(msg)) @@ -2900,7 +3101,8 @@ class PubServer(BaseHTTPRequestHandler): length = int(self.headers['Content-length']) removeShareConfirmParams=self.rfile.read(length).decode('utf-8') if '&submitYes=' in removeShareConfirmParams: - removeShareConfirmParams=removeShareConfirmParams.replace('%3A',':').replace('%2F','/') + removeShareConfirmParams= \ + removeShareConfirmParams.replace('%3A',':').replace('%2F','/') shareActor=removeShareConfirmParams.split('actor=')[1] if '&' in shareActor: shareActor=shareActor.split('&')[0] @@ -2910,7 +3112,8 @@ class PubServer(BaseHTTPRequestHandler): shareNickname=getNicknameFromActor(shareActor) if shareNickname: shareDomain,sharePort=getDomainFromActor(shareActor) - removeShare(self.server.baseDir,shareNickname,shareDomain,shareName) + removeShare(self.server.baseDir,shareNickname, \ + shareDomain,shareName) self._redirect_headers(originPathStr+'/inbox',cookie) self.server.POSTbusy=False return @@ -2922,7 +3125,8 @@ class PubServer(BaseHTTPRequestHandler): length = int(self.headers['Content-length']) removePostConfirmParams=self.rfile.read(length).decode('utf-8') if '&submitYes=' in removePostConfirmParams: - removePostConfirmParams=removePostConfirmParams.replace('%3A',':').replace('%2F','/') + removePostConfirmParams= \ + removePostConfirmParams.replace('%3A',':').replace('%2F','/') removeMessageId=removePostConfirmParams.split('messageId=')[1] if '&' in removeMessageId: removeMessageId=removeMessageId.split('&')[0] @@ -2951,7 +3155,8 @@ class PubServer(BaseHTTPRequestHandler): if pageNumber==1: self._redirect_headers(originPathStr+'/outbox',cookie) else: - self._redirect_headers(originPathStr+'/outbox?page='+str(pageNumber),cookie) + self._redirect_headers(originPathStr+'/outbox?page='+ \ + str(pageNumber),cookie) self.server.POSTbusy=False return @@ -2962,7 +3167,8 @@ class PubServer(BaseHTTPRequestHandler): length = int(self.headers['Content-length']) followConfirmParams=self.rfile.read(length).decode('utf-8') if '&submitYes=' in followConfirmParams: - followingActor=followConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] + followingActor= \ + followConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] if '&' in followingActor: followingActor=followingActor.split('&')[0] followingNickname=getNicknameFromActor(followingActor) @@ -2974,7 +3180,8 @@ class PubServer(BaseHTTPRequestHandler): print('You cannot follow yourself!') else: if self.server.debug: - print('Sending follow request from '+followerNickname+' to '+followingActor) + print('Sending follow request from '+ \ + followerNickname+' to '+followingActor) sendFollowRequest(self.server.session, \ self.server.baseDir, \ followerNickname, \ @@ -3001,7 +3208,8 @@ class PubServer(BaseHTTPRequestHandler): length = int(self.headers['Content-length']) followConfirmParams=self.rfile.read(length).decode('utf-8') if '&submitYes=' in followConfirmParams: - followingActor=followConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] + followingActor= \ + followConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] if '&' in followingActor: followingActor=followingActor.split('&')[0] followingNickname=getNicknameFromActor(followingActor) @@ -3014,7 +3222,9 @@ class PubServer(BaseHTTPRequestHandler): else: if self.server.debug: print(followerNickname+' stops following '+followingActor) - followActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+followerNickname + followActor= \ + self.server.httpPrefix+'://'+ \ + self.server.domainFull+'/users/'+followerNickname statusNumber,published = getStatusNumber() followId=followActor+'/statuses/'+str(statusNumber) unfollowJson = { @@ -3048,7 +3258,8 @@ class PubServer(BaseHTTPRequestHandler): length = int(self.headers['Content-length']) blockConfirmParams=self.rfile.read(length).decode('utf-8') if '&submitYes=' in blockConfirmParams: - blockingActor=blockConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] + blockingActor= \ + blockConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] if '&' in blockingActor: blockingActor=blockingActor.split('&')[0] blockingNickname=getNicknameFromActor(blockingActor) @@ -3071,7 +3282,8 @@ class PubServer(BaseHTTPRequestHandler): else: if self.server.debug: print(blockerNickname+' stops blocking '+blockingActor) - removeBlock(self.server.baseDir,blockerNickname,self.server.domain, \ + removeBlock(self.server.baseDir,blockerNickname, \ + self.server.domain, \ blockingNickname,blockingDomainFull) self._redirect_headers(originPathStr,cookie) self.server.POSTbusy=False @@ -3089,7 +3301,8 @@ class PubServer(BaseHTTPRequestHandler): length = int(self.headers['Content-length']) blockConfirmParams=self.rfile.read(length).decode('utf-8') if '&submitYes=' in blockConfirmParams: - blockingActor=blockConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] + blockingActor= \ + blockConfirmParams.replace('%3A',':').replace('%2F','/').split('actor=')[1] if '&' in blockingActor: blockingActor=blockingActor.split('&')[0] blockingNickname=getNicknameFromActor(blockingActor) @@ -3103,7 +3316,8 @@ class PubServer(BaseHTTPRequestHandler): if blockingPort: if blockingPort!=80 and blockingPort!=443: if ':' not in blockingDomain: - blockingDomainFull=blockingDomain+':'+str(blockingPort) + blockingDomainFull= \ + blockingDomain+':'+str(blockingPort) if blockerNickname==blockingNickname and \ blockingDomain==self.server.domain and \ blockingPort==self.server.port: @@ -3111,8 +3325,10 @@ class PubServer(BaseHTTPRequestHandler): print('You cannot block yourself!') else: if self.server.debug: - print('Adding block by '+blockerNickname+' of '+blockingActor) - addBlock(self.server.baseDir,blockerNickname,self.server.domain, \ + print('Adding block by '+ \ + blockerNickname+' of '+blockingActor) + addBlock(self.server.baseDir,blockerNickname, \ + self.server.domain, \ blockingNickname,blockingDomainFull) self._redirect_headers(originPathStr,cookie) self.server.POSTbusy=False @@ -3130,7 +3346,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy=False return length = int(self.headers['Content-length']) - optionsConfirmParams=self.rfile.read(length).decode('utf-8').replace('%3A',':').replace('%2F','/') + optionsConfirmParams= \ + self.rfile.read(length).decode('utf-8').replace('%3A',':').replace('%2F','/') # page number to return to if 'pageNumber=' in optionsConfirmParams: pageNumberStr=optionsConfirmParams.split('pageNumber=')[1] @@ -3179,8 +3396,10 @@ class PubServer(BaseHTTPRequestHandler): return if '&submitBlock=' in optionsConfirmParams: if self.server.debug: - print('Adding block by '+chooserNickname+' of '+optionsActor) - addBlock(self.server.baseDir,chooserNickname,self.server.domain, \ + print('Adding block by '+ \ + chooserNickname+' of '+optionsActor) + addBlock(self.server.baseDir,chooserNickname, \ + self.server.domain, \ optionsNickname,optionsDomainFull) if '&submitUnblock=' in optionsConfirmParams: if self.server.debug: @@ -3261,7 +3480,8 @@ class PubServer(BaseHTTPRequestHandler): nickname=self.path.split('/users/')[1] if '/' in nickname: nickname=nickname.split('/')[0] - self._redirect_headers('/users/'+nickname+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers('/users/'+nickname+ \ + '/inbox?page='+str(pageNumber),cookie) self.server.POSTbusy=False return postState,pageNumber=self._receiveNewPost(authorized,'newfollowers') @@ -3269,7 +3489,9 @@ class PubServer(BaseHTTPRequestHandler): nickname=self.path.split('/users/')[1] if '/' in nickname: nickname=nickname.split('/')[0] - self._redirect_headers('/users/'+nickname+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers('/users/'+ \ + nickname+'/inbox?page='+ \ + str(pageNumber),cookie) self.server.POSTbusy=False return postState,pageNumber=self._receiveNewPost(authorized,'newdm') @@ -3277,7 +3499,8 @@ class PubServer(BaseHTTPRequestHandler): nickname=self.path.split('/users/')[1] if '/' in nickname: nickname=nickname.split('/')[0] - self._redirect_headers('/users/'+nickname+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers('/users/'+nickname+'/inbox?page='+ \ + str(pageNumber),cookie) self.server.POSTbusy=False return postState,pageNumber=self._receiveNewPost(authorized,'newreport') @@ -3285,7 +3508,8 @@ class PubServer(BaseHTTPRequestHandler): nickname=self.path.split('/users/')[1] if '/' in nickname: nickname=nickname.split('/')[0] - self._redirect_headers('/users/'+nickname+'/inbox?page='+str(pageNumber),cookie) + self._redirect_headers('/users/'+nickname+'/inbox?page='+ \ + str(pageNumber),cookie) self.server.POSTbusy=False return postState,pageNumber=self._receiveNewPost(authorized,'newshare') @@ -3293,7 +3517,8 @@ class PubServer(BaseHTTPRequestHandler): nickname=self.path.split('/users/')[1] if '/' in nickname: nickname=nickname.split('/')[0] - self._redirect_headers('/users/'+nickname+'/shares?page='+str(pageNumber),cookie) + self._redirect_headers('/users/'+nickname+'/shares?page='+ \ + str(pageNumber),cookie) self.server.POSTbusy=False return @@ -3360,7 +3585,9 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy=False return self.postFromNickname=pathUsersSection.split('/')[0] - accountsDir=self.server.baseDir+'/accounts/'+self.postFromNickname+'@'+self.server.domain + accountsDir= \ + self.server.baseDir+'/accounts/'+ \ + self.postFromNickname+'@'+self.server.domain if not os.path.isdir(accountsDir): self.send_response(404) self.end_headers() @@ -3469,7 +3696,9 @@ class PubServer(BaseHTTPRequestHandler): else: self.postToNickname=pathUsersSection.split('/')[0] if self.postToNickname: - queueStatus=self._updateInboxQueue(self.postToNickname,messageJson,messageBytes) + queueStatus= \ + self._updateInboxQueue(self.postToNickname, \ + messageJson,messageBytes) if queueStatus==0: self.send_response(200) self.end_headers() @@ -3492,7 +3721,9 @@ class PubServer(BaseHTTPRequestHandler): else: if self.path == '/sharedInbox' or self.path == '/inbox': print('DEBUG: POST to shared inbox') - queueStatus=self._updateInboxQueue('inbox',messageJson,messageBytes) + queueStatus= \ + self._updateInboxQueue('inbox',messageJson, \ + messageBytes) if queueStatus==0: self.send_response(200) self.end_headers() diff --git a/inbox.py b/inbox.py index c645da14..7d0ae6e7 100644 --- a/inbox.py +++ b/inbox.py @@ -132,7 +132,8 @@ def inboxMessageHasParams(messageJson: {}) -> bool: return False return True -def inboxPermittedMessage(domain: str,messageJson: {},federationList: []) -> bool: +def inboxPermittedMessage(domain: str,messageJson: {}, \ + federationList: []) -> bool: """ check that we are receiving from a permitted domain """ testParam='actor' @@ -160,7 +161,7 @@ def inboxPermittedMessage(domain: str,messageJson: {},federationList: []) -> boo return True -def validPublishedDate(published) -> bool: +def validPublishedDate(published: str) -> bool: currTime=datetime.datetime.utcnow() pubDate=datetime.datetime.strptime(published,"%Y-%m-%dT%H:%M:%SZ") daysSincePublished = (currTime - pubTime).days @@ -387,7 +388,9 @@ def inboxPostRecipientsAdd(baseDir :str,httpPrefix :str,toList :[], \ followerRecipients=True return followerRecipients,recipientsDict -def inboxPostRecipients(baseDir :str,postJsonObject :{},httpPrefix :str,domain : str,port :int, debug :bool) -> ([],[]): +def inboxPostRecipients(baseDir :str,postJsonObject :{}, \ + httpPrefix :str,domain : str,port :int, \ + debug :bool) -> ([],[]): """Returns dictionaries containing the recipients of the given post The shared dictionary contains followers """ @@ -1052,8 +1055,8 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \ postLog: [],cachedWebfingers: {},personCache: {}, \ queue: [],domain: str,port: int,useTor: bool, \ federationList: [],ocapAlways: bool,debug: bool, \ - acceptedCaps: [], - queueFilename :str,destinationFilename :str, + acceptedCaps: [], \ + queueFilename :str,destinationFilename :str, \ maxReplies: int,allowDeletion: bool) -> bool: """ Anything which needs to be done after capabilities checks have passed """ diff --git a/posts.py b/posts.py index 4d2420ab..eb83fe33 100644 --- a/posts.py +++ b/posts.py @@ -372,7 +372,8 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ break return personPosts -def deleteAllPosts(baseDir: str,nickname: str, domain: str,boxname: str) -> None: +def deleteAllPosts(baseDir: str, \ + nickname: str, domain: str,boxname: str) -> None: """Deletes all posts for a person from inbox or outbox """ if boxname!='inbox' and boxname!='outbox': @@ -656,8 +657,9 @@ def outboxMessageCreateWrap(httpPrefix: str, \ httpPrefix+'://'+domain+'/users/'+nickname+'/statuses/'+statusNumber return newPost -def postIsAddressedToFollowers(baseDir: str, - nickname: str, domain: str, port: int,httpPrefix: str, +def postIsAddressedToFollowers(baseDir: str, \ + nickname: str,domain: str, \ + port: int,httpPrefix: str, \ postJsonObject: {}) -> bool: """Returns true if the given post is addressed to followers of the nickname """ @@ -816,13 +818,15 @@ def getMentionedPeople(baseDir: str,httpPrefix: str, \ mentions.append(actor) return mentions -def createDirectMessagePost(baseDir: str, - nickname: str, domain: str, port: int,httpPrefix: str, \ - content: str, followersOnly: bool, saveToFile: bool, +def createDirectMessagePost(baseDir: str, \ + nickname: str,domain: str,port: int, \ + httpPrefix: str, \ + content: str,followersOnly: bool,saveToFile: bool, clientToServer: bool,\ attachImageFilename: str,mediaType: str, \ imageDescription: str,useBlurhash: bool, \ - inReplyTo=None, inReplyToAtomUri=None, subject=None,debug=False) -> {}: + inReplyTo=None,inReplyToAtomUri=None, \ + subject=None,debug=False) -> {}: """Direct Message post """ mentionedPeople=getMentionedPeople(baseDir,httpPrefix,content,domain,debug) @@ -840,9 +844,9 @@ def createDirectMessagePost(baseDir: str, imageDescription,useBlurhash, \ False,inReplyTo, inReplyToAtomUri, subject) -def createReportPost(baseDir: str, - nickname: str, domain: str, port: int,httpPrefix: str, \ - content: str, followersOnly: bool, saveToFile: bool, +def createReportPost(baseDir: str, \ + nickname: str,domain: str,port: int,httpPrefix: str, \ + content: str, followersOnly: bool, saveToFile: bool, \ clientToServer: bool,\ attachImageFilename: str,mediaType: str, \ imageDescription: str,useBlurhash: bool, \ @@ -915,8 +919,9 @@ def createReportPost(baseDir: str, True,None, None, subject) return postJsonObject -def threadSendPost(session,postJsonStr: str,federationList: [],\ - inboxUrl: str, baseDir: str,signatureHeaderJson: {},postLog: [], +def threadSendPost(session,postJsonStr: str,federationList: [], \ + inboxUrl: str, baseDir: str, \ + signatureHeaderJson: {},postLog: [], \ debug :bool) -> None: """Sends a post with exponential backoff """ @@ -955,15 +960,17 @@ def threadSendPost(session,postJsonStr: str,federationList: [],\ tries+=1 def sendPost(projectVersion: str, \ - session,baseDir: str,nickname: str, domain: str, port: int, \ - toNickname: str, toDomain: str, toPort: int, cc: str, \ - httpPrefix: str, content: str, followersOnly: bool, \ - saveToFile: bool, clientToServer: bool, \ + session,baseDir: str,nickname: str,domain: str,port: int, \ + toNickname: str,toDomain: str,toPort: int,cc: str, \ + httpPrefix: str,content: str,followersOnly: bool, \ + saveToFile: bool,clientToServer: bool, \ attachImageFilename: str,mediaType: str, \ imageDescription: str,useBlurhash: bool, \ - federationList: [],\ - sendThreads: [], postLog: [], cachedWebfingers: {},personCache: {}, \ - debug=False,inReplyTo=None,inReplyToAtomUri=None,subject=None) -> int: + federationList: [], \ + sendThreads: [],postLog: [], \ + cachedWebfingers: {},personCache: {}, \ + debug=False,inReplyTo=None, \ + inReplyToAtomUri=None,subject=None) -> int: """Post to another inbox """ withDigest=True @@ -1061,7 +1068,8 @@ def sendPostViaServer(projectVersion: str, \ attachImageFilename: str,mediaType: str, \ imageDescription: str,useBlurhash: bool, \ cachedWebfingers: {},personCache: {}, \ - debug=False,inReplyTo=None,inReplyToAtomUri=None,subject=None) -> int: + debug=False,inReplyTo=None, \ + inReplyToAtomUri=None,subject=None) -> int: """Send a post via a proxy (c2s) """ if not session: @@ -1566,23 +1574,31 @@ def sendToFollowers(session,baseDir: str, \ print('DEBUG: End of sendToFollowers') -def createInbox(baseDir: str,nickname: str,domain: str,port: int,httpPrefix: str, \ - itemsPerPage: int,headerOnly: bool,ocapAlways: bool,pageNumber=None) -> {}: +def createInbox(baseDir: str,nickname: str,domain: str,port: int, \ + httpPrefix: str, \ + itemsPerPage: int,headerOnly: bool, \ + ocapAlways: bool,pageNumber=None) -> {}: return createBoxBase(baseDir,'inbox',nickname,domain,port,httpPrefix, \ itemsPerPage,headerOnly,True,ocapAlways,pageNumber) -def createDMTimeline(baseDir: str,nickname: str,domain: str,port: int,httpPrefix: str, \ - itemsPerPage: int,headerOnly: bool,ocapAlways: bool,pageNumber=None) -> {}: +def createDMTimeline(baseDir: str,nickname: str,domain: str,port: int, \ + httpPrefix: str, \ + itemsPerPage: int,headerOnly: bool, \ + ocapAlways: bool,pageNumber=None) -> {}: return createBoxBase(baseDir,'dm',nickname,domain,port,httpPrefix, \ itemsPerPage,headerOnly,True,ocapAlways,pageNumber) -def createOutbox(baseDir: str,nickname: str,domain: str,port: int,httpPrefix: str, \ - itemsPerPage: int,headerOnly: bool,authorized: bool,pageNumber=None) -> {}: +def createOutbox(baseDir: str,nickname: str,domain: str,port: int, \ + httpPrefix: str, \ + itemsPerPage: int,headerOnly: bool, \ + authorized: bool,pageNumber=None) -> {}: return createBoxBase(baseDir,'outbox',nickname,domain,port,httpPrefix, \ itemsPerPage,headerOnly,authorized,False,pageNumber) -def createModeration(baseDir: str,nickname: str,domain: str,port: int,httpPrefix: str, \ - itemsPerPage: int,headerOnly: bool,ocapAlways: bool,pageNumber=None) -> {}: +def createModeration(baseDir: str,nickname: str,domain: str,port: int, \ + httpPrefix: str, \ + itemsPerPage: int,headerOnly: bool, \ + ocapAlways: bool,pageNumber=None) -> {}: boxDir = createPersonDir(nickname,domain,baseDir,'inbox') boxname='moderation' @@ -1857,7 +1873,8 @@ def createBoxBase(baseDir: str,boxname: str, \ return boxHeader return boxItems -def expireCache(baseDir: str,personCache: {},httpPrefix: str,archiveDir: str,maxPostsInBox=256): +def expireCache(baseDir: str,personCache: {}, \ + httpPrefix: str,archiveDir: str,maxPostsInBox=256): """Thread used to expire actors from the cache and archive old posts """ while True: @@ -1866,7 +1883,8 @@ def expireCache(baseDir: str,personCache: {},httpPrefix: str,archiveDir: str,max expirePersonCache(basedir,personCache) archivePosts(baseDir,httpPrefix,archiveDir,maxPostsInBox) -def archivePosts(baseDir: str,httpPrefix: str,archiveDir: str,maxPostsInBox=256) -> None: +def archivePosts(baseDir: str,httpPrefix: str, \ + archiveDir: str,maxPostsInBox=256) -> None: """Archives posts for all accounts """ if archiveDir: @@ -1899,8 +1917,10 @@ def archivePosts(baseDir: str,httpPrefix: str,archiveDir: str,maxPostsInBox=256) 'outbox',archiveSubdir, \ maxPostsInBox) -def archivePostsForPerson(httpPrefix: str,nickname: str,domain: str,baseDir: str, \ - boxname: str,archiveDir: str,maxPostsInBox=256) -> None: +def archivePostsForPerson(httpPrefix: str,nickname: str,domain: str, \ + baseDir: str, \ + boxname: str,archiveDir: str, \ + maxPostsInBox=256) -> None: """Retain a maximum number of posts within the given box Move any others to an archive directory """ @@ -2005,8 +2025,11 @@ def sendCapabilitiesUpdate(session,baseDir: str,httpPrefix: str, \ sendThreads,postLog,cachedWebfingers, \ personCache,debug,projectVersion) -def populateRepliesJson(baseDir: str,nickname: str,domain: str,postRepliesFilename: str,authorized: bool,repliesJson: {}) -> None: - # populate the items list with replies +def populateRepliesJson(baseDir: str,nickname: str,domain: str, \ + postRepliesFilename: str,authorized: bool, \ + repliesJson: {}) -> None: + """populate the items list with replies + """ repliesBoxes=['outbox','inbox'] with open(postRepliesFilename,'r') as repliesFile: for messageId in repliesFile: