+
Multi Factor Authentication
+
Please open a TOTP application (Google Authenticator, Authy, MyDigiPassword, etc)
+ on your smartphone and scan the following QR Code:
+
-
+
-
+
+
+
+ Or you can use the manual entry with the following key:
+
+
+
+
+
+
-
- Or you can use the manual entry with the following key:
-
-
- {{ current_user.otp_secret }}
-
-
-
-
-
-
{% endblock %}
diff --git a/app/dashboard/templates/dashboard/unsubscribe.html b/app/dashboard/templates/dashboard/unsubscribe.html
index ecd8b262..63c09ad2 100644
--- a/app/dashboard/templates/dashboard/unsubscribe.html
+++ b/app/dashboard/templates/dashboard/unsubscribe.html
@@ -8,20 +8,22 @@
{% block default_content %}
-
-
- Block alias
-
-
- You are about to block the alias {{alias}}
-
-
- After this, you will stop receiving all emails sent to this alias, please confirm.
-
+
+
+
+ Block alias
+
+
+ You are about to block the alias {{ alias }}
+
+
+ After this, you will stop receiving all emails sent to this alias, please confirm.
+
-
+
+
{% endblock %}
diff --git a/app/dashboard/views/domain_detail.py b/app/dashboard/views/domain_detail.py
index 5f1fae21..497b3471 100644
--- a/app/dashboard/views/domain_detail.py
+++ b/app/dashboard/views/domain_detail.py
@@ -37,6 +37,8 @@ def domain_detail_dns(custom_domain_id):
if sorted(mx_domains) != sorted(EMAIL_SERVERS_WITH_PRIORITY):
flash("The MX record is not correctly set", "warning")
+ custom_domain.verified = False
+ db.session.commit()
mx_ok = False
# build mx_errors to show to user
mx_errors = [
@@ -66,6 +68,8 @@ def domain_detail_dns(custom_domain_id):
)
)
else:
+ custom_domain.spf_verified = False
+ db.session.commit()
flash(
f"SPF: {EMAIL_DOMAIN} is not included in your SPF record.",
"warning",
@@ -86,6 +90,8 @@ def domain_detail_dns(custom_domain_id):
)
)
else:
+ custom_domain.dkim_verified = False
+ db.session.commit()
flash("DKIM: the CNAME record is not correctly set", "warning")
dkim_ok = False
dkim_errors = [dkim_record or "[Empty]"]
@@ -102,6 +108,8 @@ def domain_detail_dns(custom_domain_id):
)
)
else:
+ custom_domain.dmarc_verified = False
+ db.session.commit()
flash(
f"DMARC: The TXT record is not correctly set", "warning",
)
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py
index fc314c50..2d9f1df6 100644
--- a/app/dashboard/views/index.py
+++ b/app/dashboard/views/index.py
@@ -1,11 +1,11 @@
from dataclasses import dataclass
-
from flask import render_template, request, redirect, url_for, flash
from flask_login import login_required, current_user
from sqlalchemy.orm import joinedload
from app import alias_utils
from app.api.serializer import get_alias_infos_with_pagination_v2
+from app.config import PAGE_LIMIT
from app.dashboard.base import dashboard_bp
from app.extensions import db
from app.log import LOG
@@ -140,18 +140,22 @@ def index():
stats = get_stats(current_user)
+ alias_infos = get_alias_infos_with_pagination_v2(
+ current_user, page, query, sort, alias_filter
+ )
+ last_page = len(alias_infos) < PAGE_LIMIT
+
return render_template(
"dashboard/index.html",
client_users=client_users,
- alias_infos=get_alias_infos_with_pagination_v2(
- current_user, page, query, sort, alias_filter
- ),
+ alias_infos=alias_infos,
highlight_alias_id=highlight_alias_id,
query=query,
AliasGeneratorEnum=AliasGeneratorEnum,
mailboxes=mailboxes,
show_intro=show_intro,
page=page,
+ last_page=last_page,
sort=sort,
filter=alias_filter,
stats=stats,
diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py
index 1174d5fe..9e02e0b1 100644
--- a/app/dashboard/views/mailbox.py
+++ b/app/dashboard/views/mailbox.py
@@ -8,7 +8,7 @@ from wtforms.fields.html5 import EmailField
from app.config import EMAIL_DOMAIN, ALIAS_DOMAINS, MAILBOX_SECRET, URL
from app.dashboard.base import dashboard_bp
from app.email_utils import (
- can_be_used_as_personal_email,
+ email_domain_can_be_used_as_mailbox,
mailbox_already_used,
render,
send_email,
@@ -86,7 +86,7 @@ def mailbox_route():
if mailbox_already_used(mailbox_email, current_user):
flash(f"{mailbox_email} already used", "error")
- elif not can_be_used_as_personal_email(mailbox_email):
+ elif not email_domain_can_be_used_as_mailbox(mailbox_email):
flash(f"You cannot use {mailbox_email}.", "error")
else:
new_mailbox = Mailbox.create(
diff --git a/app/dashboard/views/mailbox_detail.py b/app/dashboard/views/mailbox_detail.py
index b28057f2..01bb8aa8 100644
--- a/app/dashboard/views/mailbox_detail.py
+++ b/app/dashboard/views/mailbox_detail.py
@@ -10,7 +10,7 @@ from wtforms.fields.html5 import EmailField
from app.config import ENFORCE_SPF, MAILBOX_SECRET
from app.config import URL
from app.dashboard.base import dashboard_bp
-from app.email_utils import can_be_used_as_personal_email
+from app.email_utils import email_domain_can_be_used_as_mailbox
from app.email_utils import mailbox_already_used, render, send_email
from app.extensions import db
from app.log import LOG
@@ -54,7 +54,7 @@ def mailbox_detail_route(mailbox_id):
or DeletedAlias.get_by(email=new_email)
):
flash(f"Email {new_email} already used", "error")
- elif not can_be_used_as_personal_email(new_email):
+ elif not email_domain_can_be_used_as_mailbox(new_email):
flash("You cannot use this email address as your mailbox", "error")
else:
mailbox.new_email = new_email
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index aa647112..0a935667 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -12,7 +12,10 @@ from wtforms.fields.html5 import EmailField
from app import s3, email_utils
from app.config import URL
from app.dashboard.base import dashboard_bp
-from app.email_utils import can_be_used_as_personal_email, email_already_used
+from app.email_utils import (
+ email_domain_can_be_used_as_mailbox,
+ personal_email_already_used,
+)
from app.extensions import db
from app.log import LOG
from app.models import (
@@ -70,12 +73,12 @@ def setting():
# check if this email is not already used
if (
- email_already_used(new_email)
+ personal_email_already_used(new_email)
or Alias.get_by(email=new_email)
or DeletedAlias.get_by(email=new_email)
):
flash(f"Email {new_email} already used", "error")
- elif not can_be_used_as_personal_email(new_email):
+ elif not email_domain_can_be_used_as_mailbox(new_email):
flash(
"You cannot use this email address as your personal inbox.",
"error",
diff --git a/app/email_utils.py b/app/email_utils.py
index 582d1aa1..4ddf865c 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -346,10 +346,11 @@ def email_belongs_to_alias_domains(address: str) -> bool:
return False
-def can_be_used_as_personal_email(email: str) -> bool:
- """return True if an email can be used as a personal email. Currently the only condition is email domain is not
+def email_domain_can_be_used_as_mailbox(email: str) -> bool:
+ """return True if an email can be used as a personal email. An email domain can be used if it is not
- one of ALIAS_DOMAINS
- one of custom domains
+ - disposable domain
"""
domain = get_email_domain_part(email)
if not domain:
@@ -402,17 +403,12 @@ def get_mx_domain_list(domain) -> [str]:
return [d[:-1] for _, d in priority_domains]
-def email_already_used(email: str) -> bool:
- """test if an email can be used when:
- - user signs up
- - add a new mailbox
+def personal_email_already_used(email: str) -> bool:
+ """test if an email can be used as user email
"""
if User.get_by(email=email):
return True
- if Mailbox.get_by(email=email):
- return True
-
return False
@@ -503,7 +499,11 @@ def parseaddr_unicode(addr) -> (str, str):
name = name.strip()
decoded_string, charset = decode_header(name)[0]
if charset is not None:
- name = decoded_string.decode(charset)
+ try:
+ name = decoded_string.decode(charset)
+ except UnicodeDecodeError:
+ LOG.warning("Cannot decode addr name %s", name)
+ name = ""
else:
name = decoded_string
diff --git a/app/oauth/templates/oauth/authorize_nonlogin_user.html b/app/oauth/templates/oauth/authorize_nonlogin_user.html
index 602a259b..9cb3df75 100644
--- a/app/oauth/templates/oauth/authorize_nonlogin_user.html
+++ b/app/oauth/templates/oauth/authorize_nonlogin_user.html
@@ -1,61 +1,64 @@
{% extends "base.html" %}
{% block content %}
-
-
-
-
-
-
-
- {{ client.name }} would like to have access to your following data:
-
-
-
-
- {% for scope in client.get_scopes() %}
-
- {% if scope == Scope.AVATAR_URL %}
- avatar
- {% else %}
- {{ scope.value }}
- {% endif %}
-
- {% endfor %}
-
-
-
-
- In order to accept the request, you need to sign in.
-
-
-
-
-
-
- Login
-
-
-
- Sign Up
+
+
+
+
+
+
+
+ {{ client.name }} would like to have access to your following data:
+
+
+
+
+ {% for scope in client.get_scopes() %}
+
+ {% if scope == Scope.AVATAR_URL %}
+ avatar
+ {% else %}
+ {{ scope.value }}
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
+ In order to accept the request, you need to sign in.
+
+
+
+
+
+
+
+
Cancel and go back to {{ client.name }}
+
+
+
+
+
+
SimpleLogin is an open source social login provider that protects your
+ privacy.
+
+
-
-
-
-
-
Cancel and go back to {{ client.name }}
-
-
-
-
-
-
SimpleLogin is an open source social login provider that protects your privacy.
-
-
- SimpleLogin
+
diff --git a/templates/emails/com/newsletter/mailbox.html b/templates/emails/com/newsletter/mailbox.html
index a1e5a12e..3f494768 100644
--- a/templates/emails/com/newsletter/mailbox.html
+++ b/templates/emails/com/newsletter/mailbox.html
@@ -30,6 +30,6 @@ maybe for different uses: a Gmail account for social networks & forums, a Pronto
{% endblock %}
{% block footer %}
- This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
+ This email is sent to {{ user.email }}. Unsubscribe on
Settings
{% endblock %}
diff --git a/templates/emails/com/newsletter/mailbox.txt b/templates/emails/com/newsletter/mailbox.txt
index b9871308..b8c86e8f 100644
--- a/templates/emails/com/newsletter/mailbox.txt
+++ b/templates/emails/com/newsletter/mailbox.txt
@@ -1,4 +1,4 @@
-This email is sent to {{ user.email }} and is part of our onboarding series.
+This email is sent to {{ user.email }}.
Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
----------------
diff --git a/templates/emails/com/newsletter/mobile-darkmode.html b/templates/emails/com/newsletter/mobile-darkmode.html
index b4db6efd..c970293d 100644
--- a/templates/emails/com/newsletter/mobile-darkmode.html
+++ b/templates/emails/com/newsletter/mobile-darkmode.html
@@ -4,7 +4,8 @@
{{ render_text("Hi " + user.name) }}
{% call text() %}
- Son from SimpleLogin here. I hope you are doing well and are staying at home in this difficult time. By the way I'm writing this newsletter from my couch with my cats proofreading the text :).
+ Son from SimpleLogin here. I hope you are doing well and are staying at home in this difficult time. By the way I'm
+ writing this newsletter from my couch with my cats proofreading the text :).
Please find below some of our latest news.
{% endcall %}
@@ -49,8 +50,10 @@
You can set a name for your alias too: this name is used when you send emails or reply from your alias.
- We have also created a new
security page that goes into the technical details of SimpleLogin.
- Our
privacy page is also rewritten from scratch: nothing changes about your data protection
+ We have also created a new
security page that goes into the technical
+ details of SimpleLogin.
+ Our
privacy page is also rewritten from scratch: nothing changes about
+ your data protection
but the page is more clear and detailed now.
{% endcall %}
@@ -83,16 +86,19 @@
{% endcall %}
{% call text() %}
- We want to say thank you to all users who have helped to improve SimpleLogin code and even
- contribute important features.
+
+ On behalf of the team, I want to say thank you to all users who have helped to improve SimpleLogin code
+ and even contribute important features.
That means a lot to us as SimpleLogin is after all an open-source project.
{% endcall %}
{% call text() %}
- We always welcome your feedback. Get in touch on our
Twitter ,
-
Reddit , where you can also follow all our latest updates.
-
+ That's all for today. If you want to follow all our latest features, you can follow our
+
Twitter or join our
+
Reddit
+ or subscribe to our
RSS feed .
+ Now back to coding :).
{% endcall %}
{% call text() %}
diff --git a/templates/footer.html b/templates/footer.html
index 19645413..407bc7eb 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -33,8 +33,7 @@
Copyright © {{ YEAR }}
-
SimpleLogin
- .
+
SimpleLogin .
All rights reserved.
diff --git a/tests/test_email_utils.py b/tests/test_email_utils.py
index c043d58f..ef2cc522 100644
--- a/tests/test_email_utils.py
+++ b/tests/test_email_utils.py
@@ -4,7 +4,7 @@ from app.config import MAX_ALERT_24H
from app.email_utils import (
get_email_domain_part,
email_belongs_to_alias_domains,
- can_be_used_as_personal_email,
+ email_domain_can_be_used_as_mailbox,
delete_header,
add_or_replace_header,
parseaddr_unicode,
@@ -29,10 +29,10 @@ def test_email_belongs_to_alias_domains():
def test_can_be_used_as_personal_email(flask_client):
# default alias domain
- assert not can_be_used_as_personal_email("ab@sl.local")
- assert not can_be_used_as_personal_email("hey@d1.test")
+ assert not email_domain_can_be_used_as_mailbox("ab@sl.local")
+ assert not email_domain_can_be_used_as_mailbox("hey@d1.test")
- assert can_be_used_as_personal_email("hey@ab.cd")
+ assert email_domain_can_be_used_as_mailbox("hey@ab.cd")
# custom domain
user = User.create(
email="a@b.c", password="password", name="Test User", activated=True
@@ -40,17 +40,17 @@ def test_can_be_used_as_personal_email(flask_client):
db.session.commit()
CustomDomain.create(user_id=user.id, domain="ab.cd", verified=True)
db.session.commit()
- assert not can_be_used_as_personal_email("hey@ab.cd")
+ assert not email_domain_can_be_used_as_mailbox("hey@ab.cd")
# disposable domain
- assert not can_be_used_as_personal_email("abcd@10minutesmail.fr")
- assert not can_be_used_as_personal_email("abcd@temp-mail.com")
+ assert not email_domain_can_be_used_as_mailbox("abcd@10minutesmail.fr")
+ assert not email_domain_can_be_used_as_mailbox("abcd@temp-mail.com")
# subdomain will not work
- assert not can_be_used_as_personal_email("abcd@sub.temp-mail.com")
+ assert not email_domain_can_be_used_as_mailbox("abcd@sub.temp-mail.com")
# valid domains should not be affected
- assert can_be_used_as_personal_email("abcd@protonmail.com")
- assert can_be_used_as_personal_email("abcd@gmail.com")
- assert can_be_used_as_personal_email("abcd@example.com")
+ assert email_domain_can_be_used_as_mailbox("abcd@protonmail.com")
+ assert email_domain_can_be_used_as_mailbox("abcd@gmail.com")
+ assert email_domain_can_be_used_as_mailbox("abcd@example.com")
def test_delete_header():
