Merge branch 'master' of github.com:tracim/tracim

.gitignore

@@ -70,6 +70,7 @@ wsgidav.conf
 # Temporary files
 *~
 *.sqlite
+*.lock
 
 # npm packages
 /node_modules/

README.md

@@ -102,7 +102,9 @@ If you want your own dedicated instance but do not want to manage it by yourself
 
 In case you prefer using Docker:
 
-    docker run -e DATABASE_TYPE=sqlite -p 80:80 -v /var/tracim/etc:/etc/tracim -v /var/tracim/var:/var/tracim algoo/tracim
+    sudo docker run -e DATABASE_TYPE=sqlite \
+               -p 80:80 -p 3030:3030 -p 5232:5232 \
+               -v /var/tracim/etc:/etc/tracim -v /var/tracim/var:/var/tracim algoo/tracim
 
 ## Install Tracim on your server ##
 
@@ -116,7 +118,7 @@ Following the installation documentation below, you'll be able to run your own i
 
 You'll need to install the following packages :
 
-    sudo apt install git realpath redis-server \
+    sudo apt install git curl realpath redis-server \
                      python3 python-virtualenv python3-dev python-pip  python-lxml \
                      build-essential libxml2-dev libxslt1-dev zlib1g-dev libjpeg-dev \
                      libmagickwand-6.q16-3

bin/setup.sh

@@ -1,75 +0,0 @@
-#!/bin/bash
-
-POD_BIN_PATH=`dirname $0`
-POD_INSTALL_PATH=`dirname ${POD_BIN_PATH}`
-POD_INSTALL_FULL_PATH=`realpath ${POD_INSTALL_PATH}`
-
-echo $POD_BIN_PATH
-echo $POD_INSTALL_PATH
-echo $POD_INSTALL_FULL_PATH
-
-OLD_PATH=`pwd`
-
-
-cd ${POD_INSTALL_FULL_PATH}
-# virtualenv tg2env
-echo
-echo "-------------------------"
-echo "- initializes virtualenv"
-echo "-------------------------"
-echo "-> path:        tg2env/"
-echo "-> interpreter: python3"
-echo
-echo
-virtualenv -p /usr/bin/python3 tg2env
-
-echo
-echo
-echo "-------------------------"
-echo "- activates virtualenv"
-echo "-------------------------"
-source tg2env/bin/activate
-echo
-echo
-
-echo
-echo
-echo "-------------------------"
-echo "- installing turbogears"
-echo "-------------------------"
-pip install -f http://tg.gy/230 tg.devtools
-
-echo
-echo
-
-echo
-echo
-echo "-------------------------"
-echo "- install dependencies"
-echo "-------------------------"
-echo "-> psycopg2"
-echo "-> pillow"
-echo "-> beautifulsoup4"
-echo "-> tw.forms"
-echo "-> tgext.admin"
-pip install psycopg2
-pip install pillow
-pip install beautifulsoup4
-pip install tw.forms
-pip install tgext.admin
-echo
-echo
-
-echo
-echo
-echo "-------------------------"
-echo "- setup project"
-echo "-------------------------"
-cd pod/
-python setup.py develop
-echo
-echo
-
-
-
-cd ${OLD_PATH}

doc/database.md

@@ -57,8 +57,8 @@ Failure output:
 In this case, delete the user and database and start over:
 
     sudo --user=postgres psql \
-         --command="DROP USER tracimuser;" \
-         --command="DROP DATABASE tracimdb;"
+         --command="DROP DATABASE tracimdb;" \
+         --command="DROP USER tracimuser;"
 
 [//]: # (The following lines are only necessary to fix permissions on an existing database:)
 [//]: # (    sudo --user=postgres psql \)
@@ -88,7 +88,7 @@ Connect to `MySQL` with root user (password has been set at "Installation" -> "D
 
 Create a database with following command:
 
-    CREATE DATABASE tracimdb;
+    CREATE DATABASE tracimdb CHARACTER SET = utf8;
 
 Create a user with following command:
 

install/requirements.postgresql.txt

@@ -1 +1 @@
-psycopg2==2.5.4
+psycopg2==2.7.3.2

install/requirements.txt

@@ -17,7 +17,7 @@ WebTest==1.4.2
 alembic==0.8.4
 argparse==1.2.1
 backlash==0.0.7
-beautifulsoup4==4.4.0
+beautifulsoup4==4.6.0
 caldav==0.4.0
 cliff==2.9.1
 cmd2==0.6.9
@@ -57,7 +57,7 @@ unicode-slugify==0.1.3
 vobject==0.9.2
 waitress==0.8.9
 who_ldap==3.2.2
--e git+https://github.com/algoo/wsgidav.git@py3#egg=wsgidav
+wsgidav==2.2.4
 zope.interface==4.1.3
 zope.sqlalchemy==0.7.6
 PyYAML
@@ -65,3 +65,6 @@ redis==2.10.5
 typing==3.5.3.0
 rq==0.7.1
 click==6.7
+markdown==2.6.9
+email_reply_parser==0.5.9
+filelock==2.0.13

tracim/development.ini.base

@@ -190,6 +190,8 @@ email.notification.activated = False
 # notifications generated by a user or another one
 email.notification.from.email = noreply+{user_id}@trac.im
 email.notification.from.default_label = Tracim Notifications
+email.notification.reply_to.email = reply+{content_id}@trac.im
+email.notification.references.email = thread+{content_id}@trac.im
 email.notification.content_update.template.html = %(here)s/tracim/templates/mail/content_update_body_html.mak
 email.notification.content_update.template.text = %(here)s/tracim/templates/mail/content_update_body_text.mak
 email.notification.created_account.template.html = %(here)s/tracim/templates/mail/created_account_body_html.mak
@@ -212,6 +214,24 @@ email.processing_mode = sync
 # email.async.redis.port = 6379
 # email.async.redis.db = 0
 
+# Email reply configuration
+email.reply.activated = False
+email.reply.imap.server = your_imap_server
+email.reply.imap.port = 993
+email.reply.imap.user = your_imap_user
+email.reply.imap.password = your_imap_password
+email.reply.imap.folder = INBOX
+email.reply.imap.use_ssl = true
+# Token for communication between mail fetcher and tracim controller
+email.reply.token = mysecuretoken
+# Delay in seconds between each check
+email.reply.check.heartbeat = 60
+email.reply.use_html_parsing = true
+email.reply.use_txt_parsing = true
+# Lockfile path is required for email_reply feature,
+# it's just an empty file use to prevent concurrent access to imap unseen mail
+email.reply.lockfile_path = %(here)s/email_fetcher.lock
+
 ## Radical (CalDav server) configuration
 # radicale.server.host = 0.0.0.0
 # radicale.server.port = 5232

tracim/setup.py

@@ -86,8 +86,5 @@ setup(
             'mail sender = tracim.command.mail:MailSenderCommend',
         ]
     },
-    dependency_links=[
-        'http://github.com/algoo/preview-generator/tarball/master#egg=preview_generator-1.0',
-    ],
     zip_safe=False,
 )

tracim/tracim/config/app_cfg.py

@@ -28,6 +28,7 @@ from tracim.config import TracimAppConfig
 from tracim.lib.base import logger
 from tracim.lib.daemons import DaemonsManager
 from tracim.lib.daemons import MailSenderDaemon
+from tracim.lib.daemons import MailFetcherDaemon
 from tracim.lib.daemons import RadicaleDaemon
 from tracim.lib.daemons import WsgiDavDaemon
 from tracim.lib.system import InterruptManager
@@ -126,6 +127,9 @@ def start_daemons(manager: DaemonsManager):
     if cfg.EMAIL_PROCESSING_MODE == CFG.CST.ASYNC:
         manager.run('mail_sender', MailSenderDaemon)
 
+    if cfg.EMAIL_REPLY_ACTIVATED:
+        manager.run('mail_fetcher', MailFetcherDaemon)
+
 
 def configure_depot():
     """Configure Depot."""
@@ -299,6 +303,12 @@ class CFG(object):
         self.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL = tg.config.get(
             'email.notification.from.default_label'
         )
+        self.EMAIL_NOTIFICATION_REPLY_TO_EMAIL = tg.config.get(
+            'email.notification.reply_to.email',
+        )
+        self.EMAIL_NOTIFICATION_REFERENCES_EMAIL = tg.config.get(
+            'email.notification.references.email'
+        )
         self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML = tg.config.get(
             'email.notification.content_update.template.html',
         )
@@ -344,6 +354,53 @@ class CFG(object):
             None,
         )
 
+        self.EMAIL_REPLY_ACTIVATED = asbool(tg.config.get(
+            'email.reply.activated',
+            False,
+        ))
+
+        self.EMAIL_REPLY_IMAP_SERVER = tg.config.get(
+            'email.reply.imap.server',
+        )
+        self.EMAIL_REPLY_IMAP_PORT = tg.config.get(
+            'email.reply.imap.port',
+        )
+        self.EMAIL_REPLY_IMAP_USER = tg.config.get(
+            'email.reply.imap.user',
+        )
+        self.EMAIL_REPLY_IMAP_PASSWORD = tg.config.get(
+            'email.reply.imap.password',
+        )
+        self.EMAIL_REPLY_IMAP_FOLDER = tg.config.get(
+            'email.reply.imap.folder',
+        )
+        self.EMAIL_REPLY_CHECK_HEARTBEAT = int(tg.config.get(
+            'email.reply.check.heartbeat',
+            60,
+        ))
+        self.EMAIL_REPLY_TOKEN = tg.config.get(
+            'email.reply.token',
+        )
+        self.EMAIL_REPLY_IMAP_USE_SSL = asbool(tg.config.get(
+            'email.reply.imap.use_ssl',
+        ))
+        self.EMAIL_REPLY_USE_HTML_PARSING = asbool(tg.config.get(
+            'email.reply.use_html_parsing',
+            True,
+        ))
+        self.EMAIL_REPLY_USE_TXT_PARSING = asbool(tg.config.get(
+            'email.reply.use_txt_parsing',
+            True,
+        ))
+        self.EMAIL_REPLY_LOCKFILE_PATH = tg.config.get(
+            'email.reply.lockfile_path',
+            ''
+        )
+        if not self.EMAIL_REPLY_LOCKFILE_PATH and self.EMAIL_REPLY_ACTIVATED:
+            raise Exception(
+                mandatory_msg.format('email.reply.lockfile_path')
+            )
+
         self.TRACKER_JS_PATH = tg.config.get(
             'js_tracker_path',
         )

tracim/tracim/controllers/events.py

@@ -0,0 +1,100 @@
+import tg
+import typing
+from tg import request
+from tg import Response
+from tg import abort
+from tg import RestController
+from sqlalchemy.orm.exc import NoResultFound
+
+from tracim.lib.content import ContentApi
+from tracim.lib.user import UserApi
+from tracim.model.data import ContentType
+from tracim.config.app_cfg import CFG
+
+
+class EventRestController(RestController):
+
+    @tg.expose('json')
+    def post(self) -> Response:
+        cfg = CFG.get_instance()
+
+        try:
+            json = request.json_body
+        except ValueError:
+            return Response(
+                status=400,
+                json_body={'msg': 'Bad json'},
+            )
+
+        if json.get('token', None) != cfg.EMAIL_REPLY_TOKEN:
+            # TODO - G.M - 2017-11-23 - Switch to status 403 ?
+            # 403 is a better status code in this case.
+            # 403 status response can't now return clean json, because they are
+            # handled somewhere else to return html.
+            return Response(
+                status=400,
+                json_body={'msg': 'Invalid token'}
+            )
+
+        if 'user_mail' not in json:
+            return Response(
+                status=400,
+                json_body={'msg': 'Bad json: user_mail is required'}
+            )
+
+        if 'content_id' not in json:
+            return Response(
+                status=400,
+                json_body={'msg': 'Bad json: content_id is required'}
+            )
+
+        if 'payload' not in json:
+            return Response(
+                status=400,
+                json_body={'msg': 'Bad json: payload is required'}
+            )
+
+        uapi = UserApi(None)
+        try:
+            user = uapi.get_one_by_email(json['user_mail'])
+        except NoResultFound:
+            return Response(
+                status=400,
+                json_body={'msg': 'Unknown user email'},
+            )
+        api = ContentApi(user)
+
+        try:
+            thread = api.get_one(json['content_id'],
+                                 content_type=ContentType.Any)
+        except NoResultFound:
+            return Response(
+                status=400,
+                json_body={'msg': 'Unknown content_id'},
+            )
+
+        # INFO - G.M - 2017-11-17
+        # When content_id is a sub-elem of a main content like Comment,
+        # Attach the thread to the main content.
+        if thread.type == ContentType.Comment:
+            thread = thread.parent
+        if thread.type == ContentType.Folder:
+            return Response(
+                status=400,
+                json_body={'msg': 'comment for folder not allowed'},
+            )
+        if 'content' in json['payload']:
+            api.create_comment(
+                workspace=thread.workspace,
+                parent=thread,
+                content=json['payload']['content'],
+                do_save=True,
+            )
+            return Response(
+                status=204,
+            )
+        else:
+            return Response(
+                status=400,
+                json_body={'msg': 'No content to add new comment'},
+            )

tracim/tracim/controllers/root.py

@@ -22,6 +22,7 @@ from tracim.controllers.help import HelpController
 from tracim.controllers.previews import PreviewsController
 from tracim.controllers.user import UserRestController
 from tracim.controllers.workspace import UserWorkspaceRestController
+from tracim.controllers.events import EventRestController
 from tracim.lib import CST
 from tracim.lib.base import logger
 from tracim.lib.content import ContentApi
@@ -61,7 +62,7 @@ class RootController(StandardController):
     previews = PreviewsController()
 
     content = ContentController()
-
+    events = EventRestController()
     # api
     api = APIController()
 
@@ -154,19 +155,6 @@ class RootController(StandardController):
         fake_api.favorites = Context(CTX.CONTENT_LIST).toDict(items, 'contents', 'nb')
         return DictLikeClass(fake_api=fake_api)
 
