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

More standard terminology

merge-requests/30/head
Bob Mottram 2021-11-22 12:05:09 +00:00
parent 442c4f4daa
commit b6fda529d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inbox.py
View File

@ -17,7 +17,7 @@ from languages import understoodPostLanguage
from like import updateLikesCollection from like import updateLikesCollection
from reaction import updateReactionCollection from reaction import updateReactionCollection
from reaction import validEmojiContent from reaction import validEmojiContent
from utils import malformedCiphertext from utils import invalidCiphertext
from utils import removeHtml from utils import removeHtml
from utils import fileLastModified from utils import fileLastModified
from utils import hasObjectString from utils import hasObjectString
@ -2259,7 +2259,7 @@ def _validPostContent(baseDir: str, nickname: str, domain: str,
print('REJECT: reply to post which does not ' + print('REJECT: reply to post which does not ' +
'allow comments: ' + originalPostId) 'allow comments: ' + originalPostId)
return False return False
if malformedCiphertext(messageJson['object']['content']): if invalidCiphertext(messageJson['object']['content']):
print('REJECT: malformed ciphertext in content') print('REJECT: malformed ciphertext in content')
return False return False
if debug: if debug:

4
utils.py
View File

@ -2653,8 +2653,8 @@ def isPGPEncrypted(content: str) -> bool:
return False return False
def malformedCiphertext(content: str) -> bool: def invalidCiphertext(content: str) -> bool:
"""Returns true if the given content contains a malformed key """Returns true if the given content contains an invalid key
""" """
if '----BEGIN ' in content or '----END ' in content: if '----BEGIN ' in content or '----END ' in content:
if not containsPGPPublicKey(content) and \ if not containsPGPPublicKey(content) and \