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

Instance allow list for receiving DMs

merge-requests/30/head
Bob Mottram 2021-04-22 10:27:20 +01:00
parent dcb5e4d2dd
commit 702fa3167f
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
inbox.py
View File

@ -11,6 +11,7 @@ import os
import datetime import datetime
import time import time
from linked_data_sig import verifyJsonSignature from linked_data_sig import verifyJsonSignature
from utils import dmAllowedFromDomain
from utils import isRecentPost from utils import isRecentPost
from utils import getConfigParam from utils import getConfigParam
from utils import hasUsersPath from utils import hasUsersPath
@ -2466,28 +2467,32 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
if not isFollowingActor(baseDir, if not isFollowingActor(baseDir,
nickname, domain, nickname, domain,
sendH): sendH):
# send back a bounce DM # DMs may always be allowed from some domains
if postJsonObject.get('id') and \ if not dmAllowedFromDomain(baseDir,
postJsonObject.get('object'): nickname, domain,
# don't send bounces back to sendingActorDomain):
# replies to bounce messages # send back a bounce DM
obj = postJsonObject['object'] if postJsonObject.get('id') and \
if isinstance(obj, dict): postJsonObject.get('object'):
if not obj.get('inReplyTo'): # don't send bounces back to
senderPostId = \ # replies to bounce messages
postJsonObject['id'] obj = postJsonObject['object']
_bounceDM(senderPostId, if isinstance(obj, dict):
session, httpPrefix, if not obj.get('inReplyTo'):
baseDir, senderPostId = \
nickname, domain, postJsonObject['id']
port, sendH, _bounceDM(senderPostId,
federationList, session, httpPrefix,
sendThreads, postLog, baseDir,
cachedWebfingers, nickname, domain,
personCache, port, sendH,
translate, debug, federationList,
lastBounceMessage) sendThreads, postLog,
return False cachedWebfingers,
personCache,
translate, debug,
lastBounceMessage)
return False
# dm index will be updated # dm index will be updated
updateIndexList.append('dm') updateIndexList.append('dm')

19
utils.py
View File

@ -2203,3 +2203,22 @@ def loadTranslationsFromFile(baseDir: str, language: str) -> ({}, str):
translationsFile = baseDir + '/translations/' + \ translationsFile = baseDir + '/translations/' + \
systemLanguage + '.json' systemLanguage + '.json'
return loadJson(translationsFile), systemLanguage return loadJson(translationsFile), systemLanguage
def dmAllowedFromDomain(baseDir: str,
nickname: str, domain: str,
sendingActorDomain: str):
"""When a DM is received and the .followDMs flag file exists
Then optionally some domains can be specified as allowed,
regardless of individual follows.
i.e. Mostly you only want DMs from followers, but there are
a few particular instances that you trust
"""
dmAllowedDomainsFilename = \
baseDir + '/accounts/' + \
nickname + '@' + domain + '/dmAllowedDomains.txt'
if not os.path.isfile(dmAllowedDomainsFilename):
return False
if sendingActorDomain + '\n' in open(dmAllowedDomainsFilename).read():
return True
return False