-        # user_id = tmpl_context.current_user.user_id
-        #
-        # current_user = tmpl_context.current_user
-        # assert user_id==current_user.user_id
-        # api = UserApi(current_user)
-        # current_user = api.get_one(current_user.user_id)
-        # dictified_user = Context(CTX.USER).toDict(current_user, 'user')
-        # current_user_content = Context(CTX.CURRENT_USER).toDict(tmpl_context.current_user)
-        # fake_api_content = DictLikeClass(current_user=current_user_content)
-        # fake_api = Context(CTX.WORKSPACE).toDict(fake_api_content)
-        #
-        # return DictLikeClass(result = dictified_user, fake_api=fake_api)
-
     @require(predicates.not_anonymous())
     @expose('tracim.templates.search.display')
     def search(self, keywords=''):

tracim/tracim/i18n/en/LC_MESSAGES/tracim.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tracim 1.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-09-05 16:27+0200\n"
+"POT-Creation-Date: 2017-11-03 18:06+0100\n"
 "PO-Revision-Date: 2017-09-05 16:31+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -242,7 +242,7 @@ msgstr ""
 msgid "Notification disabled for workspace {}"
 msgstr ""
 
-#: tracim/controllers/user.py:100 tracim/controllers/admin/user.py:207
+#: tracim/controllers/user.py:100 tracim/controllers/admin/user.py:202
 msgid "Empty password is not allowed."
 msgstr ""
 
@@ -250,63 +250,67 @@ msgstr ""
 msgid "The current password you typed is wrong"
 msgstr ""
 
-#: tracim/controllers/user.py:108 tracim/controllers/admin/user.py:211
+#: tracim/controllers/user.py:108 tracim/controllers/admin/user.py:206
 msgid "New passwords do not match."
 msgstr ""
 
-#: tracim/controllers/user.py:115
+#: tracim/controllers/user.py:114
 msgid "Your password has been changed"
 msgstr ""
 
-#: tracim/controllers/user.py:183
+#: tracim/controllers/user.py:182
 msgid "Email already in use"
 msgstr ""
 
-#: tracim/controllers/user.py:197
+#: tracim/controllers/user.py:196
 msgid "profile updated."
 msgstr ""
 
-#: tracim/controllers/admin/user.py:91
+#: tracim/controllers/admin/user.py:85
 msgid "You can't change your own profile"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:98 tracim/controllers/admin/user.py:149
+#: tracim/controllers/admin/user.py:91 tracim/controllers/admin/user.py:144
 msgid "Unknown profile"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:105
+#: tracim/controllers/admin/user.py:99
 msgid "User updated."
 msgstr ""
 
-#: tracim/controllers/admin/user.py:121
+#: tracim/controllers/admin/user.py:115
 msgid "User {} is now a basic user"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:134
+#: tracim/controllers/admin/user.py:128
 msgid "User {} can now workspaces"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:145
+#: tracim/controllers/admin/user.py:138
 msgid "User {} is now an administrator"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:218
+#: tracim/controllers/admin/user.py:212
 msgid "The password has been changed"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:246
+#: tracim/controllers/admin/user.py:241
 msgid "User {}: notification enabled for workspace {}"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:260
+#: tracim/controllers/admin/user.py:255
 msgid "User {}: notification disabled for workspace {}"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:326
+#: tracim/controllers/admin/user.py:322
 msgid "A user with email address \"{}\" already exists."
 msgstr ""
 
-#: tracim/controllers/admin/user.py:358
+#: tracim/controllers/admin/user.py:357
+msgid "User {0} created but email was not sent to {1}"
+msgstr ""
+
+#: tracim/controllers/admin/user.py:360
 msgid "User {} created."
 msgstr ""
 
@@ -314,15 +318,15 @@ msgstr ""
 msgid "User {} updated."
 msgstr ""
 
-#: tracim/controllers/admin/user.py:436
+#: tracim/controllers/admin/user.py:435
 msgid "User {} enabled."
 msgstr ""
 
-#: tracim/controllers/admin/user.py:449
+#: tracim/controllers/admin/user.py:448
 msgid "You can't de-activate your own account"
 msgstr ""
 
-#: tracim/controllers/admin/user.py:454
+#: tracim/controllers/admin/user.py:453
 msgid "User {} disabled"
 msgstr ""
 
@@ -340,37 +344,37 @@ msgstr ""
 msgid "User {} restored in workspace {} as {}"
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:92
+#: tracim/controllers/admin/workspace.py:96
 msgid "User {} added to workspace {} as {}"
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:118
+#: tracim/controllers/admin/workspace.py:129
 msgid "You can't change your own role"
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:122
+#: tracim/controllers/admin/workspace.py:133
 msgid "Unknown role"
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:127
+#: tracim/controllers/admin/workspace.py:138
 msgid "No change found."
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:209
+#: tracim/controllers/admin/workspace.py:224
 msgid "{} workspace created."
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:245
+#: tracim/controllers/admin/workspace.py:260
 msgid "{} workspace updated."
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:270
+#: tracim/controllers/admin/workspace.py:285
 msgid ""
 "{} workspace deleted. In case of error, you can <a class=\"alert-link\" "
 "href=\"{}\">restore it</a>."
 msgstr ""
 
-#: tracim/controllers/admin/workspace.py:283
+#: tracim/controllers/admin/workspace.py:298
 msgid "{} workspace restored."
 msgstr ""
 
@@ -393,72 +397,72 @@ msgstr ""
 msgid "Workspaces"
 msgstr ""
 
-#: tracim/lib/content.py:870
+#: tracim/lib/content.py:875
 msgid "The content did not changed"
 msgstr ""
 
-#: tracim/lib/content.py:1151
+#: tracim/lib/content.py:1156
 msgid "New folder"
 msgstr ""
 
-#: tracim/lib/content.py:1156
+#: tracim/lib/content.py:1161
 msgid "New folder {0}"
 msgstr ""
 
-#: tracim/lib/helpers.py:88
+#: tracim/lib/helpers.py:87
 msgid "{date} at {time}"
 msgstr ""
 
-#: tracim/lib/notifications.py:309
+#: tracim/lib/notifications.py:339
 msgid "<span id=\"content-intro-username\">{}</span> added a comment:"
 msgstr ""
 
-#: tracim/lib/notifications.py:311 tracim/lib/notifications.py:320
+#: tracim/lib/notifications.py:341 tracim/lib/notifications.py:350
 msgid "Answer"
 msgstr ""
 
-#: tracim/lib/notifications.py:317 tracim/lib/notifications.py:338
-#: tracim/lib/notifications.py:371 tracim/lib/notifications.py:379
+#: tracim/lib/notifications.py:347 tracim/lib/notifications.py:368
+#: tracim/lib/notifications.py:401 tracim/lib/notifications.py:409
 msgid "View online"
 msgstr ""
 
-#: tracim/lib/notifications.py:321
+#: tracim/lib/notifications.py:351
 msgid "<span id=\"content-intro-username\">{}</span> started a thread entitled:"
 msgstr ""
 
-#: tracim/lib/notifications.py:326
+#: tracim/lib/notifications.py:356
 msgid "<span id=\"content-intro-username\">{}</span> added a file entitled:"
 msgstr ""
 
-#: tracim/lib/notifications.py:333
+#: tracim/lib/notifications.py:363
 msgid "<span id=\"content-intro-username\">{}</span> added a page entitled:"
 msgstr ""
 
-#: tracim/lib/notifications.py:341
+#: tracim/lib/notifications.py:371
 msgid "<span id=\"content-intro-username\">{}</span> uploaded a new revision."
 msgstr ""
 
-#: tracim/lib/notifications.py:345
+#: tracim/lib/notifications.py:375
 msgid "<span id=\"content-intro-username\">{}</span> updated this page."
 msgstr ""
 
-#: tracim/lib/notifications.py:350 tracim/lib/notifications.py:360
+#: tracim/lib/notifications.py:380 tracim/lib/notifications.py:390
 msgid "<p id=\"content-body-intro\">Here is an overview of the changes:</p>"
 msgstr ""
 
-#: tracim/lib/notifications.py:355
+#: tracim/lib/notifications.py:385
 msgid ""
 "<span id=\"content-intro-username\">{}</span> updated the thread "
 "description."
 msgstr ""
 
-#: tracim/lib/notifications.py:374
+#: tracim/lib/notifications.py:404
 msgid ""
 "<span id=\"content-intro-username\">{}</span> updated the file "
 "description."
 msgstr ""
 
-#: tracim/lib/notifications.py:380
+#: tracim/lib/notifications.py:410
 msgid ""
 "<span id=\"content-intro-username\">{}</span> updated the following "
 "status:"
@@ -472,23 +476,23 @@ msgstr ""
 msgid "You're not allowed to access this resource"
 msgstr ""
 
-#: tracim/lib/workspace.py:192 tracim/templates/home.mak:134
+#: tracim/lib/workspace.py:208 tracim/templates/home.mak:134
 #: tracim/templates/master_no_toolbar_no_login.mak:109
 #: tracim/templates/admin/user_getone.mak:72
 #: tracim/templates/admin/workspace_getall.mak:73
 msgid "Workspace"
 msgstr ""
 
-#: tracim/lib/workspace.py:195 tracim/templates/admin/workspace_getone.mak:13
+#: tracim/lib/workspace.py:211 tracim/templates/admin/workspace_getone.mak:13
 #: tracim/templates/admin/workspace_getone.mak:27
 msgid "Workspace {}"
 msgstr ""
 
-#: tracim/model/auth.py:97
+#: tracim/model/auth.py:101
 msgid "Nobody"
 msgstr ""
 
-#: tracim/model/auth.py:98 tracim/templates/master_authenticated.mak:137
+#: tracim/model/auth.py:102 tracim/templates/master_authenticated.mak:137
 #: tracim/templates/master_no_toolbar_no_login.mak:114
 #: tracim/templates/admin/user_getall.mak:11
 #: tracim/templates/admin/user_getall.mak:20
@@ -496,11 +500,11 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: tracim/model/auth.py:99
+#: tracim/model/auth.py:103
 msgid "Global managers"
 msgstr ""
 
-#: tracim/model/auth.py:100
+#: tracim/model/auth.py:104
 msgid "Administrators"
 msgstr ""
 
@@ -1046,13 +1050,13 @@ msgstr ""
 #: tracim/templates/file/edit.mak:13 tracim/templates/file/edit.mak:14
 #: tracim/templates/folder/getone.mak:151 tracim/templates/page/edit.mak:13
 #: tracim/templates/page/edit.mak:14 tracim/templates/page/forms.mak:16
-#: tracim/templates/workspace/getone.mak:227
+#: tracim/templates/workspace/getone.mak:222
 msgid "Title"
 msgstr ""
 
 #: tracim/templates/user_workspace_forms.mak:54
-#: tracim/templates/file/edit.mak:17 tracim/templates/page/edit.mak:17
-#: tracim/templates/page/forms.mak:20 tracim/templates/workspace/getone.mak:158
+#: tracim/templates/page/edit.mak:17 tracim/templates/page/forms.mak:20
+#: tracim/templates/workspace/getone.mak:158
 msgid "Content"
 msgstr ""
 
@@ -1145,13 +1149,13 @@ msgstr ""
 
 #: tracim/templates/user_workspace_widgets.mak:80
 #: tracim/templates/folder/getone.mak:154
-#: tracim/templates/workspace/getone.mak:226
+#: tracim/templates/workspace/getone.mak:221
 msgid "Type"
 msgstr ""
 
 #: tracim/templates/user_workspace_widgets.mak:82
 #: tracim/templates/folder/getone.mak:152
-#: tracim/templates/workspace/getone.mak:228
+#: tracim/templates/workspace/getone.mak:223
 msgid "Status"
 msgstr ""
 
@@ -1345,7 +1349,8 @@ msgstr ""
 
 #: tracim/templates/admin/workspace_getall.mak:37
 #: tracim/templates/admin/workspace_getall.mak:74
-#: tracim/templates/thread/edit.mak:18 tracim/templates/workspace/edit.mak:17
+#: tracim/templates/file/edit.mak:17 tracim/templates/thread/edit.mak:18
+#: tracim/templates/workspace/edit.mak:17
 msgid "Description"
 msgstr ""
 
@@ -1473,14 +1478,12 @@ msgid ""
 "{last_modification_author})"
 msgstr ""
 
-#: tracim/templates/file/getone.mak:69 tracim/templates/folder/getone.mak:67
-#: tracim/templates/thread/getone.mak:69
-msgid "Vous consultez <b>une version archivée</b> de la page courante."
+#: tracim/templates/file/getone.mak:69
+msgid "You are looking at an <b>archived file</b>."
 msgstr ""
 
-#: tracim/templates/file/getone.mak:76 tracim/templates/folder/getone.mak:74
-#: tracim/templates/thread/getone.mak:78
-msgid "Vous consultez <b>une version supprimée</b> de la page courante."
+#: tracim/templates/file/getone.mak:76
+msgid "You are looking at a <b>deleted file</b>."
 msgstr ""
 
 #: tracim/templates/file/getone.mak:85
@@ -1607,23 +1610,31 @@ msgstr ""
 msgid "folder created on {date} at {time} by <b>{author}</b>"
 msgstr ""
 
+#: tracim/templates/folder/getone.mak:67
+msgid "You are looking at an <b>archived folder</b>."
+msgstr ""
+
+#: tracim/templates/folder/getone.mak:74
+msgid "You are looking at a <b>deleted folder</b>."
+msgstr ""
+
 #: tracim/templates/folder/getone.mak:89
 #: tracim/templates/workspace/getone.mak:163
 msgid "New ..."
 msgstr ""
 
 #: tracim/templates/folder/getone.mak:111
-#: tracim/templates/workspace/getone.mak:201
+#: tracim/templates/workspace/getone.mak:197
 msgid "hide..."
 msgstr ""
 
 #: tracim/templates/folder/getone.mak:121
-#: tracim/templates/workspace/getone.mak:210
+#: tracim/templates/workspace/getone.mak:206
 msgid "filter..."
 msgstr ""
 
 #: tracim/templates/folder/getone.mak:146
-#: tracim/templates/workspace/getone.mak:221
+#: tracim/templates/workspace/getone.mak:216
 msgid "This folder has not yet content."
 msgstr ""
 
@@ -1772,11 +1783,11 @@ msgid ""
 msgstr ""
 
 #: tracim/templates/page/getone.mak:67
