Token between controllers and email fetcher in config

tracim/development.ini.base

@@ -221,6 +221,8 @@ email.reply.imap.port = 993
 email.reply.imap.user = your_imap_user
 email.reply.imap.password = your_imap_password
 email.reply.imap.folder = INBOX
+# Token for communication between mail fetcher and tracim controller
+email.reply.token = mysecuretoken
 # Delay in seconds between each check
 email.reply.delay = 60
 

tracim/tracim/config/app_cfg.py

@@ -376,6 +376,9 @@ class CFG(object):
         self.EMAIL_REPLY_DELAY = int(tg.config.get(
             'email.reply.delay',
         ))
+        self.EMAIL_REPLY_TOKEN = tg.config.get(
+            'email.reply.token',
+        )
 
         self.TRACKER_JS_PATH = tg.config.get(
             'js_tracker_path',

tracim/tracim/controllers/events.py

@@ -7,15 +7,17 @@ from tracim.lib.content import ContentApi
 from tracim.lib.user import UserApi
 from tracim.model.data import ContentType
 
-VALID_TOKEN_VALUE="djkflhqsfhyqsdb fq"
-
 class EventsRestController(RestController):
 
 
     @tg.expose('json')
     def post(self):
         json = request.json_body
-        if 'token' in json and json['token'] == VALID_TOKEN_VALUE:
+
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+
+        if 'token' in json and json['token'] == cfg.EMAIL_REPLY_TOKEN:
             if 'user_mail' not in json or 'content_id' not in json:
                 return {'status': 'error',
                         'error': 'bad json',}

tracim/tracim/lib/daemons.py

@@ -175,6 +175,7 @@ class MailFetcherDaemon(Daemon):
             delay=cfg.EMAIL_REPLY_DELAY,
             # FIXME - G.M - 2017-11-15 - proper tracim url formatting
             endpoint=cfg.WEBSITE_BASE_URL + "/events",
+            token=cfg.EMAIL_REPLY_TOKEN,
         )
         self._fetcher.run()
 

tracim/tracim/lib/email_fetcher.py

@@ -17,7 +17,6 @@ from bs4 import BeautifulSoup
 from email_reply_parser import EmailReplyParser
 
 from tracim.lib.base import logger
-from tracim.controllers.events import VALID_TOKEN_VALUE
 
 TRACIM_SPECIAL_KEY_HEADER = "X-Tracim-Key"
 BS_HTML_BODY_PARSE_CONFIG = {
@@ -168,7 +167,7 @@ class MailFetcher(object):
 
     def __init__(self,
                  host: str, port: str, user: str, password: str, folder: str,
-                 delay: int, endpoint: str) \
+                 delay: int, endpoint: str, token:str) \
             -> None:
         """
         Fetch mail from a mailbox folder through IMAP and add their content to
@@ -181,6 +180,7 @@ class MailFetcher(object):
         :param folder: mail folder where new mail are fetched
         :param delay: seconds to wait before fetching new mail again
         :param endpoint: tracim http endpoint where decoded mail are send.
+        :param token: token to authenticate http connexion
         """
         self._connection = None
         self._mails = []
@@ -191,6 +191,7 @@ class MailFetcher(object):
         self.folder = folder
         self.delay = delay
         self.endpoint = endpoint
+        self.token = token
 
         self._is_active = True
 
@@ -260,7 +261,7 @@ class MailFetcher(object):
         unsended_mail = []
         while self._mails:
             mail = self._mails.pop()
-            msg = {"token": VALID_TOKEN_VALUE,
+            msg = {"token": self.token,
                    "user_mail": mail.get_from_address(),
                    "content_id": mail.get_key(),
                    "payload": {