yannic/stacosys
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of site token retrieved from DB

Browse source
This commit is contained in:
Yax 2021-01-19 18:59:57 +01:00
parent 6b4ae63190
commit 5dca8aafe1
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
stacosys/core/cron.py
View file

@ -19,14 +19,14 @@ template_path = os.path.abspath(os.path.join(current_path, "../templates"))
templater = Templater(template_path) templater = Templater(template_path)
def fetch_mail_answers(lang, mailer, rss): def fetch_mail_answers(lang, mailer, rss, site_token):
for msg in mailer.fetch(): for msg in mailer.fetch():
if re.search(r".*STACOSYS.*\[(\d+)\:(\w+)\]", msg.subject, re.DOTALL): if re.search(r".*STACOSYS.*\[(\d+)\:(\w+)\]", msg.subject, re.DOTALL):
if _reply_comment_email(lang, mailer, rss, msg): if _reply_comment_email(lang, mailer, rss, msg, site_token):
mailer.delete(msg.id) mailer.delete(msg.id)
def _reply_comment_email(lang, mailer, rss, email: Email): def _reply_comment_email(lang, mailer, rss, email: Email, site_token):
m = re.search(r"\[(\d+)\:(\w+)\]", email.subject) m = re.search(r"\[(\d+)\:(\w+)\]", email.subject)
if not m: if not m:
@ -34,6 +34,9 @@ def _reply_comment_email(lang, mailer, rss, email: Email):
return return
comment_id = int(m.group(1)) comment_id = int(m.group(1))
token = m.group(2) token = m.group(2)
if token != site_token:
logger.warn("ignore corrupted email. Unknown token %d" % comment_id)
return
# retrieve site and comment rows # retrieve site and comment rows
try: try:
@ -46,10 +49,6 @@ def _reply_comment_email(lang, mailer, rss, email: Email):
logger.warn("ignore already published email. token %d" % comment_id) logger.warn("ignore already published email. token %d" % comment_id)
return return
if comment.site.token != token:
logger.warn("ignore corrupted email. Unknown token %d" % comment_id)
return
if not email.plain_text_content: if not email.plain_text_content:
logger.warn("ignore empty email") logger.warn("ignore empty email")
return return

2
stacosys/interface/scheduler.py
View file

@ -16,7 +16,7 @@ class JobConfig(object):
{ {
"id": "fetch_mail", "id": "fetch_mail",
"func": "stacosys.core.cron:fetch_mail_answers", "func": "stacosys.core.cron:fetch_mail_answers",
"args": [lang, mailer, rss], "args": [lang, mailer, rss, site_token],
"trigger": "interval", "trigger": "interval",
"seconds": imap_polling_seconds, "seconds": imap_polling_seconds,
}, },