-msgid "You are viewing <b>an archived version</b> of the current page."
+msgid "You are looking at an <b>archived page</b>."
 msgstr ""
 
 #: tracim/templates/page/getone.mak:74
-msgid "You are viewing <b>a deleted version</b> of the current page."
+msgid "You are looking at a <b>deleted page</b>."
 msgstr ""
 
 #: tracim/templates/page/getone.mak:83
@@ -1909,6 +1920,14 @@ msgstr ""
 msgid "page created on {date} at {time} by <b>{author}</b>"
 msgstr ""
 
+#: tracim/templates/thread/getone.mak:69
+msgid "You are looking at an <b>archived thread</b>."
+msgstr ""
+
+#: tracim/templates/thread/getone.mak:78
+msgid "You are looking at a <b>deleted thread</b>."
+msgstr ""
+
 #: tracim/templates/thread/getone.mak:119
 msgid "Invert order"
 msgstr ""
@@ -1968,6 +1987,16 @@ msgstr ""
 msgid "Remove this user from the current workspace"
 msgstr ""
 
+#: tracim/templates/widgets/table_row.mak:68
+#: tracim/templates/widgets/table_row.mak:98
+msgid "archived"
+msgstr ""
+
+#: tracim/templates/widgets/table_row.mak:70
+#: tracim/templates/widgets/table_row.mak:100
+msgid "deleted"
+msgstr ""
+
 #: tracim/templates/widgets/ui.mak:12
 msgid "Show trashed items"
 msgstr ""
@@ -2054,7 +2083,7 @@ msgstr ""
 msgid "You are not allowed to create content"
 msgstr ""
 
-#: tracim/templates/workspace/getone.mak:229
+#: tracim/templates/workspace/getone.mak:224
 msgid "Remarques"
 msgstr ""
 
@@ -2066,3 +2095,15 @@ msgstr ""
 msgid "Delete current workspace"
 msgstr ""
 
+#~ msgid "Vous consultez <b>une version archivée</b> de la page courante."
+#~ msgstr ""
+
+#~ msgid "Vous consultez <b>une version supprimée</b> de la page courante."
+#~ msgstr ""
+
+#~ msgid "You are viewing <b>an archived version</b> of the current page."
+#~ msgstr ""
+
+#~ msgid "You are viewing <b>a deleted version</b> of the current page."
+#~ msgstr ""
+

tracim/tracim/lib/base.py

@@ -125,8 +125,8 @@ class Logger(object):
     def debug(self, instance_or_class, message):
         self._logger.debug(Logger.TPL.format(cls=self._txt(instance_or_class), msg=message))
 
-    def error(self, instance_or_class, message):
-        self._logger.error(Logger.TPL.format(cls=self._txt(instance_or_class), msg=message))
+    def error(self, instance_or_class, message, exc_info=0):
+        self._logger.error(Logger.TPL.format(cls=self._txt(instance_or_class), msg=message, exc_info=exc_info))
 
     def info(self, instance_or_class, message):
         self._logger.info(Logger.TPL.format(cls=self._txt(instance_or_class), msg=message))

tracim/tracim/lib/content.py

@@ -222,7 +222,7 @@ class ContentApi(object):
             result = result.filter(Content.type.in_(self.DISPLAYABLE_CONTENTS))
 
         if workspace:
-            result = result.filter(Content.workspace_id==workspace.workspace_id)
+            result = result.filter(Content.workspace_id == workspace.workspace_id)
 
         # Security layer: if user provided, filter
         # with user workspaces privileges
@@ -735,7 +735,10 @@ class ContentApi(object):
         assert content_type is not None# DYN_REMOVE
         assert isinstance(content_type, str) # DYN_REMOVE
 
-        resultset = self._base_query(workspace).order_by(desc(Content.updated))
+        resultset = self._base_query(workspace) \
+            .filter(Content.workspace_id == Workspace.workspace_id) \
+            .filter(Workspace.is_deleted.is_(False)) \
+            .order_by(desc(Content.updated))
 
         if content_type!=ContentType.Any:
             resultset = resultset.filter(Content.type==content_type)
@@ -773,6 +776,8 @@ class ContentApi(object):
 
         not_read_revisions = self._revisions_base_query(workspace) \
             .filter(~ContentRevisionRO.revision_id.in_(read_revision_ids)) \
