From dfa98cb65693d3f99b1718ec46754e166c26362d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi.rivard@aquilenet.fr>
Date: Thu, 29 Oct 2020 12:59:18 +0100
Subject: [PATCH] Base64 logo in emails. Fixes #26

---
 canaille/account.py                | 15 ++++++++++++++-
 canaille/admin/mail.py             | 15 ++++++++++++++-
 canaille/templates/mail/reset.html |  2 +-
 tests/test_mail_admin.py           |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/canaille/account.py b/canaille/account.py
index ac4b5361..b43d9eb5 100644
--- a/canaille/account.py
+++ b/canaille/account.py
@@ -1,6 +1,8 @@
+import base64
 import email.message
 import hashlib
 import smtplib
+import urllib.request
 
 from flask import Blueprint, request, flash, url_for, current_app
 from flask import render_template, redirect
@@ -109,6 +111,16 @@ def forgotten():
         uid=user.uid[0],
         hash=profile_hash(user.uid[0], user.userPassword[0]),
     )[1:]
+    logo = None
+    logo_extension = None
+    if current_app.config.get("LOGO"):
+        logo_extension = current_app.config["LOGO"].split(".")[-1]
+        try:
+            with urllib.request.urlopen(current_app.config.get("LOGO")) as f:
+                logo = base64.b64encode(f.read()).decode("utf-8")
+        except (urllib.error.HTTPError, urllib.error.URLError):
+            pass
+
     subject = _("Password reset on {website_name}").format(
         website_name=current_app.config.get("NAME", reset_url)
     )
@@ -124,7 +136,8 @@ def forgotten():
         site_name=current_app.config.get("NAME", reset_url),
         site_url=current_app.config.get("URL", base_url),
         reset_url=reset_url,
-        logo=current_app.config.get("LOGO"),
+        logo=logo,
+        logo_extension=logo_extension,
     )
 
     msg = email.message.EmailMessage()
diff --git a/canaille/admin/mail.py b/canaille/admin/mail.py
index a70459d6..04fc873a 100644
--- a/canaille/admin/mail.py
+++ b/canaille/admin/mail.py
@@ -1,3 +1,5 @@
+import base64
+import urllib.request
 from flask import Blueprint, render_template, current_app, request, url_for
 from canaille.flaskutils import admin_needed
 from canaille.account import profile_hash
@@ -16,12 +18,23 @@ def reset_html(user):
         hash=profile_hash(user.uid[0], user.userPassword[0]),
     )[1:]
 
+    logo = None
+    logo_extension = None
+    if current_app.config.get("LOGO"):
+        logo_extension = current_app.config["LOGO"].split(".")[-1]
+        try:
+            with urllib.request.urlopen(current_app.config.get("LOGO")) as f:
+                logo = base64.b64encode(f.read()).decode("utf-8")
+        except (urllib.error.HTTPError, urllib.error.URLError):
+            pass
+
     return render_template(
         "mail/reset.html",
         site_name=current_app.config.get("NAME", reset_url),
         site_url=current_app.config.get("URL", base_url),
         reset_url=reset_url,
-        logo=current_app.config.get("LOGO"),
+        logo=logo,
+        logo_extension=logo_extension,
     )
 
 
diff --git a/canaille/templates/mail/reset.html b/canaille/templates/mail/reset.html
index b9cd3bc4..0aaf3855 100644
--- a/canaille/templates/mail/reset.html
+++ b/canaille/templates/mail/reset.html
@@ -22,7 +22,7 @@ body {
         <div class="ui segment" style="line-height: 1.4285em; color: rgba(0,0,0,.87); font-family: 'Lato', sans-serif; font-weight: 400; box-sizing: inherit; position: relative; background: #fff; box-shadow: 0 1px 2px 0 rgba(34,36,38,.15); margin: 1rem 0; padding: 1em 1em; border-radius: .28571429rem; border: 1px solid rgba(34,36,38,.15); font-size: 1rem; margin-top: 0; margin-bottom: 0;">
             <h3 class="ui top attached header" style="box-sizing: inherit; font-family: Lato,'Helvetica Neue',Arial,Helvetica,sans-serif; font-weight: 700; line-height: 1.28571429em; text-transform: none; color: rgba(0,0,0,.87); font-size: 1.28571429rem; background: #fff; padding: .78571429rem 1rem; margin: 0 -1px 0 -1px; box-shadow: none; border: 1px solid #d4d4d5; border-radius: .28571429rem .28571429rem 0 0;">
                 {% if logo %}
-                    <img class="ui image" src="{{ logo }}" alt="{{ site_name }}" style="font-family: Lato,'Helvetica Neue',Arial,Helvetica,sans-serif; font-weight: 700; line-height: 1.28571429em; text-transform: none; color: rgba(0,0,0,.87); font-size: 1.28571429rem; box-sizing: inherit; border-style: none; position: relative; max-width: 50px; max-height:50px; background-color: transparent; display: inline-block; margin-top: .14285714em; width: 2.5em; height: auto; vertical-align: middle;">
+                    <img class="ui image" src="data:image/{{ logo_extension }};base64, {{ logo }}" alt="{{ site_name }}" style="font-family: Lato,'Helvetica Neue',Arial,Helvetica,sans-serif; font-weight: 700; line-height: 1.28571429em; text-transform: none; color: rgba(0,0,0,.87); font-size: 1.28571429rem; box-sizing: inherit; border-style: none; position: relative; max-width: 50px; max-height:50px; background-color: transparent; display: inline-block; margin-top: .14285714em; width: 2.5em; height: auto; vertical-align: middle;">
                 {% endif %}
                 <div class="content" style="font-family: Lato,'Helvetica Neue',Arial,Helvetica,sans-serif; font-weight: 700; line-height: 1.28571429em; text-transform: none; color: rgba(0,0,0,.87); font-size: 1.28571429rem; box-sizing: inherit; display: inline-block; padding-left: .75rem; vertical-align: middle;">
                 {% trans %}Password reinitialisation{% endtrans %}
diff --git a/tests/test_mail_admin.py b/tests/test_mail_admin.py
index f0fbd68b..92229faf 100644
--- a/tests/test_mail_admin.py
+++ b/tests/test_mail_admin.py
@@ -1,5 +1,6 @@
 def test_reset_html(testclient, logged_admin):
     testclient.get("/admin/mail/reset.html")
 
+
 def test_reset_txt(testclient, logged_admin):
     testclient.get("/admin/mail/reset.txt")