+            .filter(ContentRevisionRO.workspace_id == Workspace.workspace_id) \
+            .filter(Workspace.is_deleted.is_(False)) \
             .subquery()
 
         not_read_content_ids_query = DBSession.query(

tracim/tracim/lib/daemons.py

@@ -19,6 +19,7 @@ from tracim.lib.base import logger
 from tracim.lib.exceptions import AlreadyRunningDaemon
 
 from tracim.lib.utils import get_rq_queue
+from tracim.lib.email_fetcher import MailFetcher
 
 
 class DaemonsManager(object):
@@ -151,6 +152,46 @@ class Daemon(threading.Thread):
         raise NotImplementedError()
 
 
+class MailFetcherDaemon(Daemon):
+    """
+    Thread containing a daemon who fetch new mail from a mailbox and
+    send http request to a tracim endpoint to handle them.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self._fetcher = None  # type: MailFetcher
+        self.ok = True
+
+    def run(self) -> None:
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+        self._fetcher = MailFetcher(
+            host=cfg.EMAIL_REPLY_IMAP_SERVER,
+            port=cfg.EMAIL_REPLY_IMAP_PORT,
+            user=cfg.EMAIL_REPLY_IMAP_USER,
+            password=cfg.EMAIL_REPLY_IMAP_PASSWORD,
+            use_ssl=cfg.EMAIL_REPLY_IMAP_USE_SSL,
+            folder=cfg.EMAIL_REPLY_IMAP_FOLDER,
+            delay=cfg.EMAIL_REPLY_CHECK_HEARTBEAT,
+            # FIXME - G.M - 2017-11-15 - proper tracim url formatting
+            endpoint=cfg.WEBSITE_BASE_URL + "/events",
+            token=cfg.EMAIL_REPLY_TOKEN,
+            use_html_parsing=cfg.EMAIL_REPLY_USE_HTML_PARSING,
+            use_txt_parsing=cfg.EMAIL_REPLY_USE_TXT_PARSING,
+            lockfile_path=cfg.EMAIL_REPLY_LOCKFILE_PATH,
+        )
+        self._fetcher.run()
+
+    def stop(self) -> None:
+        if self._fetcher:
+            self._fetcher.stop()
+
+    def append_thread_callback(self, callback: collections.Callable) -> None:
+        logger.warning('MailFetcherDaemon not implement append_thread_calback')
+        pass
+
+
 class MailSenderDaemon(Daemon):
     # NOTE: use *args and **kwargs because parent __init__ use strange
     # * parameter
@@ -314,8 +355,8 @@ from tracim.lib.webdav.sql_domain_controller import TracimDomainController
 from inspect import isfunction
 import traceback
 
-from wsgidav.server.cherrypy import wsgiserver
-from wsgidav.server.cherrypy.wsgiserver.wsgiserver3 import CherryPyWSGIServer
+from cherrypy import wsgiserver
+from cherrypy.wsgiserver import CherryPyWSGIServer
 
 DEFAULT_CONFIG_FILE = "wsgidav.conf"
 PYTHON_VERSION = "%s.%s.%s" % (sys.version_info[0], sys.version_info[1], sys.version_info[2])

tracim/tracim/lib/email.py

@@ -4,6 +4,7 @@ import typing
 from email.message import Message
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
+from email.utils import formataddr
 
 from mako.template import Template
 from tg.i18n import ugettext as _
@@ -156,11 +157,11 @@ class EmailManager(object):
             )
         message = MIMEMultipart('alternative')
         message['Subject'] = subject
-        message['From'] = '{0} <{1}>'.format(
+        message['From'] = formataddr((
             self._global_config.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL,
             self._global_config.EMAIL_NOTIFICATION_FROM_EMAIL,
-        )
-        message['To'] = user.email
+        ))
+        message['To'] = formataddr((user.get_display_name(), user.email))
 
         text_template_file_path = self._global_config.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_TEXT  # nopep8
         html_template_file_path = self._global_config.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_HTML  # nopep8

tracim/tracim/lib/email_fetcher.py

@@ -0,0 +1,434 @@
+# -*- coding: utf-8 -*-
+
+import time
+import imaplib
+import json
+import typing
+from email import message_from_bytes
+from email.header import decode_header
+from email.header import make_header
+from email.message import Message
+from email.utils import parseaddr
+
+import filelock
+import markdown
+import requests
+from email_reply_parser import EmailReplyParser
+from tracim.lib.base import logger
+from tracim.lib.email_processing.parser import ParsedHTMLMail
+from tracim.lib.email_processing.sanitizer import HtmlSanitizer
+
+TRACIM_SPECIAL_KEY_HEADER = 'X-Tracim-Key'
+CONTENT_TYPE_TEXT_PLAIN = 'text/plain'
+CONTENT_TYPE_TEXT_HTML = 'text/html'
+
+IMAP_SEEN_FLAG = '\\Seen'
+IMAP_CHECKED_FLAG = '\\Flagged'
+MAIL_FETCHER_FILELOCK_TIMEOUT = 10
+
+
+class MessageContainer(object):
+    def __init__(self, message: Message, uid: int) -> None:
+        self.message = message
+        self.uid = uid
+
+
+class DecodedMail(object):
+    def __init__(self, message: Message, uid: int=None) -> None:
+        self._message = message
+        self.uid = uid
+
+    def _decode_header(self, header_title: str) -> typing.Optional[str]:
+        # FIXME : Handle exception
+        if header_title in self._message:
+            return str(make_header(decode_header(self._message[header_title])))
+        else:
+            return None
+
+    def get_subject(self) -> typing.Optional[str]:
+        return self._decode_header('subject')
+
+    def get_from_address(self) -> str:
+        return parseaddr(self._message['From'])[1]
+
+    def get_to_address(self) -> str:
+        return parseaddr(self._message['To'])[1]
+
+    def get_first_ref(self) -> str:
+        return parseaddr(self._message['References'])[1]
+
+    def get_special_key(self) -> typing.Optional[str]:
+        return self._decode_header(TRACIM_SPECIAL_KEY_HEADER)
+
+    def get_body(
+            self,
+            use_html_parsing=True,
+            use_txt_parsing=True,
+    ) -> typing.Optional[str]:
+        body_part = self._get_mime_body_message()
+        body = None
+        if body_part:
+            charset = body_part.get_content_charset('iso-8859-1')
+            content_type = body_part.get_content_type()
+            if content_type == CONTENT_TYPE_TEXT_PLAIN:
+                txt_body = body_part.get_payload(decode=True).decode(
+                    charset)
+                if use_txt_parsing:
+                    txt_body = EmailReplyParser.parse_reply(txt_body)
+                html_body = markdown.markdown(txt_body)
+                body = HtmlSanitizer.sanitize(html_body)
+
+            elif content_type == CONTENT_TYPE_TEXT_HTML:
+                html_body = body_part.get_payload(decode=True).decode(
+                    charset)
+                if use_html_parsing:
+                    html_body = str(ParsedHTMLMail(html_body))
+                body = HtmlSanitizer.sanitize(html_body)
+
+        return body
+
+    def _get_mime_body_message(self) -> typing.Optional[Message]:
+        # TODO - G.M - 2017-11-16 - Use stdlib msg.get_body feature for py3.6+
+        part = None
+        # Check for html
+        for part in self._message.walk():
+            content_type = part.get_content_type()
+            content_dispo = str(part.get('Content-Disposition'))
+            if content_type == CONTENT_TYPE_TEXT_HTML \
+                    and 'attachment' not in content_dispo:
+                return part
+        # check for plain text
+        for part in self._message.walk():
+            content_type = part.get_content_type()
+            content_dispo = str(part.get('Content-Disposition'))
+            if content_type == CONTENT_TYPE_TEXT_PLAIN \
+                    and 'attachment' not in content_dispo:
+                return part
+        return part
+
+    def get_key(self) -> typing.Optional[str]:
+
+        """
+        key is the string contain in some mail header we need to retrieve.
+        First try checking special header, them check 'to' header
+        and finally check first(oldest) mail-id of 'references' header
+        """
+        first_ref = self.get_first_ref()
+        to_address = self.get_to_address()
+        special_key = self.get_special_key()
+
+        if special_key:
+            return special_key
+        if to_address:
+            return DecodedMail.find_key_from_mail_address(to_address)
+        if first_ref:
+            return DecodedMail.find_key_from_mail_address(first_ref)
+
+        return None
+
+    @classmethod
+    def find_key_from_mail_address(
+        cls,
+        mail_address: str,
+    ) -> typing.Optional[str]:
+        """ Parse mail_adress-like string
+        to retrieve key.
+
+        :param mail_address: user+key@something like string
+        :return: key
+        """
+        username = mail_address.split('@')[0]
+        username_data = username.split('+')
+        if len(username_data) == 2:
+            return username_data[1]
+        return None
+
+
+class MailFetcher(object):
+    def __init__(
+        self,
+        host: str,
+        port: str,
+        user: str,
+        password: str,
+        use_ssl: bool,
+        folder: str,
+        delay: int,
+        endpoint: str,
+        token: str,
+        use_html_parsing: bool,
+        use_txt_parsing: bool,
+        lockfile_path: str,
+    ) -> None:
+        """
+        Fetch mail from a mailbox folder through IMAP and add their content to
+        Tracim through http according to mail Headers.
+        Fetch is regular.
+        :param host: imap server hostname
+        :param port: imap connection port
+        :param user: user login of mailbox
+        :param password: user password of mailbox
+        :param use_ssl: use imap over ssl connection
+        :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
+        :param use_html_parsing: parse html mail
+        :param use_txt_parsing: parse txt mail
+        """
+        self._connection = None
+        self.host = host
+        self.port = port
+        self.user = user
+        self.password = password
+        self.use_ssl = use_ssl
+        self.folder = folder
+        self.delay = delay
+        self.endpoint = endpoint
+        self.token = token
+        self.use_html_parsing = use_html_parsing
+        self.use_txt_parsing = use_txt_parsing
+        self.lock = filelock.FileLock(lockfile_path)
+        self._is_active = True
+
+    def run(self) -> None:
+        logger.info(self, 'Starting MailFetcher')
+        while self._is_active:
+            logger.debug(self, 'sleep for {}'.format(self.delay))
+            time.sleep(self.delay)
+            try:
+                self._connect()
+                with self.lock.acquire(
+                        timeout=MAIL_FETCHER_FILELOCK_TIMEOUT
+                ):
+                    messages = self._fetch()
+                cleaned_mails = [DecodedMail(m.message, m.uid)
+                                 for m in messages]
+                self._notify_tracim(cleaned_mails)
+                self._disconnect()
+            except filelock.Timeout as e:
+                log = 'Mail Fetcher Lock Timeout {}'
+                logger.warning(self, log.format(e.__str__()))
+            except Exception as e:
+                # TODO - G.M - 2017-11-23 - Identify possible exceptions
+                log = 'IMAP error: {}'
+                logger.warning(self, log.format(e.__str__()))
+
+    def stop(self) -> None:
+        self._is_active = False
+
+    def _connect(self) -> None:
+        # TODO - G.M - 2017-11-15 Verify connection/disconnection
+        # Are old connexion properly close this way ?
+        if self._connection:
+            logger.debug(self, 'Disconnect from IMAP')
+            self._disconnect()
+        # TODO - G.M - 2017-11-23 Support for predefined SSLContext ?
+        # without ssl_context param, tracim use default security configuration
+        # which is great in most case.
+        if self.use_ssl:
+            logger.debug(self, 'Connect IMAP {}:{} using SSL'.format(
+                self.host,
+                self.port,
+            ))
+            self._connection = imaplib.IMAP4_SSL(self.host, self.port)
+        else:
+            logger.debug(self, 'Connect IMAP {}:{}'.format(
+                self.host,
+                self.port,
+            ))
+            self._connection = imaplib.IMAP4(self.host, self.port)
+
+        try:
+            logger.debug(self, 'Login IMAP with login {}'.format(
+                self.user,
+            ))
+            self._connection.login(self.user, self.password)
+        except Exception as e:
+            log = 'Error during execution: {}'
+            logger.error(self, log.format(e.__str__()), exc_info=1)
+
+    def _disconnect(self) -> None:
+        if self._connection:
+            self._connection.close()
+            self._connection.logout()
+            self._connection = None
+
+    def _fetch(self) -> typing.List[MessageContainer]:
+        """
+        Get news message from mailbox
+        :return: list of new mails
+        """
+        messages = []
+        # select mailbox
+        logger.debug(self, 'Fetch messages from folder {}'.format(
+            self.folder,
+        ))
+        rv, data = self._connection.select(self.folder)
+        logger.debug(self, 'Response status {}'.format(
+            rv,
+        ))
+        if rv == 'OK':
+            # get mails
+            # TODO - G.M -  2017-11-15 Which files to select as new file ?
+            # Unseen file or All file from a directory (old one should be
+            #  moved/ deleted from mailbox during this process) ?
+            logger.debug(self, 'Fetch unseen messages')
+
+            rv, data = self._connection.search(None, "(UNSEEN)")
+            logger.debug(self, 'Response status {}'.format(
+                rv,
+            ))
+            if rv == 'OK':
+                # get mail content
+                logger.debug(self, 'Found {} unseen mails'.format(
+                    len(data[0].split()),
+                ))
+                for uid in data[0].split():
+                    # INFO - G.M - 2017-12-08 - Fetch BODY.PEEK[]
+                    # Retrieve all mail(body and header) but don't set mail
+                    # as seen because of PEEK
+                    # see rfc3501
+                    logger.debug(self, 'Fetch mail "{}"'.format(
+                        uid,
+                    ))
+                    rv, data = self._connection.fetch(uid, 'BODY.PEEK[]')
+                    logger.debug(self, 'Response status {}'.format(
+                        rv,
+                    ))
+                    if rv == 'OK':
+                        msg = message_from_bytes(data[0][1])
+                        msg_container = MessageContainer(msg, uid)
+                        messages.append(msg_container)
+                        self._set_flag(uid, IMAP_SEEN_FLAG)
+                    else:
+                        log = 'IMAP : Unable to get mail : {}'
+                        logger.error(self, log.format(str(rv)))
+            else:
+                log = 'IMAP : Unable to get unseen mail : {}'
+                logger.error(self, log.format(str(rv)))
+        else:
+            log = 'IMAP : Unable to open mailbox : {}'
+            logger.error(self, log.format(str(rv)))
+        return messages
+
+    def _notify_tracim(
+        self,
+        mails: typing.List[DecodedMail],
+    ) -> None:
+        """
+        Send http request to tracim endpoint
+        :param mails: list of mails to send
+        :return: unsended mails
+        """
+        logger.debug(self, 'Notify tracim about {} new responses'.format(
+            len(mails),
+        ))
+        unsended_mails = []
+        # TODO BS 20171124: Look around mail.get_from_address(), mail.get_key()
+        # , mail.get_body() etc ... for raise InvalidEmailError if missing
+        #  required informations (actually get_from_address raise IndexError
+        #  if no from address for example) and catch it here
+        while mails:
+            mail = mails.pop()
+            body =  mail.get_body(
+                use_html_parsing=self.use_html_parsing,
+                use_txt_parsing=self.use_txt_parsing,
+            )
+            from_address = mail.get_from_address()
+
+            # don't create element for 'empty' mail
+            if not body:
+                logger.warning(
+                    self,
+                    'Mail from {} has not valable content'.format(
+                        from_address
+                    ),
+                )
+                continue
+
+            msg = {'token': self.token,
+                   'user_mail': from_address,
+                   'content_id': mail.get_key(),
+                   'payload': {
+                       'content': body,
+                   }}
+            try:
+                logger.debug(
+                    self,
+                    'Contact API on {} with body {}'.format(
+                        self.endpoint,
+                        json.dumps(msg),
+                    ),
+                )
+                r = requests.post(self.endpoint, json=msg)
+                if r.status_code not in [200, 204]:
+                    details = r.json().get('msg')
+                    log = 'bad status code {} response when sending mail to tracim: {}'  # nopep8
+                    logger.error(self, log.format(
+                        str(r.status_code),
+                        details,
+                    ))
+                # Flag all correctly checked mail, unseen the others
+                if r.status_code in [200, 204, 400]:
+                    self._set_flag(mail.uid, IMAP_CHECKED_FLAG)
+                else:
+                    self._unset_flag(mail.uid, IMAP_SEEN_FLAG)
+            # TODO - G.M - Verify exception correctly works
+            except requests.exceptions.Timeout as e:
+                log = 'Timeout error to transmit fetched mail to tracim : {}'
+                logger.error(self, log.format(str(e)))
+                unsended_mails.append(mail)
+                self._unset_flag(mail.uid, IMAP_SEEN_FLAG)
+            except requests.exceptions.RequestException as e:
+                log = 'Fail to transmit fetched mail to tracim : {}'
+                logger.error(self, log.format(str(e)))
+                self._unset_flag(mail.uid, IMAP_SEEN_FLAG)
+
+    def _set_flag(
+            self,
+            uid: int,
+            flag: str,
+            ) -> None:
+        assert uid is not None
+
+        rv, data = self._connection.store(
+            uid,
+            '+FLAGS',
+            flag,
+        )
+        if rv == 'OK':
+            log = 'Message {uid} set as {flag}.'.format(
+                uid=uid,
+                flag=flag)
+            logger.debug(self, log)
+        else:
+            log = 'Can not set Message {uid} as {flag} : {rv}'.format(
+                uid=uid,
+                flag=flag,
+                rv=rv)
+            logger.error(self, log)
+
+    def _unset_flag(
+            self,
+            uid: int,
+            flag: str,
+            ) -> None:
+        assert uid is not None
+
+        rv, data = self._connection.store(
+            uid,
+            '-FLAGS',
+            flag,
+        )
+        if rv == 'OK':
+            log = 'Message {uid} unset as {flag}.'.format(
+                uid=uid,
+                flag=flag)
+            logger.debug(self, log)
+        else:
+            log = 'Can not unset Message {uid} as {flag} : {rv}'.format(
+                uid=uid,
+                flag=flag,
+                rv=rv)
+            logger.error(self, log)

tracim/tracim/lib/email_processing/checkers.py

@@ -0,0 +1,211 @@
+# -*- coding: utf-8 -*-
+import typing
+
+from bs4 import Tag, NavigableString
+
+
+class ProprietaryHTMLAttrValues(object):
+    """
+    This are all Proprietary (mail client specific) html attr value we need to
+    check Html Elements
+    """
+    # Gmail
+    Gmail_extras_class = 'gmail_extra'
+    Gmail_quote_class = 'gmail_quote'
+    Gmail_signature_class = 'gmail_signature'
+    # Thunderbird
+    Thunderbird_quote_prefix_class = 'moz-cite-prefix'
+    Thunderbird_signature_class = 'moz-signature'
+    # Outlook.com
+    Outlook_com_quote_id = 'divRplyFwdMsg'
+    Outlook_com_signature_id = 'Signature'
+    Outlook_com_wrapper_id = 'divtagdefaultwrapper'
+    # Yahoo
+    Yahoo_quote_class = 'yahoo_quoted'
+    # Roundcube
+    # INFO - G.M - 2017-11-29 - New tag
+    # see : https://github.com/roundcube/roundcubemail/issues/6049
+    Roundcube_quote_prefix_class = 'reply-intro'
+
+
+class HtmlChecker(object):
+
+    @classmethod
+    def _has_attr_value(
+            cls,
+            elem: typing.Union[Tag, NavigableString],
+            attribute_name: str,
+            attribute_value: str,
+    )-> bool:
+        """
+        Check if elem contains attribute named attribute_name with
+        attribute_value : example <a id="ident"> elem contain attribute
+        with id as attribute_name and ident as attribute_value.
+        Checking is not case_sensitive.
+
+        :param elem: Tag or String Html Element
+        :param attribute_name: Html attribute name
+        :param attribute_value: Html attribute value
+        :return: True only if Element contain this attribute.
+        """
+        if isinstance(elem, Tag) and attribute_name in elem.attrs:
+            # INFO - G.M - 2017-12-01 - attrs[value}] can be string or list
+            # use get_attribute_list to always check in a list
+            # see https://www.crummy.com/software/BeautifulSoup/bs4/doc/#multi-valued-attributes # nopep8
+            values_lower = [value.lower()
+                            for value
+                            in elem.get_attribute_list(attribute_name)]
+            return attribute_value.lower() in values_lower
+        return False
+
+
+class HtmlMailQuoteChecker(HtmlChecker):
+    """
+    Check if one HTML Element from Body Mail look-like a quote or not.
+    """
+    @classmethod
+    def is_quote(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        return cls._is_standard_quote(elem) \
+               or cls._is_thunderbird_quote(elem) \
+               or cls._is_gmail_quote(elem) \
+               or cls._is_outlook_com_quote(elem) \
+               or cls._is_yahoo_quote(elem) \
+               or cls._is_roundcube_quote(elem)
+
+    @classmethod
+    def _is_standard_quote(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        if isinstance(elem, Tag) \
+                and elem.name.lower() == 'blockquote':
+            return True
+        return False
+
+    @classmethod
+    def _is_thunderbird_quote(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        return cls._has_attr_value(
+            elem,
+            'class',
+            ProprietaryHTMLAttrValues.Thunderbird_quote_prefix_class)
+
+    @classmethod
+    def _is_gmail_quote(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        if cls._has_attr_value(
+                elem,
+                'class',
+                ProprietaryHTMLAttrValues.Gmail_extras_class):
+            for child in elem.children:
+                if cls._has_attr_value(
+                        child,
+                        'class',
+                        ProprietaryHTMLAttrValues.Gmail_quote_class):
+                    return True
+        return False
+
+    @classmethod
+    def _is_outlook_com_quote(
+        cls,
+        elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        if cls._has_attr_value(
+                elem,
+                'id',
+                ProprietaryHTMLAttrValues.Outlook_com_quote_id):
+            return True
+        return False
+
+    @classmethod
+    def _is_yahoo_quote(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        return cls._has_attr_value(
+            elem,
+            'class',
+            ProprietaryHTMLAttrValues.Yahoo_quote_class)
+
+    @classmethod
+    def _is_roundcube_quote(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        return cls._has_attr_value(
+            elem,
+            'id',
+            ProprietaryHTMLAttrValues.Roundcube_quote_prefix_class)
+
+
+class HtmlMailSignatureChecker(HtmlChecker):
+    """
+    Check if one HTML Element from Body Mail look-like a signature or not.
+    """
+
+    @classmethod
+    def is_signature(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        return cls._is_thunderbird_signature(elem) \
+               or cls._is_gmail_signature(elem) \
+               or cls._is_outlook_com_signature(elem)
+
+    @classmethod
+    def _is_thunderbird_signature(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        return cls._has_attr_value(
+            elem,
+            'class',
+            ProprietaryHTMLAttrValues.Thunderbird_signature_class)
+
+    @classmethod
+    def _is_gmail_signature(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        if cls._has_attr_value(
+                elem,
+                'class',
+                ProprietaryHTMLAttrValues.Gmail_signature_class):
+            return True
+        if cls._has_attr_value(
+                elem,
+                'class',
+                ProprietaryHTMLAttrValues.Gmail_extras_class):
+            for child in elem.children:
+                if cls._has_attr_value(
+                        child,
+                        'class',
+                        ProprietaryHTMLAttrValues.Gmail_signature_class):
+                    return True
+        if isinstance(elem, Tag) and elem.name.lower() == 'div':
+            for child in elem.children:
+                if cls._has_attr_value(
+                        child,
+                        'class',
+                        ProprietaryHTMLAttrValues.Gmail_signature_class):
+                    return True
+        return False
+
+    @classmethod
+    def _is_outlook_com_signature(
+            cls,
+            elem: typing.Union[Tag, NavigableString]
+    ) -> bool:
+        if cls._has_attr_value(
+                elem,
+                'id',
+                ProprietaryHTMLAttrValues.Outlook_com_signature_id):
+            return True
+        return False

tracim/tracim/lib/email_processing/models.py

@@ -0,0 +1,116 @@
+from bs4 import BeautifulSoup
+
+# -*- coding: utf-8 -*-
+
+
+class BodyMailPartType(object):
+    Signature = 'sign'
+    Main = 'main'
+    Quote = 'quote'
+
+
+class BodyMailPart(object):
+    def __init__(
+            self,
+            text: str,
+            part_type: str
+    )-> None:
+        self.text = text
+        self.part_type = part_type
+
+
+class BodyMailParts(object):
+    """
+    Data Structure to Distinct part of a Mail body into a "list" of BodyMailPart
+    When 2 similar BodyMailPart (same part_type) are added one after the other,
+    it doesn't create a new Part, it just merge those elements into one.
+    It should always have only one Signature type part, normally
+    at the end of the body.
+    This object doesn't provide other set method than append() in order to
+    preserve object coherence.
+    """
+    def __init__(self) -> None:
+        self._list = []  # type; List[BodyMailPart]
+        # INFO - G.M -
+        # automatically merge new value with last item if true, without any
+        # part_type check, same type as the older one, useful when some tag
+        # say "all elem after me is Signature"
+        self.follow = False
+
+    def __len__(self) -> int:
+        return len(self._list)
+
+    def __getitem__(self, index) -> BodyMailPart:
+        return self._list[index]
+
+    def __delitem__(self, index) -> None:
+        del self._list[index]
+        # FIXME - G.M - 2017-11-27 - Preserve BodyMailParts consistence
+        # check elem after and before index and merge them if necessary.
+
+    def append(self, value) -> None:
+        BodyMailParts._check_value(value)
+        self._append(value)
+
+    def _append(self, value, follow=None) -> None:
+        if follow is None:
+            follow = self.follow
+
+        if len(self._list) < 1:
+            self._list.append(value)
+        else:
+            if self._list[-1].part_type == value.part_type or follow:
+                self._list[-1].text += value.text
+            else:
+                self._list.append(value)
+
+    @classmethod
+    def _check_value(cls, value) -> None:
+        if not isinstance(value, BodyMailPart):
+            raise TypeError()
+
+    def drop_part_type(self, part_type: str) -> None:
+        """
+        Drop all elem of one part_type
+        :param part_type: part_type to completely remove
+        :return: None
+        """
+        new_list = [x for x in self._list if x.part_type != part_type]
+        self._list = []
+
+        # INFO - G.M - 2017-11-27 - use append() to have a consistent list
+        for elem in new_list:
+            self._append(elem, follow=False)
+
+    def get_nb_part_type(self, part_type: str) -> int:
+        """
+        Get number of elements of one part_type
+        :param part_type: part_type to check
+        :return: number of part_type elements
+        """
+        count = 0
+        for elem in self._list:
+            if elem.part_type == part_type:
+                count += 1
+        return count
+
+    def __str__(self) -> str:
+        s_mail = ''
+        for elem in self._list:
+            s_mail += elem.text
+        return str(s_mail)
+
+
+class HtmlBodyMailParts(BodyMailParts):
+
+    def append(self, value):
+        # INFO - G.M - 2017-12-01 - Override part_type is elem has no content.
+        # Choose last elem part_type instead of the proposed one.
+        if len(self._list) > 0:
+            txt = BeautifulSoup(value.text, 'html.parser').get_text()
+            txt = txt.replace('\n', '').strip()
+            img = BeautifulSoup(value.text, 'html.parser').find('img')
+            if not txt and not img:
+                value.part_type = self._list[-1].part_type
+        BodyMailParts._check_value(value)
+        BodyMailParts._append(self, value)

tracim/tracim/lib/email_processing/parser.py

@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+from bs4 import BeautifulSoup
+
+from tracim.lib.email_processing.checkers import ProprietaryHTMLAttrValues
+from tracim.lib.email_processing.checkers import HtmlMailQuoteChecker
+from tracim.lib.email_processing.checkers import HtmlMailSignatureChecker
+from tracim.lib.email_processing.models import BodyMailPartType
+from tracim.lib.email_processing.models import BodyMailPart
+from tracim.lib.email_processing.models import HtmlBodyMailParts
+
+
+class PreSanitizeConfig(object):
+    """
+    To avoid problems, html need to be sanitize a bit during parsing to distinct
+    Main,Quote and Signature elements
+    """
+    meta_tag = ['body', 'div']
+
+
+class ParsedHTMLMail(object):
+    """
+    Parse HTML Mail depending of some rules.
+    Distinct part of html mail body using BodyMailParts object and
+    process differents rules using HtmlChecker(s)
+    """
+
+    def __init__(self, html_body: str):
+        self.src_html_body = html_body
+
+    def __str__(self):
+        return str(self._parse_mail())
+
+    def get_elements(self) -> HtmlBodyMailParts:
+        tree = self._get_proper_main_body_tree()
+        return self._distinct_elements(tree)
+
+    def _parse_mail(self) -> HtmlBodyMailParts:
+        elements = self.get_elements()
+        elements = self._process_elements(elements)
+        return elements
+
+    def _get_proper_main_body_tree(self) -> BeautifulSoup:
+        """
+        Get html body tree without some kind of wrapper.
+        We need to have text, quote and signature parts at the same tree level
+        """
+        tree = BeautifulSoup(self.src_html_body, 'html.parser')
+
+        # Only parse body part of html if available
+        subtree = tree.find('body')
+        if subtree:
+            tree = BeautifulSoup(str(subtree), 'html.parser')
+
+        # if some kind of "meta_div", unwrap it
+        while len(tree.findAll(recursive=None)) == 1 and \
+                tree.find().name.lower() in PreSanitizeConfig.meta_tag:
+            tree.find().unwrap()
+
+        for tag in tree.findAll():
+            # HACK - G.M - 2017-11-28 - Unwrap outlook.com mail
+            # if Text -> Signature -> Quote Mail
+            # Text and signature are wrapped into divtagdefaultwrapper
+            if tag.attrs.get('id'):
+                if ProprietaryHTMLAttrValues.Outlook_com_wrapper_id\
+                        in tag.attrs['id']:
+                    tag.unwrap()
+        return tree
+
+    @classmethod
+    def _distinct_elements(cls, tree: BeautifulSoup) -> HtmlBodyMailParts:
+        parts = HtmlBodyMailParts()
+        for elem in list(tree):
+            part_txt = str(elem)
+            part_type = BodyMailPartType.Main
+
+            if HtmlMailQuoteChecker.is_quote(elem):
+                part_type = BodyMailPartType.Quote
+            elif HtmlMailSignatureChecker.is_signature(elem):
+                part_type = BodyMailPartType.Signature
+
+            part = BodyMailPart(part_txt, part_type)
+            parts.append(part)
+            # INFO - G.M - 2017-11-28 - Outlook.com special case
+            # all after quote tag is quote
+            if HtmlMailQuoteChecker._is_outlook_com_quote(elem):
+                parts.follow = True
+        return parts
+
+    @classmethod
+    def _process_elements(
+            cls,
+            elements: HtmlBodyMailParts,
+    ) -> HtmlBodyMailParts:
+        if len(elements) >= 2:
+            # Case 1 and 2, only one main and one quote
+            if elements.get_nb_part_type('main') == 1 and \
+                            elements.get_nb_part_type('quote') == 1:
+                # Case 1 : Main first
+                if elements[0].part_type == BodyMailPartType.Main:
+                    cls._process_main_first_case(elements)
+                # Case 2 : Quote first
+                if elements[0].part_type == BodyMailPartType.Quote:
+                    cls._process_quote_first_case(elements)
+            else:
+                # Case 3 : Multiple quotes and/or main
+                cls._process_multiples_elems_case(elements)
+        else:
+            cls._process_default_case(elements)
+            # default case (only one element or empty list)
+        return elements
+
+    @classmethod
+    def _process_quote_first_case(cls, elements: HtmlBodyMailParts) -> None:
+        elements.drop_part_type(BodyMailPartType.Signature)
+
+    @classmethod
+    def _process_main_first_case(cls, elements: HtmlBodyMailParts) -> None:
+        elements.drop_part_type(BodyMailPartType.Quote)
+        elements.drop_part_type(BodyMailPartType.Signature)
+
+    @classmethod
+    def _process_multiples_elems_case(cls, elements: HtmlBodyMailParts) -> None:
+        elements.drop_part_type(BodyMailPartType.Signature)
+
+    @classmethod
+    def _process_default_case(cls, elements: HtmlBodyMailParts) -> None:
+        elements.drop_part_type(BodyMailPartType.Quote)
+        elements.drop_part_type(BodyMailPartType.Signature)

tracim/tracim/lib/email_processing/sanitizer.py

@@ -0,0 +1,66 @@
+import typing
+from bs4 import BeautifulSoup, Tag
+from tracim.lib.email_processing.sanitizer_config.attrs_whitelist import ATTRS_WHITELIST  # nopep8
+from tracim.lib.email_processing.sanitizer_config.class_blacklist import CLASS_BLACKLIST  # nopep8
+from tracim.lib.email_processing.sanitizer_config.id_blacklist import ID_BLACKLIST  # nopep8
+from tracim.lib.email_processing.sanitizer_config.tag_blacklist import TAG_BLACKLIST  # nopep8
+from tracim.lib.email_processing.sanitizer_config.tag_whitelist import TAG_WHITELIST  # nopep8
+
+class HtmlSanitizerConfig(object):
+    # whitelist : keep tag and content
+    Tag_whitelist = TAG_WHITELIST
+    Attrs_whitelist = ATTRS_WHITELIST
+    # blacklist : remove content
+    Tag_blacklist = TAG_BLACKLIST
+    Class_blacklist = CLASS_BLACKLIST
+    Id_blacklist = ID_BLACKLIST
+
+class HtmlSanitizer(object):
+    """
+    Sanitize Html Rules :
+    - Tag :
+      - Remove Tag_blacklist tag
+      - Keep Tag_whitelist tag
+      - Unwrap others tags
+    - Attrs :
+      - Remove non-whitelisted attributes
+    """
+
+    @classmethod
+    def sanitize(cls, html_body: str) -> typing.Optional[str]:
+        soup = BeautifulSoup(html_body, 'html.parser')
+        for tag in soup.findAll():
+            if cls._tag_to_extract(tag):
+                tag.extract()
+            elif tag.name.lower() in HtmlSanitizerConfig.Tag_whitelist:
+                attrs = dict(tag.attrs)
+                for attr in attrs:
+                    if attr not in HtmlSanitizerConfig.Attrs_whitelist:
+                        del tag.attrs[attr]
+            else:
+                tag.unwrap()
+
+        if cls._is_content_empty(soup):
+            return None
+        else:
+            return str(soup)
+
+    @classmethod
+    def _is_content_empty(cls, soup):
+        img = soup.find('img')
+        txt = soup.get_text().replace('\n', '').strip()
+        return (not img and not txt)
+
+    @classmethod
+    def _tag_to_extract(cls, tag: Tag) -> bool:
+        if tag.name.lower() in HtmlSanitizerConfig.Tag_blacklist:
+            return True
+        if 'class' in tag.attrs:
+            for elem in HtmlSanitizerConfig.Class_blacklist:
+                if elem in tag.attrs['class']:
+                    return True
+        if 'id' in tag.attrs:
+            for elem in HtmlSanitizerConfig.Id_blacklist:
+                if elem in tag.attrs['id']:
+                    return True
+        return False

tracim/tracim/lib/email_processing/sanitizer_config/attrs_whitelist.py

@@ -0,0 +1 @@
+ATTRS_WHITELIST = ['href']

tracim/tracim/lib/email_processing/sanitizer_config/class_blacklist.py

@@ -0,0 +1 @@
+CLASS_BLACKLIST =  []

tracim/tracim/lib/email_processing/sanitizer_config/id_blacklist.py

@@ -0,0 +1 @@
+ID_BLACKLIST = []

tracim/tracim/lib/email_processing/sanitizer_config/tag_blacklist.py

@@ -0,0 +1 @@
+TAG_BLACKLIST = ['script', 'style']

tracim/tracim/lib/email_processing/sanitizer_config/tag_whitelist.py

@@ -0,0 +1,16 @@
+TAG_WHITELIST = [
+    'b', 'blockquote', 'br',
+    'caption', 'cite', 'code',
+    'dd', 'del', 'dfn', 'dl', 'dt',
+    'em',
+    'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr',
+    'i', 'img', 'ins',
+    'li',
+    'mark',
+    'ol',
+    'p', 'pre',
+    'q',
+    'samp', 'small', 'strong', 'sub', 'sup',
+    'table', 'tbody', 'td', 'tfoot', 'thead', 'tr',
+    'u', 'ul'
+]

tracim/tracim/lib/notifications.py

@@ -5,6 +5,7 @@ import typing
 from email.header import Header
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
+from email.utils import formataddr
 
 from lxml.html.diff import htmldiff
 
@@ -207,10 +208,7 @@ class EmailNotifier(object):
         else:
             email_address = email_template.replace('{user_id}', '0')
 
-        return '{label} <{email_address}>'.format(
-            label = Header(mail_sender_name).encode(),
-            email_address = email_address
-        )
+        return formataddr((mail_sender_name, email_address))
 
     @staticmethod
     def log_notification(
@@ -269,8 +267,17 @@ class EmailNotifier(object):
 
         for role in notifiable_roles:
             logger.info(self, 'Sending email to {}'.format(role.user.email))
-            to_addr = '{name} <{email}>'.format(name=role.user.display_name, email=role.user.email)
+            to_addr = formataddr((role.user.display_name, role.user.email))
+            #
+            # INFO - G.M - 2017-11-15 - set content_id in header to permit reply
+            # references can have multiple values, but only one in this case.
+            replyto_addr = self._global_config.EMAIL_NOTIFICATION_REPLY_TO_EMAIL.replace( # nopep8
+                '{content_id}',str(content.content_id)
+            )
 
+            reference_addr = self._global_config.EMAIL_NOTIFICATION_REFERENCES_EMAIL.replace( #nopep8
+                '{content_id}',str(content.content_id)
+             )
             #
             #  INFO - D.A. - 2014-11-06
             # We do not use .format() here because the subject defined in the .ini file
@@ -282,12 +289,21 @@ class EmailNotifier(object):
             subject = subject.replace(EST.WORKSPACE_LABEL, main_content.workspace.label.__str__())
             subject = subject.replace(EST.CONTENT_LABEL, main_content.label.__str__())
             subject = subject.replace(EST.CONTENT_STATUS_LABEL, main_content.get_status().label.__str__())
+            reply_to_label = l_('{username} & all members of {workspace}').format(
+                username=user.display_name,
+                workspace=main_content.workspace.label)
 
             message = MIMEMultipart('alternative')
             message['Subject'] = subject
             message['From'] = self._get_sender(user)
             message['To'] = to_addr
-
+            message['Reply-to'] = formataddr((reply_to_label, replyto_addr))
+            # INFO - G.M - 2017-11-15
+            # References can theorically have label, but in pratice, references
+            # contains only message_id from parents post in thread.
+            # To link this email to a content we create a virtual parent
+            # in reference who contain the content_id.
+            message['References'] = formataddr(('',reference_addr))
             body_text = self._build_email_body(self._global_config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT, role, content, user)
 
 

tracim/tracim/lib/utils.py

@@ -3,6 +3,7 @@ import os
 import time
 import signal
 
+import tg
 from tg import config
 from tg import require
 from tg import response
@@ -150,12 +151,17 @@ def _lazy_ugettext(text: str):
     :return: lazyfied string or string
     """
     try:
-        # Test if context is available,
+        # Test if tg.translator is defined
+        #
         # cf. https://github.com/tracim/tracim/issues/173
-        context = StackedObjectProxy(name="context")
-        context.translator
+        #
+        # HACK - 2017-11-03 - D.A
+        # Replace context proxyfied by direct access to gettext function
+        # which is not setup in case the tg2 context is not initialized
+        tg.translator.gettext  # raises a TypeError exception if context not set
         return ugettext(text)
-    except TypeError:
+    except TypeError as e:
+        logger.debug(_lazy_ugettext, 'TG2 context not available for translation. TypeError: {}'.format(e))
         return text
 
 lazy_ugettext = lazify(_lazy_ugettext)

tracim/tracim/lib/webdav/design.py

@@ -173,9 +173,10 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
                    )
     histHTML += '</table>'
 
-    file = '''
+    page = '''
 <html>
 <head>
+	<meta charset="utf-8" />
 	<title>%s</title>
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
@@ -233,7 +234,7 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
                content_revision.description,
                histHTML)
 
-    return file
+    return page
 
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
         hist = content.get_history()
@@ -291,9 +292,10 @@ def designThread(content: data.Content, content_revision: data.ContentRevisionRO
                                # t.ref_object.label) if t.type.id in ['revision', 'creation', 'edition'] else '')
                            )
 
-        page = '''
+        thread = '''
 <html>
 <head>
+	<meta charset="utf-8" />
 	<title>%s</title>
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@@ -379,4 +381,4 @@ def designThread(content: data.Content, content_revision: data.ContentRevisionRO
                content_revision.description,
                disc)
 
-        return page
+        return thread

tracim/tracim/lib/workspace.py

@@ -34,8 +34,8 @@ class WorkspaceApi(object):
 
         return DBSession.query(Workspace).\
             join(Workspace.roles).\
-            filter(UserRoleInWorkspace.user_id==self._user.user_id).\
-            filter(Workspace.is_deleted==False)
+            filter(UserRoleInWorkspace.user_id == self._user.user_id).\
+            filter(Workspace.is_deleted == False)
 
     def create_workspace(
             self,

tracim/tracim/model/auth.py

@@ -280,6 +280,16 @@ class User(DeclarativeBase):
         from tracim.model.data import UserRoleInWorkspace
         return UserRoleInWorkspace.NOT_APPLICABLE
 
+    def get_active_roles(self) -> ['UserRoleInWorkspace']:
+        """
+        :return: list of roles of the user for all not-deleted workspaces
+        """
+        roles = []
+        for role in self.roles:
+            if not role.workspace.is_deleted:
+                roles.append(role)
+        return roles
+
     def ensure_auth_token(self) -> None:
         """
         Create auth_token if None, regenerate auth_token if too much old.

tracim/tracim/model/data.py

@@ -1111,16 +1111,6 @@ class Content(DeclarativeBase):
         self._properties = json.dumps(properties_struct)
         ContentChecker.check_properties(self)
 
-    @property
-    def clean_revisions(self):
-        """
-        This property return revisions with really only one of each revisions:
-        Actually, .revisions list give duplicated last revision,
-        see https://github.com/tracim/tracim/issues/126
-        :return: list of revisions
-        """
-        return list(set(self.revisions))
-
     def created_as_delta(self, delta_from_datetime:datetime=None):
         if not delta_from_datetime:
             delta_from_datetime = datetime.utcnow()
@@ -1213,13 +1203,13 @@ class Content(DeclarativeBase):
         return last_comment
 
     def get_previous_revision(self) -> 'ContentRevisionRO':
-        rev_ids = [revision.revision_id for revision in self.clean_revisions]
+        rev_ids = [revision.revision_id for revision in self.revisions]
         rev_ids.sort()
 
         if len(rev_ids)>=2:
             revision_rev_id = rev_ids[-2]
 
-            for revision in self.clean_revisions:
+            for revision in self.revisions:
                 if revision.revision_id == revision_rev_id:
                     return revision
 
@@ -1248,7 +1238,7 @@ class Content(DeclarativeBase):
         events = []
         for comment in self.get_comments():
             events.append(VirtualEvent.create_from_content(comment))
-        for revision in self.clean_revisions:
+        for revision in self.revisions:
             events.append(VirtualEvent.create_from_content_revision(revision))
 
         sorted_events = sorted(events,

tracim/tracim/model/serializers.py

@@ -914,7 +914,7 @@ def serialize_user_for_user(user: User, context: Context):
     result['id'] = user.user_id
     result['name'] = user.get_display_name()
     result['email'] = user.email
-    result['roles'] = context.toDict(user.roles)
+    result['roles'] = context.toDict(user.get_active_roles())
     result['enabled'] = user.is_active
     result['profile'] = user.profile
     result['calendar_url'] = user.calendar_url
@@ -996,6 +996,7 @@ def serialize_workspace_in_list_for_one_user(workspace: Workspace, context: Cont
     result = DictLikeClass()
     result['id'] = workspace.workspace_id
     result['name'] = workspace.label
+    result['is_deleted'] = workspace.is_deleted
 
     return result
 

tracim/tracim/templates/admin/user_getall.mak

@@ -17,7 +17,7 @@
 <%def name="TITLE_ROW()">
     <div class="row-fluid">
         <div>
-            ${ROW.TITLE_ROW(_('Users'), 'fa-user', '', 't-user-color', _('manage users and associated workspaces'))}
+            ${ROW.TITLE_ROW(_('Users'), 'fa-user', '', 't-user-color', _('Manage users and associated workspaces'))}
         </div>
     </div>
 </%def>

tracim/tracim/templates/admin/workspace_getall.mak

@@ -14,7 +14,7 @@
 </%def>
 
 <%def name="TITLE_ROW()">
-    ${ROW.TITLE_ROW(_('Workspaces'), 'fa-bank', '', 't-user-color', _('manage workspaces and subscribed users'))}
+    ${ROW.TITLE_ROW(_('Workspaces'), 'fa-bank', '', 't-user-color', _('Manage workspaces and subscribed users'))}
 </%def>
 
 <div class="workspace__wrapper">

tracim/tracim/templates/file/edit.mak

@@ -14,7 +14,7 @@
                 <input name="label" type="text" class="form-control" id="file-title" placeholder="${_('Title')}" value="${file.label}">
             </div>
             <div class="form-group">
-                <label for="file-content">${_('Content')}</label>
+                <label for="file-content">${_('Description')}</label>
                 <textarea id="file-content-textarea" name="comment" class="form-control pod-rich-textarea" id="file-content" placeholder="${_('Write here the file content')}">${file.content}</textarea>
             </div>
         </div>

tracim/tracim/templates/file/getone.mak

@@ -66,14 +66,14 @@
     <div class="alert alert-info" role="alert">
         <p>
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
+            ${_('You are looking at an <b>archived file</b>.')|n}
         </p>
     </div>
     % elif (result.file.is_deleted) :
     <div class="alert alert-info" role="alert">
         <p>
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
+            ${_('You are looking at a <b>deleted file</b>.')|n}
         </p>
     </div>
     % endif
@@ -124,7 +124,7 @@
                     selectedRevision: '${result.file.selected_revision}',
                     weight: '${h.user_friendly_file_size(result.file.file.size)}',
                     height: '300',
-                    modifiedAt: '${h.format_short(created_localized)|n}',
+                    modifiedAt: '${h.format_short(updated_localized)|n}',
                     owner: '${result.file.owner.name}',
                     sourceLink: '${download_url}',
                     pdfAvailable: ${pdf_available}

tracim/tracim/templates/folder/getone.mak

@@ -64,14 +64,14 @@
     <div class="alert alert-info" role="alert">
         <p>
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
+            ${_('You are looking at an <b>archived folder</b>.')|n}
         </p>
     </div>
     % elif (result.folder.is_deleted) :
     <div class="alert alert-info" role="alert">
         <p>
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
+            ${_('You are looking at a <b>deleted folder</b>.')|n}
         </p>
     </div>
     % endif

tracim/tracim/templates/home.mak

@@ -137,7 +137,9 @@
                             </tr>
                         </thead>
                         % for role in fake_api.current_user.roles:
-                            ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(fake_api.current_user, role, show_id=False, enable_link='/user/me/workspaces/{workspace}/enable_notifications?next_url=/home', disable_link='/user/me/workspaces/{workspace}/disable_notifications?next_url=/home', base_link='/workspaces/{workspace}')}
+                            % if not role.workspace.is_deleted:
+                                ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(fake_api.current_user, role, show_id=False, enable_link='/user/me/workspaces/{workspace}/enable_notifications?next_url=/home', disable_link='/user/me/workspaces/{workspace}/disable_notifications?next_url=/home', base_link='/workspaces/{workspace}')}
+                            % endif
                         % endfor
                     </table>
                 % endif

tracim/tracim/templates/page/getone.mak

@@ -64,14 +64,14 @@
     <div class="alert alert-info" role="alert">
         <p>
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-            ${_('You are viewing <b>an archived version</b> of the current page.')|n}
+            ${_('You are looking at an <b>archived page</b>.')|n}
         </p>
     </div>
     % elif (result.page.is_deleted) :
     <div class="alert alert-info" role="alert">
         <p>
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-            ${_('You are viewing <b>a deleted version</b> of the current page.')|n}
+            ${_('You are looking at a <b>deleted page</b>.')|n}
         </p>
     </div>
     % endif

tracim/tracim/templates/thread/getone.mak

@@ -66,7 +66,7 @@
         <div class="">
             <p>
                 <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-                ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
+                ${_('You are looking at an <b>archived thread</b>.')|n}
             </p>
         </div>
     </div>
@@ -75,7 +75,7 @@
         <div class="">
             <p>
                 <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
-                ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
+                ${_('You are looking at a <b>deleted thread</b>.')|n}
             </p>
         </div>
     </div>

tracim/tracim/templates/widgets/left_menu.mak

@@ -2,7 +2,7 @@
 <%namespace name="ICON" file="tracim.templates.widgets.icon"/>
 
 <%def name="TREEVIEW(dom_id, selected_id='', uniq_workspace='0', css_classes='t-spacer-above')">
-    <h4 class="t-less-visible t-spacer-above textMenuColor">${_('Workspaces')}</h4>
+    <h4 class="t-spacer-above textMenuColor">${_('Workspaces')}</h4>
     <div id="sidebarleft_menu"></div>
     <script src="${tg.url('/assets/js/sidebarleft.js')}"></script>
     <script>
@@ -12,4 +12,3 @@
       })()
     </script>
 </%def>
-

tracim/tracim/templates/widgets/table_row.mak

@@ -65,9 +65,9 @@
         <!--td class="folder__content__list__type">
             <span class="${content.type.color}">
                 % if (content.is_archived) :
-                    <i class="fa fa-archive fa-fw tracim-less-visible" title="Archivé"></i>
+                    <i class="fa fa-archive fa-fw tracim-less-visible" title="${_('archived')}"></i>
                 % elif (content.is_deleted) :
-                    <i class="fa fa-trash-o fa-fw tracim-less-visible" title="Supprimé"></i>
+                    <i class="fa fa-trash-o fa-fw tracim-less-visible" title="${_('deleted')}"></i>
                 % endif
                 ${content.type.label}
             </span>
@@ -95,9 +95,9 @@
                     <span class="t-less-visible">
                       ${content.status.label}
                       % if (content.is_archived) :
-                          - Archivé
+                          - ${_('archived')}
                       % elif (content.is_deleted) :
-                          - Supprimé
+                          - ${_('deleted')}
                       % endif
                     </span>
                 </a>

tracim/tracim/tests/functional/test_ldap_restrictions.py

@@ -26,7 +26,7 @@ class TestAuthentication(LDAPTest, TracimTestController):
         home = self.app.get('/home/',)
 
         # HTML button is not here
-        eq_(None, BeautifulSoup(home.body).find(attrs={'class': 'change-password-btn'}))
+        eq_(None, BeautifulSoup(home.body, 'html.parser').find(attrs={'class': 'change-password-btn'}))
 
         # If we force passwd update, we got 403
         try_post_passwd = self.app.post(
@@ -51,12 +51,12 @@ class TestAuthentication(LDAPTest, TracimTestController):
         edit = self.app.get('/user/5/edit')
 
         # email input field is disabled
-        email_input = BeautifulSoup(edit.body).find(attrs={'id': 'email'})
+        email_input = BeautifulSoup(edit.body, 'html.parser').find(attrs={'id': 'email'})
         ok_('readonly' in email_input.attrs)
         eq_(email_input.attrs['readonly'], "readonly")
 
         # Name is not (see attributes configuration of LDAP fixtures)
-        name_input = BeautifulSoup(edit.body).find(attrs={'id': 'name'})
+        name_input = BeautifulSoup(edit.body, 'html.parser').find(attrs={'id': 'name'})
         ok_('readonly' not in name_input.attrs)
 
         # If we force edit of user, "email" field will be not updated

tracim/tracim/tests/functional/test_root.py

@@ -30,7 +30,7 @@ class TestRootController(TestController):
         msg = 'copyright © 2013 - {} tracim project.'.format(h.current_year())
         ok_(msg in response)
 
-        forms = BeautifulSoup(response.body).find_all('form')
+        forms = BeautifulSoup(response.body, 'html.parser').find_all('form')
         print('FORMS = ',forms)
         eq_(1, len(forms))
         eq_('w-login-form', forms[0].get('id'))

tracim/tracim/tests/library/test_email_body_parser.py

@@ -0,0 +1,759 @@
+from bs4 import BeautifulSoup
+from nose.tools import raises
+
+from tracim.lib.email_processing.checkers import HtmlMailQuoteChecker
+from tracim.lib.email_processing.checkers import HtmlMailSignatureChecker
+from tracim.lib.email_processing.parser import ParsedHTMLMail
+from tracim.lib.email_processing.models import BodyMailPartType
+from tracim.lib.email_processing.models import BodyMailPart
+from tracim.lib.email_processing.models import BodyMailParts
+from tracim.tests import TestStandard
+
+
+class TestHtmlMailQuoteChecker(TestStandard):
+    def test_unit__is_standard_quote_ok(self):
+        soup = BeautifulSoup('<blockquote></blockquote>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_standard_quote(main_elem) is True
+
+    def test_unit__is_standard_quote_no(self):
+        soup = BeautifulSoup('<a></a>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_standard_quote(main_elem) is False
+
+    def test_unit__is_thunderbird_quote_ok(self):
+        soup = BeautifulSoup('<div class="moz-cite-prefix"></div>',
+                             'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_thunderbird_quote(main_elem) is True
+
+    def test_unit__is_thunderbird_quote_no(self):
+        soup = BeautifulSoup('<div class="nothing"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_thunderbird_quote(main_elem) is False
+
+    def test_unit__is_gmail_quote_ok(self):
+        html = '<div class="gmail_extra">' + \
+              '<a></a><div class="gmail_quote"></div>' + \
+              '</div>'
+        soup = BeautifulSoup(html, 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_gmail_quote(main_elem) is True
+
+    def test_unit__is_gmail_quote_no(self):
+        soup = BeautifulSoup('<div class="nothing"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_gmail_quote(main_elem) is False
+
+    def test_unit__is_gmail_quote_no_2(self):
+        html = '<div class="gmail_extra">' + \
+              '<a></a><div class="gmail_signature"></div>' + \
+              '</div>'
+        soup = BeautifulSoup(html, 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_gmail_quote(main_elem) is False
+
+    def test_unit__is_outlook_com_quote_ok(self):
+        soup = BeautifulSoup('<div id="divRplyFwdMsg"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_outlook_com_quote(main_elem) is True
+
+    def test_unit__is_outlook_com_quote_no(self):
+        soup = BeautifulSoup('<div id="Signature"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailQuoteChecker._is_outlook_com_quote(main_elem) is False
+
+    # TODO - G.M - 2017-11-24 - Check Yahoo and New roundcube html mail with
+    # correct mail example
+
+
+class TestHtmlMailSignatureChecker(TestStandard):
+    def test_unit__is_thunderbird_signature_ok(self):
+        soup = BeautifulSoup('<div class="moz-signature"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_thunderbird_signature(main_elem) is True  # nopep8
+
+    def test_unit__is_thunderbird_signature_no(self):
+        soup = BeautifulSoup('<div class="other"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_thunderbird_signature(main_elem) is False  # nopep8
+
+    def test_unit__is_gmail_signature_ok(self):
+        html = '<div class="gmail_extra">' + \
+               '<a></a><div class="gmail_quote"></div>' + \
+               '</div>'
+        soup = BeautifulSoup(html, 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_gmail_signature(main_elem) is False
+
+    def test_unit__is_gmail_signature_no(self):
+        soup = BeautifulSoup('<div class="nothing"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_gmail_signature(main_elem) is False
+
+    def test_unit__is_gmail_signature_yes(self):
+        html = '<div class="gmail_extra">' + \
+               '<a></a><div class="gmail_signature"></div>' + \
+               '</div>'
+        soup = BeautifulSoup(html, 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_gmail_signature(main_elem) is True
+
+    def test_unit__is_gmail_signature_yes_2(self):
+        html = '<div class="gmail_signature">' + \
+               '</div>'
+        soup = BeautifulSoup(html, 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_gmail_signature(main_elem) is True
+
+    def test_unit__is_outlook_com_signature_no(self):
+        soup = BeautifulSoup('<div id="divRplyFwdMsg"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_outlook_com_signature(main_elem) \
+               is False
+
+    def test_unit__is_outlook_com_signature_ok(self):
+        soup = BeautifulSoup('<div id="Signature"></div>', 'html.parser')
+        main_elem = soup.find()
+        assert HtmlMailSignatureChecker._is_outlook_com_signature(main_elem) \
+               is True
+
+
+class TestBodyMailsParts(TestStandard):
+
+    def test_unit__std_list_methods(self):
+        mail_parts = BodyMailParts()
+        assert len(mail_parts) == 0
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._list.append(a)
+        assert len(mail_parts) == 1
+        assert mail_parts[0] == a
+        del mail_parts[0]
+        assert len(mail_parts) == 0
+
+    def test_unit__append_same_type(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._append(a)
+        b = BodyMailPart('b', BodyMailPartType.Main)
+        mail_parts._append(b)
+        assert len(mail_parts) == 1
+        assert mail_parts[0].part_type == BodyMailPartType.Main
+        assert mail_parts[0].text == 'ab'
+
+    def test_unit__append_different_type(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts.append(a)
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._append(b)
+        assert len(mail_parts) == 2
+        assert mail_parts[0] == a
+        assert mail_parts[1] == b
+
+    def test_unit__append_follow(self):
+        mail_parts = BodyMailParts()
+        mail_parts.follow = True
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._append(a)
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._append(b)
+        assert len(mail_parts) == 1
+        assert mail_parts[0].part_type == BodyMailPartType.Main
+        assert mail_parts[0].text == 'ab'
+
+    def test_unit__append_dont_follow_when_first(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._append(a, follow=True)
+        assert len(mail_parts) == 1
+        assert mail_parts[0].part_type == BodyMailPartType.Main
+        assert mail_parts[0].text == 'a'
+
+    @raises(TypeError)
+    def test_unit__check_value__type_error(self):
+        mail_parts = BodyMailParts()
+        mail_parts._check_value('a')
+
+    def test_unit__check_value__ok(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._check_value(a)
+
+    def test_unit__drop_part_type(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._list.append(a)
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._list.append(b)
+        c = BodyMailPart('c', BodyMailPartType.Signature)
+        mail_parts._list.append(c)
+        mail_parts.drop_part_type(BodyMailPartType.Quote)
+        assert len(mail_parts) == 2
+        assert mail_parts[0].text == 'a'
+        assert mail_parts[0].part_type == BodyMailPartType.Main
+        assert len(mail_parts) == 2
+        assert mail_parts[1].text == 'c'
+        assert mail_parts[1].part_type == BodyMailPartType.Signature
+
+    def test_unit__drop_part_type_verify_no_follow_incidence(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._list.append(a)
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._list.append(b)
+        c = BodyMailPart('c', BodyMailPartType.Signature)
+        mail_parts._list.append(c)
+        mail_parts.follow = True
+        mail_parts.drop_part_type(BodyMailPartType.Quote)
+        assert len(mail_parts) == 2
+        assert mail_parts[0].text == 'a'
+        assert mail_parts[0].part_type == BodyMailPartType.Main
+        assert len(mail_parts) == 2
+        assert mail_parts[1].text == 'c'
+        assert mail_parts[1].part_type == BodyMailPartType.Signature
+
+    def test_unit__drop_part_type_consistence(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._list.append(a)
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._list.append(b)
+        c = BodyMailPart('c', BodyMailPartType.Main)
+        mail_parts._list.append(c)
+        mail_parts.drop_part_type(BodyMailPartType.Quote)
+        assert len(mail_parts) == 1
+        assert mail_parts[0].text == 'ac'
+        assert mail_parts[0].part_type == BodyMailPartType.Main
+
+    def test_unit__get_nb_part_type(self):
+        mail_parts = BodyMailParts()
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Main) == 0
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Quote) == 0
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Signature) == 0
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._list.append(a)
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Main) == 1
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._list.append(b)
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Quote) == 1
+        c = BodyMailPart('c', BodyMailPartType.Signature)
+        mail_parts._list.append(c)
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Main) == 1
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Quote) == 1
+        assert mail_parts.get_nb_part_type(BodyMailPartType.Signature) == 1
+
+    def test_unit__str(self):
+        mail_parts = BodyMailParts()
+        a = BodyMailPart('a', BodyMailPartType.Main)
+        mail_parts._list.append(a)
+        b = BodyMailPart('b', BodyMailPartType.Quote)
+        mail_parts._list.append(b)
+        c = BodyMailPart('c', BodyMailPartType.Signature)
+        mail_parts._list.append(c)
+        assert str(mail_parts) == 'abc'
+
+
+class TestParsedMail(TestStandard):
+
+    def test_other__check_gmail_mail_text_only(self):
+        text_only = '''<div dir="ltr">Voici le texte<br></div>'''
+        mail = ParsedHTMLMail(text_only)
+        elements = mail.get_elements()
+        assert len(elements) == 1
+        assert elements[0].part_type == BodyMailPartType.Main
+
+    def test_other__check_gmail_mail_text_signature(self):
+        text_and_signature = '''
+        <div dir="ltr">POF<br clear="all"><div><br>-- <br>
+        <div class="gmail_signature" data-smartmail="gmail_signature">
+        <div dir="ltr">Voici Ma signature. En HTML <br><ol>
+        <li>Plop</li>
+        <li>Plip</li>
+        <li>Plop<br>
+        </li></ol></div></div></div></div>
+        '''
+        mail = ParsedHTMLMail(text_and_signature)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Signature
+
+    def test_other__check_gmail_mail_text_quote(self):
+        text_and_quote = '''
+        <div dir="ltr">Réponse<br>
+        <div class="gmail_extra"><br>
+        <div class="gmail_quote">Le 28 novembre 2017 à 10:29, John Doe <span
+        dir="ltr">&lt;<a href="mailto:bidule@localhost.fr"
+        target="_blank">bidule@localhost.fr</a>&gt;</span>
+        a écrit :<br>
+        <blockquote class="gmail_quote" style="margin:0 0 0
+        .8ex;border-left:1px #ccc solid;padding-left:1ex">Voici ma réponse<br>
+        <br><br>
+        Le 28/11/2017 à 10:05, Foo Bar a écrit&nbsp;:<br>
+        <blockquote class="gmail_quote" style="margin:0 0 0
+        .8ex;border-left:1px #ccc solid;padding-left:1ex">
+        Voici le texte<span class="HOEnZb"><font color="#888888"><br>
+        </font></span></blockquote>
+        <span class="HOEnZb"><font color="#888888">
+        <br>
+        -- <br>
+        TEST DE signature<br>
+        </font></span></blockquote>
+        </div><br></div></div>
+        '''
+        mail = ParsedHTMLMail(text_and_quote)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+
+    def test_other__check_gmail_mail_text_quote_text(self):
+        text_quote_text = '''
+              <div dir="ltr">Avant<br>
+              <div class="gmail_extra"><br>
+              <div class="gmail_quote">Le 28 novembre 2017 à 10:29, John Doe 
+              <span dir="ltr">&lt;<a href="mailto:bidule@localhost.fr"
+              target="_blank">bidule@localhost.fr</a>&gt;</span>
+              a écrit :<br>
+              <blockquote class="gmail_quote" style="margin:0 0 0
+              .8ex;border-left:1px #ccc solid;padding-left:1ex">Voici ma
+              réponse<br>
+              <br>
+              <br>
+              Le 28/11/2017 à 10:05, Foo Bar a écrit&nbsp;:<br>
+              <blockquote class="gmail_quote" style="margin:0 0 0
+              .8ex;border-left:1px #ccc solid;padding-left:1ex">
+              Voici le texte<span class="HOEnZb"><font color="#888888"><br>
+              </font></span></blockquote>
+              <span class="HOEnZb"><font color="#888888">
+              <br>
+              -- <br>
+              TEST DE signature<br>
+              </font></span></blockquote>
+              </div>
+              <br>
+              </div>
+              <div class="gmail_extra">Aprés<br>
+              </div>
+              </div>
+              '''
+
+        mail = ParsedHTMLMail(text_quote_text)
+        elements = mail.get_elements()
+        assert len(elements) == 3
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+        assert elements[2].part_type == BodyMailPartType.Main
+
+    def test_other__check_gmail_mail_text_quote_signature(self):
+        text_quote_signature = '''
+        <div dir="ltr">Hey !<br>
+                 </div>
+                 <div class="gmail_extra"><br>
+                 <div class="gmail_quote">Le 28 novembre 2017 à 10:29,
+                  John Doe <span
+                 dir="ltr">&lt;<a href="mailto:bidule@localhost.fr"
+                 target="_blank">bidule@localhost.fr</a>&gt;</span>
+                 a écrit :<br>
+                 <blockquote class="gmail_quote" style="margin:0 0 0
+                 .8ex;border-left:1px #ccc solid;padding-left:1ex">Voici ma
+                 réponse<br>
+                 <br>
+                 <br>
+                  Le 28/11/2017 à 10:05, Foo Bar a écrit&nbsp;:<br>
+                  <blockquote class="gmail_quote" style="margin:0 0 0
+                  .8ex;border-left:1px #ccc solid;padding-left:1ex">
+                  Voici le texte<span class="HOEnZb"><font color="#888888"><br>
+                  </font></span></blockquote>
+                  <span class="HOEnZb"><font color="#888888">
+                  <br>
+                  -- <br>
+                  TEST DE signature<br>
+                  </font></span></blockquote>
+                  </div>
+                  <br>
+                  <br clear="all">
+                  <br>
+                  -- <br>
+                  <div class="gmail_signature" data-smartmail="gmail_signature">
+                  <div dir="ltr">Voici Ma signature. En HTML <br>
+                  <ol>
+                  <li>Plop</li>
+                  <li>Plip</li>
+                  <li>Plop<br>
+                  </li>
+                  </ol>
+                  </div>
+                  </div>
+                  </div>
+                 '''
+
+        # INFO - G.M - 2017-11-28 -
+        # Now Quote + Signature block in Gmail is considered as one Quote
+        # Block.
+        mail = ParsedHTMLMail(text_quote_signature)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+
+    def test_other__check_gmail_mail_text_quote_text_signature(self):
+        text_quote_text_sign = '''
+        <div dir="ltr">Test<br>
+        <div class="gmail_extra"><br>
+        <div class="gmail_quote">Le 28 novembre 2017 à 10:29, John Doe <span
+        dir="ltr">&lt;<a href="mailto:bidule@localhost.fr"
+        target="_blank">bidule@localhost.fr</a>&gt;</span>
+        a écrit :<br>
+        <blockquote class="gmail_quote" style="margin:0 0 0
+        .8ex;border-left:1px #ccc solid;padding-left:1ex">Voici ma
+        réponse<br>
+        <br>
+        <br>
+        Le 28/11/2017 à 10:05, Foo Bar a écrit&nbsp;:<br>
+        <blockquote class="gmail_quote" style="margin:0 0 0
+        .8ex;border-left:1px #ccc solid;padding-left:1ex">
+        Voici le texte<span class="HOEnZb"><font color="#888888"><br>
+        </font></span></blockquote>
+        <span class="HOEnZb"><font color="#888888">
+        <br>
+        -- <br>
+        TEST DE signature<br>
+        </font></span></blockquote>
+        </div>
+        <br>
+        <br>
+        </div>
+        <div class="gmail_extra">RE test<br clear="all">
+        </div>
+        <div class="gmail_extra"><br>
+        -- <br>
+        <div class="gmail_signature" data-smartmail="gmail_signature">
+        <div dir="ltr">Voici Ma signature. En HTML <br>
+        <ol>
+        <li>Plop</li>
+        <li>Plip</li>
+        <li>Plop<br>
+        </li>
+        </ol>
+        </div>
+        </div>
+        </div>
+        </div>
+        '''
+
+        mail = ParsedHTMLMail(text_quote_text_sign)
+        elements = mail.get_elements()
+        assert len(elements) == 4
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+        assert elements[2].part_type == BodyMailPartType.Main
+        assert elements[3].part_type == BodyMailPartType.Signature
+
+    def test_other__check_thunderbird_mail_text_only(self):
+
+        text_only = '''Coucou<br><br><br>'''
+        mail = ParsedHTMLMail(text_only)
+        elements = mail.get_elements()
+        assert len(elements) == 1
+        assert elements[0].part_type == BodyMailPartType.Main
+
+    def test_other__check_thunderbird_mail_text_signature(self):
+        text_and_signature = '''
+        <p>Test<br>
+        </p>
+        <div class="moz-signature">-- <br>
+          TEST DE signature</div>
+        '''
+        mail = ParsedHTMLMail(text_and_signature)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Signature
+
+    def test_other__check_thunderbird_mail_text_quote(self):
+        text_and_quote = '''
+            <p>Pof<br>
+            </p>
+            <br>
+            <div class="moz-cite-prefix">Le 28/11/2017 à 11:21, John Doe a
+              écrit&nbsp;:<br>
+            </div>
+            <blockquote type="cite"
+              cite="mid:658592c1-14de-2958-5187-3571edea0aac@localhost.fr">
+              <meta http-equiv="Context-Type" 
+              content="text/html; charset=utf-8">
+              <p>Test<br>
+              </p>
+              <div class="moz-signature">-- <br>
+                TEST DE signature</div>
+            </blockquote>
+            <br>
+        '''
+        mail = ParsedHTMLMail(text_and_quote)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+
+    def test_other__check_thunderbird_mail_text_quote_text(self):
+        text_quote_text = '''
+        <p>Pof<br>
+        </p>
+        <br>
+        <div class="moz-cite-prefix">Le 28/11/2017 à 11:54, 
+         Bidule a
+          écrit&nbsp;:<br>
+        </div>
+        <blockquote type="cite"
+          cite="mid:b541b451-bb31-77a4-45b9-ad89969d7962@localhost.fr">
+          <meta http-equiv="Context-Type" 
+          content="text/html; charset=utf-8">
+          <p>Pof<br>
+          </p>
+          <br>
+          <div class="moz-cite-prefix">Le 28/11/2017 à 11:21, John Doe a
+            écrit&nbsp;:<br>
+          </div>
+          <blockquote type="cite"
+            cite="mid:658592c1-14de-2958-5187-3571edea0aac@localhost.fr">
+            <p>Test<br>
+            </p>
+            <div class="moz-signature">-- <br>
+              TEST DE signature</div>
+          </blockquote>
+          <br>
+        </blockquote>
+        Pif<br>
+        '''
+
+        mail = ParsedHTMLMail(text_quote_text)
+        elements = mail.get_elements()
+        assert len(elements) == 3
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+        assert elements[2].part_type == BodyMailPartType.Main
+
+    def test_other__check_thunderbird_mail_text_quote_signature(self):
+        text_quote_signature = '''
+        <p>Coucou<br>
+        </p>
+        <br>
+        <div class="moz-cite-prefix">Le 28/11/2017 à 11:22, Bidule a
+        écrit&nbsp;:<br>
+        </div>
+        <blockquote type="cite"
+        cite="mid:4e6923e2-796d-eccf-84b7-6824da4151ee@localhost.fr">Réponse<br>
+        <br>
+        Le 28/11/2017 à 11:21, John Doe a écrit&nbsp;: <br>
+        <blockquote type="cite"> <br>
+        Test <br>
+        <br>
+        --&nbsp;<br>
+        TEST DE signature <br>
+        </blockquote>
+        <br>
+        </blockquote>
+        <br>
+        <div class="moz-signature">-- <br>
+        TEST DE signature</div>
+        '''
+
+        mail = ParsedHTMLMail(text_quote_signature)
+        elements = mail.get_elements()
+        assert len(elements) == 3
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+        assert elements[2].part_type == BodyMailPartType.Signature
+
+    def test_other__check_thunderbird_mail_text_quote_text_signature(self):
+        text_quote_text_sign = '''
+        <p>Avant<br>
+        </p>
+        <br>
+        <div class="moz-cite-prefix">Le 28/11/2017 à 11:19, Bidule a
+          écrit&nbsp;:<br>
+        </div>
+        <blockquote type="cite"
+          cite="mid:635df73c-d3c9-f2e9-2304-24ff536bfa16@localhost.fr">Coucou 
+          <br><br>
+        </blockquote>
+        Aprés<br>
+        <br>
+        <div class="moz-signature">-- <br>
+          TEST DE signature</div>
+        '''
+
+        mail = ParsedHTMLMail(text_quote_text_sign)
+        elements = mail.get_elements()
+        assert len(elements) == 4
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+        assert elements[2].part_type == BodyMailPartType.Main
+        assert elements[3].part_type == BodyMailPartType.Signature
+
+    # INFO - G.M - 2017-11-28 - Test for outlook.com webapp html mail
+    # outlook.com ui doesn't seems to allow complex reply, new message
+    # and signature are always before quoted one.
+
+    def test_other__check_outlook_com_mail_text_only(self):
+
+        text_only = '''
+        <div id="divtagdefaultwrapper"
+        style="font-size:12pt;color:#000000;
+        font-family:Calibri,Helvetica,sans-serif;"
+        dir="ltr">
+        <p style="margin-top:0;margin-bottom:0">message<br>
+        </p>
+        </div>
+        '''
+        mail = ParsedHTMLMail(text_only)
+        elements = mail.get_elements()
+        assert len(elements) == 1
+        assert elements[0].part_type == BodyMailPartType.Main
+
+    def test_other__check_outlook_com_mail_text_signature(self):
+        text_and_signature = '''
+        <div id="divtagdefaultwrapper"
+        style="font-size:12pt;color:#000000;
+        font-family:Calibri,Helvetica,sans-serif;"
+          dir="ltr">
+          <p style="margin-top:0;margin-bottom:0">Test<br>
+          </p>
+          <p style="margin-top:0;margin-bottom:0"><br>
+          </p>
+          <div id="Signature">
+            <div id="divtagdefaultwrapper" style="font-size: 12pt; color:
+              rgb(0, 0, 0); background-color: rgb(255, 255, 255);
+              font-family:
+              Calibri,Arial,Helvetica,sans-serif,&quot;EmojiFont&quot;,&quot;Apple
+              Color Emoji&quot;,&quot;Segoe UI
+              Emoji&quot;,NotoColorEmoji,&quot;Segoe UI
+              Symbol&quot;,&quot;Android Emoji&quot;,EmojiSymbols;">
+              Envoyé à partir de <a href="http://aka.ms/weboutlook"
+                id="LPNoLP">Outlook</a></div>
+          </div>
+        </div>
+        '''
+        mail = ParsedHTMLMail(text_and_signature)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Signature
+
+    def test_other__check_outlook_com_mail_text_quote(self):
+        text_and_quote = '''
+        <div id="divtagdefaultwrapper"
+        style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;"
+        dir="ltr">
+        <p style="margin-top:0;margin-bottom:0">Salut !<br>
+        </p>
+        </div>
+        <hr style="display:inline-block;width:98%" tabindex="-1">
+        <div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt"
+        color="#000000" face="Calibri, sans-serif"><b>De :</b> John Doe<br>
+        <b>Envoyé :</b> mardi 28 novembre 2017 12:44:59<br>
+        <b>À :</b> dev.bidule@localhost.fr<br>
+        <b>Objet :</b> voila</font>
+        <div>&nbsp;</div>
+        </div>
+        <style type="text/css" style="display:none">
+        <!--
+        p
+        &#x09;{margin-top:0;
+        &#x09;margin-bottom:0}
+        -->
+        </style>
+        <div dir="ltr">
+        <div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt;
+        color:#000000; font-family:Calibri,Helvetica,sans-serif">
+        Contenu
+        <p style="margin-top:0; margin-bottom:0"><br>
+        </p>
+        <div id="x_Signature">
+          <div id="x_divtagdefaultwrapper" dir="ltr"
+            style="font-size:12pt; color:rgb(0,0,0);
+            background-color:rgb(255,255,255);
+        font-family:Calibri,Arial,Helvetica,sans-serif,&quot;EmojiFont&quot;,&quot;Apple
+            Color Emoji&quot;,&quot;Segoe UI
+            Emoji&quot;,NotoColorEmoji,&quot;Segoe UI
+            Symbol&quot;,&quot;Android Emoji&quot;,EmojiSymbols">
+            DLMQDNLQNDMLQS<br>
+            qs<br>
+            dqsd<br>
+            d<br>
+            qsd<br>
+          </div>
+        </div>
+        </div>
+        </div>
+        '''
+        mail = ParsedHTMLMail(text_and_quote)
+        elements = mail.get_elements()
+        assert len(elements) == 2
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Quote
+
+    def test_other__check_outlook_com_mail_text_signature_quote(self):
+        text_signature_quote = '''
+        <div id="divtagdefaultwrapper"
+        style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;"
+        dir="ltr">
+        <p style="margin-top:0;margin-bottom:0">Salut !<br>
+        </p>
+        <p style="margin-top:0;margin-bottom:0"><br>
+        </p>
+        <div id="Signature">
+        <div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt;
+        color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);
+        font-family:
+        Calibri,Arial,Helvetica,sans-serif,&quot;EmojiFont&quot;,&quot;Apple
+        Color Emoji&quot;,&quot;Segoe UI
+        Emoji&quot;,NotoColorEmoji,&quot;Segoe UI
+        Symbol&quot;,&quot;Android Emoji&quot;,EmojiSymbols;">
+        Envoyée depuis Outlook<br>
+        </div>
+        </div>
+        </div>
+        <hr style="display:inline-block;width:98%" tabindex="-1">
+        <div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt"
+        color="#000000" face="Calibri, sans-serif"><b>De :</b> John Doe
+        &lt;dev.bidule@localhost.fr&gt;<br>
+        <b>Envoyé :</b> mardi 28 novembre 2017 12:51:42<br>
+        <b>À :</b> John Doe<br>
+        <b>Objet :</b> Re: Test</font>
+        <div>&nbsp;</div>
+        </div>
+        <div style="background-color:#FFFFFF">
+        <p>Coucou<br>
+        </p>
+        <br>
+        <div class="x_moz-cite-prefix">Le 28/11/2017 à 12:39, John Doe a
+        écrit&nbsp;:<br>
+        </div>
+        <blockquote type="cite">
+        <div id="x_divtagdefaultwrapper" dir="ltr">
+        <p>Test<br>
+        </p>
+        <p><br>
+        </p>
+        <div id="x_Signature">
+        <div id="x_divtagdefaultwrapper">Envoyé à partir de <a
+        href="http://aka.ms/weboutlook" id="LPNoLP">
+        Outlook</a></div>
+        </div>
+        </div>
+        </blockquote>
+        <br>
+        <div class="x_moz-signature">-- <br>
+        TEST DE signature</div>
+        </div>
+        '''
+
+        mail = ParsedHTMLMail(text_signature_quote)
+        elements = mail.get_elements()
+        assert len(elements) == 3
+        assert elements[0].part_type == BodyMailPartType.Main
+        assert elements[1].part_type == BodyMailPartType.Signature
+        assert elements[2].part_type == BodyMailPartType.Quote

tracim/tracim/tests/library/test_email_fetcher.py

@@ -0,0 +1,11 @@
+from tracim.lib.email_fetcher import DecodedMail
+from tracim.tests import TestStandard
+
+class TestDecodedMail(TestStandard):
+    def test_unit__find_key_from_mail_address_no_key(self):
+        mail_address = "a@b"
+        assert DecodedMail.find_key_from_mail_address(mail_address) is None
+
+    def test_unit__find_key_from_mail_adress_key(self):
+        mail_address = "a+key@b"
+        assert DecodedMail.find_key_from_mail_address(mail_address) == 'key'

update.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-user="root"
-command="npm install \
-&& gulp prod"
-echo "############################################################################"
-echo "############################################################################"
-echo "## "
-echo "## UPDATE ----------"
-echo "## "
-echo "##" `date` Execute as $user: $command
-echo "## "
-echo "## "
-echo "############################################################################"
-if ! command -v npm >/dev/null; then
-  echo ""
-  echo "/!\ npm doesn't seem to be installed. Aborting."
-  echo ""
-  exit 1
-fi
-sudo -u $user -- bash -c "$command"