Compare commits
53 Commits
Author | SHA1 | Date |
---|---|---|
|
faae37b6bc | |
|
3fd9884c56 | |
|
4817dfdcaf | |
|
1ecc5eb89b | |
|
209ed65ebc | |
|
8a77a8b251 | |
|
b931518620 | |
|
9d2a35b9c2 | |
|
5f190d4b46 | |
|
6862ed3602 | |
|
450322fff1 | |
|
aad6f59e96 | |
|
8eccb05e33 | |
|
3e0b7bb369 | |
|
60ab8c15ec | |
|
b5b167479f | |
|
8f12fabd81 | |
|
b6004f3336 | |
|
80c8bc820b | |
|
037bc9da36 | |
|
ee0be3688f | |
|
015036b499 | |
|
d5df91aab6 | |
|
2eb5feaa8f | |
|
3c364da37d | |
|
36cf530ef8 | |
|
0da1811311 | |
|
f2fcaa6c60 | |
|
aa2c676b5e | |
|
30ddd4c807 | |
|
f5babd9c81 | |
|
74b811dd35 | |
|
e6c51bcf20 | |
|
4bfc6b9aca | |
|
e96de79665 | |
|
a608503df6 | |
|
0c3c6db2ab | |
|
9719a36dab | |
|
a7d4bd15a7 | |
|
565f6dc142 | |
|
76423527dd | |
|
501b225e40 | |
|
1dada1a4b5 | |
|
37f227da42 | |
|
97e68159c5 | |
|
673e19b287 | |
|
5959d40a00 | |
|
173ae6a221 | |
|
eb92823ef8 | |
|
363b851f61 | |
|
d0a6b8ed79 | |
|
50c130a3a3 | |
|
b462c256d3 |
|
@ -1,7 +1,6 @@
|
||||||
name: Test and lint
|
name: Test and lint
|
||||||
|
|
||||||
on:
|
on: [push, pull_request]
|
||||||
push:
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
|
@ -139,6 +138,12 @@ jobs:
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Create Sentry release
|
- name: Create Sentry release
|
||||||
uses: getsentry/action-release@v1
|
uses: getsentry/action-release@v1
|
||||||
env:
|
env:
|
||||||
|
@ -158,6 +163,7 @@ jobs:
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,12 @@ For most tests, you will need to have ``redis`` installed and started on your ma
|
||||||
sh scripts/run-test.sh
|
sh scripts/run-test.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
You can also run tests using a local Postgres DB to speed things up. This can be done by
|
||||||
|
|
||||||
|
- creating an empty test DB and running the database migration by `dropdb test && createdb test && DB_URI=postgresql://localhost:5432/test alembic upgrade head`
|
||||||
|
|
||||||
|
- replacing the `DB_URI` in `test.env` file by `DB_URI=postgresql://localhost:5432/test`
|
||||||
|
|
||||||
## Run the code locally
|
## Run the code locally
|
||||||
|
|
||||||
Install npm packages
|
Install npm packages
|
||||||
|
@ -151,10 +157,10 @@ Here are the small sum-ups of the directory structures and their roles:
|
||||||
|
|
||||||
## Pull request
|
## Pull request
|
||||||
|
|
||||||
The code is formatted using https://github.com/psf/black, to format the code, simply run
|
The code is formatted using [ruff](https://github.com/astral-sh/ruff), to format the code, simply run
|
||||||
|
|
||||||
```
|
```
|
||||||
poetry run black .
|
poetry run ruff format .
|
||||||
```
|
```
|
||||||
|
|
||||||
The code is also checked with `flake8`, make sure to run `flake8` before creating the pull request by
|
The code is also checked with `flake8`, make sure to run `flake8` before creating the pull request by
|
||||||
|
|
|
@ -168,6 +168,8 @@ class NewUserStrategy(ClientMergeStrategy):
|
||||||
|
|
||||||
class ExistingUnlinkedUserStrategy(ClientMergeStrategy):
|
class ExistingUnlinkedUserStrategy(ClientMergeStrategy):
|
||||||
def process(self) -> LinkResult:
|
def process(self) -> LinkResult:
|
||||||
|
# IF it was scheduled to be deleted. Unschedule it.
|
||||||
|
self.user.delete_on = None
|
||||||
partner_user = ensure_partner_user_exists_for_user(
|
partner_user = ensure_partner_user_exists_for_user(
|
||||||
self.link_request, self.user, self.partner
|
self.link_request, self.user, self.partner
|
||||||
)
|
)
|
||||||
|
@ -246,6 +248,8 @@ def link_user(
|
||||||
) -> LinkResult:
|
) -> LinkResult:
|
||||||
# Sanitize email just in case
|
# Sanitize email just in case
|
||||||
link_request.email = sanitize_email(link_request.email)
|
link_request.email = sanitize_email(link_request.email)
|
||||||
|
# If it was scheduled to be deleted. Unschedule it.
|
||||||
|
current_user.delete_on = None
|
||||||
partner_user = ensure_partner_user_exists_for_user(
|
partner_user = ensure_partner_user_exists_for_user(
|
||||||
link_request, current_user, partner
|
link_request, current_user, partner
|
||||||
)
|
)
|
||||||
|
|
|
@ -46,7 +46,8 @@ class SLModelView(sqla.ModelView):
|
||||||
|
|
||||||
def inaccessible_callback(self, name, **kwargs):
|
def inaccessible_callback(self, name, **kwargs):
|
||||||
# redirect to login page if user doesn't have access
|
# redirect to login page if user doesn't have access
|
||||||
return redirect(url_for("auth.login", next=request.url))
|
flash("You don't have access to the admin page", "error")
|
||||||
|
return redirect(url_for("dashboard.index", next=request.url))
|
||||||
|
|
||||||
def on_model_change(self, form, model, is_created):
|
def on_model_change(self, form, model, is_created):
|
||||||
changes = {}
|
changes = {}
|
||||||
|
|
|
@ -25,6 +25,12 @@ from app.email_utils import (
|
||||||
render,
|
render,
|
||||||
)
|
)
|
||||||
from app.errors import AliasInTrashError
|
from app.errors import AliasInTrashError
|
||||||
|
from app.events.event_dispatcher import EventDispatcher
|
||||||
|
from app.events.generated.event_pb2 import (
|
||||||
|
AliasDeleted,
|
||||||
|
AliasStatusChanged,
|
||||||
|
EventContent,
|
||||||
|
)
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import (
|
from app.models import (
|
||||||
Alias,
|
Alias,
|
||||||
|
@ -308,31 +314,36 @@ def delete_alias(alias: Alias, user: User):
|
||||||
Delete an alias and add it to either global or domain trash
|
Delete an alias and add it to either global or domain trash
|
||||||
Should be used instead of Alias.delete, DomainDeletedAlias.create, DeletedAlias.create
|
Should be used instead of Alias.delete, DomainDeletedAlias.create, DeletedAlias.create
|
||||||
"""
|
"""
|
||||||
# save deleted alias to either global or domain trash
|
LOG.i(f"User {user} has deleted alias {alias}")
|
||||||
|
# save deleted alias to either global or domain tra
|
||||||
if alias.custom_domain_id:
|
if alias.custom_domain_id:
|
||||||
if not DomainDeletedAlias.get_by(
|
if not DomainDeletedAlias.get_by(
|
||||||
email=alias.email, domain_id=alias.custom_domain_id
|
email=alias.email, domain_id=alias.custom_domain_id
|
||||||
):
|
):
|
||||||
LOG.d("add %s to domain %s trash", alias, alias.custom_domain_id)
|
domain_deleted_alias = DomainDeletedAlias(
|
||||||
Session.add(
|
user_id=user.id,
|
||||||
DomainDeletedAlias(
|
email=alias.email,
|
||||||
user_id=user.id,
|
domain_id=alias.custom_domain_id,
|
||||||
email=alias.email,
|
|
||||||
domain_id=alias.custom_domain_id,
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
Session.add(domain_deleted_alias)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
LOG.i(
|
||||||
|
f"Moving {alias} to domain {alias.custom_domain_id} trash {domain_deleted_alias}"
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
if not DeletedAlias.get_by(email=alias.email):
|
if not DeletedAlias.get_by(email=alias.email):
|
||||||
LOG.d("add %s to global trash", alias)
|
deleted_alias = DeletedAlias(email=alias.email)
|
||||||
Session.add(DeletedAlias(email=alias.email))
|
Session.add(deleted_alias)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
LOG.i(f"Moving {alias} to global trash {deleted_alias}")
|
||||||
|
|
||||||
LOG.i("delete alias %s", alias)
|
|
||||||
Alias.filter(Alias.id == alias.id).delete()
|
Alias.filter(Alias.id == alias.id).delete()
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
EventDispatcher.send_event(
|
||||||
|
user, EventContent(alias_deleted=AliasDeleted(alias_id=alias.id))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def aliases_for_mailbox(mailbox: Mailbox) -> [Alias]:
|
def aliases_for_mailbox(mailbox: Mailbox) -> [Alias]:
|
||||||
"""
|
"""
|
||||||
|
@ -458,3 +469,16 @@ def transfer_alias(alias, new_user, new_mailboxes: [Mailbox]):
|
||||||
alias.pinned = False
|
alias.pinned = False
|
||||||
|
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def change_alias_status(alias: Alias, enabled: bool, commit: bool = False):
|
||||||
|
LOG.i(f"Changing alias {alias} enabled to {enabled}")
|
||||||
|
alias.enabled = enabled
|
||||||
|
|
||||||
|
event = AliasStatusChanged(
|
||||||
|
alias_id=alias.id, alias_email=alias.email, enabled=enabled
|
||||||
|
)
|
||||||
|
EventDispatcher.send_event(alias.user, EventContent(alias_status_change=event))
|
||||||
|
|
||||||
|
if commit:
|
||||||
|
Session.commit()
|
||||||
|
|
|
@ -33,6 +33,9 @@ def authorize_request() -> Optional[Tuple[str, int]]:
|
||||||
if g.user.disabled:
|
if g.user.disabled:
|
||||||
return jsonify(error="Disabled account"), 403
|
return jsonify(error="Disabled account"), 403
|
||||||
|
|
||||||
|
if not g.user.is_active():
|
||||||
|
return jsonify(error="Account does not exist"), 401
|
||||||
|
|
||||||
g.api_key = api_key
|
g.api_key = api_key
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
|
@ -201,10 +201,10 @@ def get_alias_infos_with_pagination_v3(
|
||||||
q = q.order_by(Alias.pinned.desc())
|
q = q.order_by(Alias.pinned.desc())
|
||||||
q = q.order_by(latest_activity.desc())
|
q = q.order_by(latest_activity.desc())
|
||||||
|
|
||||||
q = list(q.limit(page_limit).offset(page_id * page_size))
|
q = q.limit(page_limit).offset(page_id * page_size)
|
||||||
|
|
||||||
ret = []
|
ret = []
|
||||||
for alias, contact, email_log, nb_reply, nb_blocked, nb_forward in q:
|
for alias, contact, email_log, nb_reply, nb_blocked, nb_forward in list(q):
|
||||||
ret.append(
|
ret.append(
|
||||||
AliasInfo(
|
AliasInfo(
|
||||||
alias=alias,
|
alias=alias,
|
||||||
|
@ -358,7 +358,6 @@ def construct_alias_query(user: User):
|
||||||
else_=0,
|
else_=0,
|
||||||
)
|
)
|
||||||
).label("nb_forward"),
|
).label("nb_forward"),
|
||||||
func.max(EmailLog.created_at).label("latest_email_log_created_at"),
|
|
||||||
)
|
)
|
||||||
.join(EmailLog, Alias.id == EmailLog.alias_id, isouter=True)
|
.join(EmailLog, Alias.id == EmailLog.alias_id, isouter=True)
|
||||||
.filter(Alias.user_id == user.id)
|
.filter(Alias.user_id == user.id)
|
||||||
|
@ -366,14 +365,6 @@ def construct_alias_query(user: User):
|
||||||
.subquery()
|
.subquery()
|
||||||
)
|
)
|
||||||
|
|
||||||
alias_contact_subquery = (
|
|
||||||
Session.query(Alias.id, func.max(Contact.id).label("max_contact_id"))
|
|
||||||
.join(Contact, Alias.id == Contact.alias_id, isouter=True)
|
|
||||||
.filter(Alias.user_id == user.id)
|
|
||||||
.group_by(Alias.id)
|
|
||||||
.subquery()
|
|
||||||
)
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
Session.query(
|
Session.query(
|
||||||
Alias,
|
Alias,
|
||||||
|
@ -385,23 +376,7 @@ def construct_alias_query(user: User):
|
||||||
)
|
)
|
||||||
.options(joinedload(Alias.hibp_breaches))
|
.options(joinedload(Alias.hibp_breaches))
|
||||||
.options(joinedload(Alias.custom_domain))
|
.options(joinedload(Alias.custom_domain))
|
||||||
.join(Contact, Alias.id == Contact.alias_id, isouter=True)
|
.join(EmailLog, Alias.last_email_log_id == EmailLog.id, isouter=True)
|
||||||
.join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True)
|
.join(Contact, EmailLog.contact_id == Contact.id, isouter=True)
|
||||||
.filter(Alias.id == alias_activity_subquery.c.id)
|
.filter(Alias.id == alias_activity_subquery.c.id)
|
||||||
.filter(Alias.id == alias_contact_subquery.c.id)
|
|
||||||
.filter(
|
|
||||||
or_(
|
|
||||||
EmailLog.created_at
|
|
||||||
== alias_activity_subquery.c.latest_email_log_created_at,
|
|
||||||
and_(
|
|
||||||
# no email log yet for this alias
|
|
||||||
alias_activity_subquery.c.latest_email_log_created_at.is_(None),
|
|
||||||
# to make sure only 1 contact is returned in this case
|
|
||||||
or_(
|
|
||||||
Contact.id == alias_contact_subquery.c.max_contact_id,
|
|
||||||
alias_contact_subquery.c.max_contact_id.is_(None),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,6 +25,7 @@ from app.errors import (
|
||||||
ErrAddressInvalid,
|
ErrAddressInvalid,
|
||||||
)
|
)
|
||||||
from app.extensions import limiter
|
from app.extensions import limiter
|
||||||
|
from app.log import LOG
|
||||||
from app.models import Alias, Contact, Mailbox, AliasMailbox
|
from app.models import Alias, Contact, Mailbox, AliasMailbox
|
||||||
|
|
||||||
|
|
||||||
|
@ -184,7 +185,8 @@ def toggle_alias(alias_id):
|
||||||
if not alias or alias.user_id != user.id:
|
if not alias or alias.user_id != user.id:
|
||||||
return jsonify(error="Forbidden"), 403
|
return jsonify(error="Forbidden"), 403
|
||||||
|
|
||||||
alias.enabled = not alias.enabled
|
alias_utils.change_alias_status(alias, enabled=not alias.enabled)
|
||||||
|
LOG.i(f"User {user} changed alias {alias} enabled status to {alias.enabled}")
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
return jsonify(enabled=alias.enabled), 200
|
return jsonify(enabled=alias.enabled), 200
|
||||||
|
|
|
@ -11,7 +11,7 @@ from itsdangerous import Signer
|
||||||
from app import email_utils
|
from app import email_utils
|
||||||
from app.api.base import api_bp
|
from app.api.base import api_bp
|
||||||
from app.config import FLASK_SECRET, DISABLE_REGISTRATION
|
from app.config import FLASK_SECRET, DISABLE_REGISTRATION
|
||||||
from app.dashboard.views.setting import send_reset_password_email
|
from app.dashboard.views.account_setting import send_reset_password_email
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
from app.email_utils import (
|
from app.email_utils import (
|
||||||
email_can_be_used_as_mailbox,
|
email_can_be_used_as_mailbox,
|
||||||
|
|
|
@ -16,6 +16,7 @@ from .views import (
|
||||||
social,
|
social,
|
||||||
recovery,
|
recovery,
|
||||||
api_to_cookie,
|
api_to_cookie,
|
||||||
|
oidc,
|
||||||
)
|
)
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
@ -36,4 +37,5 @@ __all__ = [
|
||||||
"social",
|
"social",
|
||||||
"recovery",
|
"recovery",
|
||||||
"api_to_cookie",
|
"api_to_cookie",
|
||||||
|
"oidc",
|
||||||
]
|
]
|
||||||
|
|
|
@ -3,10 +3,13 @@ from flask_login import login_user
|
||||||
|
|
||||||
from app.auth.base import auth_bp
|
from app.auth.base import auth_bp
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
|
from app.extensions import limiter
|
||||||
|
from app.log import LOG
|
||||||
from app.models import EmailChange, ResetPasswordCode
|
from app.models import EmailChange, ResetPasswordCode
|
||||||
|
|
||||||
|
|
||||||
@auth_bp.route("/change_email", methods=["GET", "POST"])
|
@auth_bp.route("/change_email", methods=["GET", "POST"])
|
||||||
|
@limiter.limit("3/hour")
|
||||||
def change_email():
|
def change_email():
|
||||||
code = request.args.get("code")
|
code = request.args.get("code")
|
||||||
|
|
||||||
|
@ -22,12 +25,14 @@ def change_email():
|
||||||
return render_template("auth/change_email.html")
|
return render_template("auth/change_email.html")
|
||||||
|
|
||||||
user = email_change.user
|
user = email_change.user
|
||||||
|
old_email = user.email
|
||||||
user.email = email_change.new_email
|
user.email = email_change.new_email
|
||||||
|
|
||||||
EmailChange.delete(email_change.id)
|
EmailChange.delete(email_change.id)
|
||||||
ResetPasswordCode.filter_by(user_id=user.id).delete()
|
ResetPasswordCode.filter_by(user_id=user.id).delete()
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
LOG.i(f"User {user} has changed their email from {old_email} to {user.email}")
|
||||||
flash("Your new email has been updated", "success")
|
flash("Your new email has been updated", "success")
|
||||||
|
|
||||||
login_user(user)
|
login_user(user)
|
||||||
|
|
|
@ -3,7 +3,7 @@ from flask_wtf import FlaskForm
|
||||||
from wtforms import StringField, validators
|
from wtforms import StringField, validators
|
||||||
|
|
||||||
from app.auth.base import auth_bp
|
from app.auth.base import auth_bp
|
||||||
from app.dashboard.views.setting import send_reset_password_email
|
from app.dashboard.views.account_setting import send_reset_password_email
|
||||||
from app.extensions import limiter
|
from app.extensions import limiter
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import User
|
from app.models import User
|
||||||
|
|
|
@ -7,7 +7,7 @@ from app.config import URL, GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import User, File, SocialAuth
|
from app.models import User, File, SocialAuth
|
||||||
from app.utils import random_string, sanitize_email
|
from app.utils import random_string, sanitize_email, sanitize_next_url
|
||||||
from .login_utils import after_login
|
from .login_utils import after_login
|
||||||
|
|
||||||
_authorization_base_url = "https://accounts.google.com/o/oauth2/v2/auth"
|
_authorization_base_url = "https://accounts.google.com/o/oauth2/v2/auth"
|
||||||
|
@ -29,7 +29,7 @@ def google_login():
|
||||||
# to avoid flask-login displaying the login error message
|
# to avoid flask-login displaying the login error message
|
||||||
session.pop("_flashes", None)
|
session.pop("_flashes", None)
|
||||||
|
|
||||||
next_url = request.args.get("next")
|
next_url = sanitize_next_url(request.args.get("next"))
|
||||||
|
|
||||||
# Google does not allow to append param to redirect_url
|
# Google does not allow to append param to redirect_url
|
||||||
# we need to pass the next url by session
|
# we need to pass the next url by session
|
||||||
|
|
|
@ -5,7 +5,7 @@ from wtforms import StringField, validators
|
||||||
|
|
||||||
from app.auth.base import auth_bp
|
from app.auth.base import auth_bp
|
||||||
from app.auth.views.login_utils import after_login
|
from app.auth.views.login_utils import after_login
|
||||||
from app.config import CONNECT_WITH_PROTON
|
from app.config import CONNECT_WITH_PROTON, CONNECT_WITH_OIDC_ICON, OIDC_CLIENT_ID
|
||||||
from app.events.auth_event import LoginEvent
|
from app.events.auth_event import LoginEvent
|
||||||
from app.extensions import limiter
|
from app.extensions import limiter
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
|
@ -77,4 +77,6 @@ def login():
|
||||||
next_url=next_url,
|
next_url=next_url,
|
||||||
show_resend_activation=show_resend_activation,
|
show_resend_activation=show_resend_activation,
|
||||||
connect_with_proton=CONNECT_WITH_PROTON,
|
connect_with_proton=CONNECT_WITH_PROTON,
|
||||||
|
connect_with_oidc=OIDC_CLIENT_ID is not None,
|
||||||
|
connect_with_oidc_icon=CONNECT_WITH_OIDC_ICON,
|
||||||
)
|
)
|
||||||
|
|
|
@ -0,0 +1,135 @@
|
||||||
|
from flask import request, session, redirect, flash, url_for
|
||||||
|
from requests_oauthlib import OAuth2Session
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
|
from app import config
|
||||||
|
from app.auth.base import auth_bp
|
||||||
|
from app.auth.views.login_utils import after_login
|
||||||
|
from app.config import (
|
||||||
|
URL,
|
||||||
|
OIDC_SCOPES,
|
||||||
|
OIDC_NAME_FIELD,
|
||||||
|
)
|
||||||
|
from app.db import Session
|
||||||
|
from app.email_utils import send_welcome_email
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import User, SocialAuth
|
||||||
|
from app.utils import sanitize_email, sanitize_next_url
|
||||||
|
|
||||||
|
|
||||||
|
# need to set explicitly redirect_uri instead of leaving the lib to pre-fill redirect_uri
|
||||||
|
# when served behind nginx, the redirect_uri is localhost... and not the real url
|
||||||
|
redirect_uri = URL + "/auth/oidc/callback"
|
||||||
|
|
||||||
|
SESSION_STATE_KEY = "oauth_state"
|
||||||
|
SESSION_NEXT_KEY = "oauth_redirect_next"
|
||||||
|
|
||||||
|
|
||||||
|
@auth_bp.route("/oidc/login")
|
||||||
|
def oidc_login():
|
||||||
|
if config.OIDC_CLIENT_ID is None or config.OIDC_CLIENT_SECRET is None:
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
|
||||||
|
next_url = sanitize_next_url(request.args.get("next"))
|
||||||
|
|
||||||
|
auth_url = requests.get(config.OIDC_WELL_KNOWN_URL).json()["authorization_endpoint"]
|
||||||
|
|
||||||
|
oidc = OAuth2Session(
|
||||||
|
config.OIDC_CLIENT_ID, scope=[OIDC_SCOPES], redirect_uri=redirect_uri
|
||||||
|
)
|
||||||
|
authorization_url, state = oidc.authorization_url(auth_url)
|
||||||
|
|
||||||
|
# State is used to prevent CSRF, keep this for later.
|
||||||
|
session[SESSION_STATE_KEY] = state
|
||||||
|
session[SESSION_NEXT_KEY] = next_url
|
||||||
|
return redirect(authorization_url)
|
||||||
|
|
||||||
|
|
||||||
|
@auth_bp.route("/oidc/callback")
|
||||||
|
def oidc_callback():
|
||||||
|
if SESSION_STATE_KEY not in session:
|
||||||
|
flash("Invalid state, please retry", "error")
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
if config.OIDC_CLIENT_ID is None or config.OIDC_CLIENT_SECRET is None:
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
|
||||||
|
# user clicks on cancel
|
||||||
|
if "error" in request.args:
|
||||||
|
flash("Please use another sign in method then", "warning")
|
||||||
|
return redirect("/")
|
||||||
|
|
||||||
|
oidc_configuration = requests.get(config.OIDC_WELL_KNOWN_URL).json()
|
||||||
|
user_info_url = oidc_configuration["userinfo_endpoint"]
|
||||||
|
token_url = oidc_configuration["token_endpoint"]
|
||||||
|
|
||||||
|
oidc = OAuth2Session(
|
||||||
|
config.OIDC_CLIENT_ID,
|
||||||
|
state=session[SESSION_STATE_KEY],
|
||||||
|
scope=[OIDC_SCOPES],
|
||||||
|
redirect_uri=redirect_uri,
|
||||||
|
)
|
||||||
|
oidc.fetch_token(
|
||||||
|
token_url,
|
||||||
|
client_secret=config.OIDC_CLIENT_SECRET,
|
||||||
|
authorization_response=request.url,
|
||||||
|
)
|
||||||
|
|
||||||
|
oidc_user_data = oidc.get(user_info_url)
|
||||||
|
if oidc_user_data.status_code != 200:
|
||||||
|
LOG.e(
|
||||||
|
f"cannot get oidc user data {oidc_user_data.status_code} {oidc_user_data.text}"
|
||||||
|
)
|
||||||
|
flash(
|
||||||
|
"Cannot get user data from OIDC, please use another way to login/sign up",
|
||||||
|
"error",
|
||||||
|
)
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
oidc_user_data = oidc_user_data.json()
|
||||||
|
|
||||||
|
email = oidc_user_data.get("email")
|
||||||
|
|
||||||
|
if not email:
|
||||||
|
LOG.e(f"cannot get email for OIDC user {oidc_user_data} {email}")
|
||||||
|
flash(
|
||||||
|
"Cannot get a valid email from OIDC, please another way to login/sign up",
|
||||||
|
"error",
|
||||||
|
)
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
|
||||||
|
email = sanitize_email(email)
|
||||||
|
user = User.get_by(email=email)
|
||||||
|
|
||||||
|
if not user and config.DISABLE_REGISTRATION:
|
||||||
|
flash(
|
||||||
|
"Sorry you cannot sign up via the OIDC provider. Please sign-up first with your email.",
|
||||||
|
"error",
|
||||||
|
)
|
||||||
|
return redirect(url_for("auth.register"))
|
||||||
|
elif not user:
|
||||||
|
user = create_user(email, oidc_user_data)
|
||||||
|
|
||||||
|
if not SocialAuth.get_by(user_id=user.id, social="oidc"):
|
||||||
|
SocialAuth.create(user_id=user.id, social="oidc")
|
||||||
|
Session.commit()
|
||||||
|
|
||||||
|
# The activation link contains the original page, for ex authorize page
|
||||||
|
next_url = session[SESSION_NEXT_KEY]
|
||||||
|
session[SESSION_NEXT_KEY] = None
|
||||||
|
|
||||||
|
return after_login(user, next_url)
|
||||||
|
|
||||||
|
|
||||||
|
def create_user(email, oidc_user_data):
|
||||||
|
new_user = User.create(
|
||||||
|
email=email,
|
||||||
|
name=oidc_user_data.get(OIDC_NAME_FIELD),
|
||||||
|
password="",
|
||||||
|
activated=True,
|
||||||
|
)
|
||||||
|
LOG.i(f"Created new user for login request from OIDC. New user {new_user.id}")
|
||||||
|
Session.commit()
|
||||||
|
|
||||||
|
send_welcome_email(new_user)
|
||||||
|
|
||||||
|
return new_user
|
|
@ -6,7 +6,7 @@ from wtforms import StringField, validators
|
||||||
|
|
||||||
from app import email_utils, config
|
from app import email_utils, config
|
||||||
from app.auth.base import auth_bp
|
from app.auth.base import auth_bp
|
||||||
from app.config import CONNECT_WITH_PROTON
|
from app.config import CONNECT_WITH_PROTON, CONNECT_WITH_OIDC_ICON
|
||||||
from app.auth.views.login_utils import get_referral
|
from app.auth.views.login_utils import get_referral
|
||||||
from app.config import URL, HCAPTCHA_SECRET, HCAPTCHA_SITEKEY
|
from app.config import URL, HCAPTCHA_SECRET, HCAPTCHA_SITEKEY
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
|
@ -109,6 +109,8 @@ def register():
|
||||||
next_url=next_url,
|
next_url=next_url,
|
||||||
HCAPTCHA_SITEKEY=HCAPTCHA_SITEKEY,
|
HCAPTCHA_SITEKEY=HCAPTCHA_SITEKEY,
|
||||||
connect_with_proton=CONNECT_WITH_PROTON,
|
connect_with_proton=CONNECT_WITH_PROTON,
|
||||||
|
connect_with_oidc=config.OIDC_CLIENT_ID is not None,
|
||||||
|
connect_with_oidc_icon=CONNECT_WITH_OIDC_ICON,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -234,7 +234,7 @@ else:
|
||||||
|
|
||||||
print("WARNING: Use a temp directory for GNUPGHOME", GNUPGHOME)
|
print("WARNING: Use a temp directory for GNUPGHOME", GNUPGHOME)
|
||||||
|
|
||||||
# Github, Google, Facebook client id and secrets
|
# Github, Google, Facebook, OIDC client id and secrets
|
||||||
GITHUB_CLIENT_ID = os.environ.get("GITHUB_CLIENT_ID")
|
GITHUB_CLIENT_ID = os.environ.get("GITHUB_CLIENT_ID")
|
||||||
GITHUB_CLIENT_SECRET = os.environ.get("GITHUB_CLIENT_SECRET")
|
GITHUB_CLIENT_SECRET = os.environ.get("GITHUB_CLIENT_SECRET")
|
||||||
|
|
||||||
|
@ -244,6 +244,13 @@ GOOGLE_CLIENT_SECRET = os.environ.get("GOOGLE_CLIENT_SECRET")
|
||||||
FACEBOOK_CLIENT_ID = os.environ.get("FACEBOOK_CLIENT_ID")
|
FACEBOOK_CLIENT_ID = os.environ.get("FACEBOOK_CLIENT_ID")
|
||||||
FACEBOOK_CLIENT_SECRET = os.environ.get("FACEBOOK_CLIENT_SECRET")
|
FACEBOOK_CLIENT_SECRET = os.environ.get("FACEBOOK_CLIENT_SECRET")
|
||||||
|
|
||||||
|
CONNECT_WITH_OIDC_ICON = os.environ.get("CONNECT_WITH_OIDC_ICON")
|
||||||
|
OIDC_WELL_KNOWN_URL = os.environ.get("OIDC_WELL_KNOWN_URL")
|
||||||
|
OIDC_CLIENT_ID = os.environ.get("OIDC_CLIENT_ID")
|
||||||
|
OIDC_CLIENT_SECRET = os.environ.get("OIDC_CLIENT_SECRET")
|
||||||
|
OIDC_SCOPES = os.environ.get("OIDC_SCOPES")
|
||||||
|
OIDC_NAME_FIELD = os.environ.get("OIDC_NAME_FIELD", "name")
|
||||||
|
|
||||||
PROTON_CLIENT_ID = os.environ.get("PROTON_CLIENT_ID")
|
PROTON_CLIENT_ID = os.environ.get("PROTON_CLIENT_ID")
|
||||||
PROTON_CLIENT_SECRET = os.environ.get("PROTON_CLIENT_SECRET")
|
PROTON_CLIENT_SECRET = os.environ.get("PROTON_CLIENT_SECRET")
|
||||||
PROTON_BASE_URL = os.environ.get(
|
PROTON_BASE_URL = os.environ.get(
|
||||||
|
@ -274,6 +281,7 @@ JOB_DELETE_MAILBOX = "delete-mailbox"
|
||||||
JOB_DELETE_DOMAIN = "delete-domain"
|
JOB_DELETE_DOMAIN = "delete-domain"
|
||||||
JOB_SEND_USER_REPORT = "send-user-report"
|
JOB_SEND_USER_REPORT = "send-user-report"
|
||||||
JOB_SEND_PROTON_WELCOME_1 = "proton-welcome-1"
|
JOB_SEND_PROTON_WELCOME_1 = "proton-welcome-1"
|
||||||
|
JOB_SEND_ALIAS_CREATION_EVENTS = "send-alias-creation-events"
|
||||||
|
|
||||||
# for pagination
|
# for pagination
|
||||||
PAGE_LIMIT = 20
|
PAGE_LIMIT = 20
|
||||||
|
@ -421,6 +429,11 @@ try:
|
||||||
except Exception:
|
except Exception:
|
||||||
HIBP_SCAN_INTERVAL_DAYS = 7
|
HIBP_SCAN_INTERVAL_DAYS = 7
|
||||||
HIBP_API_KEYS = sl_getenv("HIBP_API_KEYS", list) or []
|
HIBP_API_KEYS = sl_getenv("HIBP_API_KEYS", list) or []
|
||||||
|
HIBP_MAX_ALIAS_CHECK = 10_000
|
||||||
|
HIBP_RPM = int(os.environ.get("HIBP_API_RPM", 100))
|
||||||
|
HIBP_SKIP_PARTNER_ALIAS = os.environ.get("HIBP_SKIP_PARTNER_ALIAS")
|
||||||
|
|
||||||
|
KEEP_OLD_DATA_DAYS = 30
|
||||||
|
|
||||||
POSTMASTER = os.environ.get("POSTMASTER")
|
POSTMASTER = os.environ.get("POSTMASTER")
|
||||||
|
|
||||||
|
@ -567,3 +580,11 @@ MAX_API_KEYS = int(os.environ.get("MAX_API_KEYS", 30))
|
||||||
UPCLOUD_USERNAME = os.environ.get("UPCLOUD_USERNAME", None)
|
UPCLOUD_USERNAME = os.environ.get("UPCLOUD_USERNAME", None)
|
||||||
UPCLOUD_PASSWORD = os.environ.get("UPCLOUD_PASSWORD", None)
|
UPCLOUD_PASSWORD = os.environ.get("UPCLOUD_PASSWORD", None)
|
||||||
UPCLOUD_DB_ID = os.environ.get("UPCLOUD_DB_ID", None)
|
UPCLOUD_DB_ID = os.environ.get("UPCLOUD_DB_ID", None)
|
||||||
|
|
||||||
|
STORE_TRANSACTIONAL_EMAILS = "STORE_TRANSACTIONAL_EMAILS" in os.environ
|
||||||
|
|
||||||
|
EVENT_WEBHOOK = os.environ.get("EVENT_WEBHOOK", None)
|
||||||
|
|
||||||
|
# We want it disabled by default, so only skip if defined
|
||||||
|
EVENT_WEBHOOK_SKIP_VERIFY_SSL = "EVENT_WEBHOOK_SKIP_VERIFY_SSL" in os.environ
|
||||||
|
EVENT_WEBHOOK_DISABLE = "EVENT_WEBHOOK_DISABLE" in os.environ
|
||||||
|
|
|
@ -32,6 +32,7 @@ from .views import (
|
||||||
delete_account,
|
delete_account,
|
||||||
notification,
|
notification,
|
||||||
support,
|
support,
|
||||||
|
account_setting,
|
||||||
)
|
)
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
@ -68,4 +69,5 @@ __all__ = [
|
||||||
"delete_account",
|
"delete_account",
|
||||||
"notification",
|
"notification",
|
||||||
"support",
|
"support",
|
||||||
|
"account_setting",
|
||||||
]
|
]
|
||||||
|
|
|
@ -0,0 +1,242 @@
|
||||||
|
import arrow
|
||||||
|
from flask import (
|
||||||
|
render_template,
|
||||||
|
request,
|
||||||
|
redirect,
|
||||||
|
url_for,
|
||||||
|
flash,
|
||||||
|
)
|
||||||
|
from flask_login import login_required, current_user
|
||||||
|
|
||||||
|
from app import email_utils
|
||||||
|
from app.config import (
|
||||||
|
URL,
|
||||||
|
FIRST_ALIAS_DOMAIN,
|
||||||
|
ALIAS_RANDOM_SUFFIX_LENGTH,
|
||||||
|
CONNECT_WITH_PROTON,
|
||||||
|
)
|
||||||
|
from app.dashboard.base import dashboard_bp
|
||||||
|
from app.dashboard.views.enter_sudo import sudo_required
|
||||||
|
from app.dashboard.views.mailbox_detail import ChangeEmailForm
|
||||||
|
from app.db import Session
|
||||||
|
from app.email_utils import (
|
||||||
|
email_can_be_used_as_mailbox,
|
||||||
|
personal_email_already_used,
|
||||||
|
)
|
||||||
|
from app.extensions import limiter
|
||||||
|
from app.jobs.export_user_data_job import ExportUserDataJob
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import (
|
||||||
|
BlockBehaviourEnum,
|
||||||
|
PlanEnum,
|
||||||
|
ResetPasswordCode,
|
||||||
|
EmailChange,
|
||||||
|
User,
|
||||||
|
Alias,
|
||||||
|
AliasGeneratorEnum,
|
||||||
|
SenderFormatEnum,
|
||||||
|
UnsubscribeBehaviourEnum,
|
||||||
|
)
|
||||||
|
from app.proton.utils import perform_proton_account_unlink
|
||||||
|
from app.utils import (
|
||||||
|
random_string,
|
||||||
|
CSRFValidationForm,
|
||||||
|
canonicalize_email,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dashboard_bp.route("/account_setting", methods=["GET", "POST"])
|
||||||
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
@limiter.limit("5/minute", methods=["POST"])
|
||||||
|
def account_setting():
|
||||||
|
change_email_form = ChangeEmailForm()
|
||||||
|
csrf_form = CSRFValidationForm()
|
||||||
|
|
||||||
|
email_change = EmailChange.get_by(user_id=current_user.id)
|
||||||
|
if email_change:
|
||||||
|
pending_email = email_change.new_email
|
||||||
|
else:
|
||||||
|
pending_email = None
|
||||||
|
|
||||||
|
if request.method == "POST":
|
||||||
|
if not csrf_form.validate():
|
||||||
|
flash("Invalid request", "warning")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
if request.form.get("form-name") == "update-email":
|
||||||
|
if change_email_form.validate():
|
||||||
|
# whether user can proceed with the email update
|
||||||
|
new_email_valid = True
|
||||||
|
new_email = canonicalize_email(change_email_form.email.data)
|
||||||
|
if new_email != current_user.email and not pending_email:
|
||||||
|
# check if this email is not already used
|
||||||
|
if personal_email_already_used(new_email) or Alias.get_by(
|
||||||
|
email=new_email
|
||||||
|
):
|
||||||
|
flash(f"Email {new_email} already used", "error")
|
||||||
|
new_email_valid = False
|
||||||
|
elif not email_can_be_used_as_mailbox(new_email):
|
||||||
|
flash(
|
||||||
|
"You cannot use this email address as your personal inbox.",
|
||||||
|
"error",
|
||||||
|
)
|
||||||
|
new_email_valid = False
|
||||||
|
# a pending email change with the same email exists from another user
|
||||||
|
elif EmailChange.get_by(new_email=new_email):
|
||||||
|
other_email_change: EmailChange = EmailChange.get_by(
|
||||||
|
new_email=new_email
|
||||||
|
)
|
||||||
|
LOG.w(
|
||||||
|
"Another user has a pending %s with the same email address. Current user:%s",
|
||||||
|
other_email_change,
|
||||||
|
current_user,
|
||||||
|
)
|
||||||
|
|
||||||
|
if other_email_change.is_expired():
|
||||||
|
LOG.d(
|
||||||
|
"delete the expired email change %s", other_email_change
|
||||||
|
)
|
||||||
|
EmailChange.delete(other_email_change.id)
|
||||||
|
Session.commit()
|
||||||
|
else:
|
||||||
|
flash(
|
||||||
|
"You cannot use this email address as your personal inbox.",
|
||||||
|
"error",
|
||||||
|
)
|
||||||
|
new_email_valid = False
|
||||||
|
|
||||||
|
if new_email_valid:
|
||||||
|
email_change = EmailChange.create(
|
||||||
|
user_id=current_user.id,
|
||||||
|
code=random_string(
|
||||||
|
60
|
||||||
|
), # todo: make sure the code is unique
|
||||||
|
new_email=new_email,
|
||||||
|
)
|
||||||
|
Session.commit()
|
||||||
|
send_change_email_confirmation(current_user, email_change)
|
||||||
|
flash(
|
||||||
|
"A confirmation email is on the way, please check your inbox",
|
||||||
|
"success",
|
||||||
|
)
|
||||||
|
return redirect(url_for("dashboard.account_setting"))
|
||||||
|
elif request.form.get("form-name") == "change-password":
|
||||||
|
flash(
|
||||||
|
"You are going to receive an email containing instructions to change your password",
|
||||||
|
"success",
|
||||||
|
)
|
||||||
|
send_reset_password_email(current_user)
|
||||||
|
return redirect(url_for("dashboard.account_setting"))
|
||||||
|
elif request.form.get("form-name") == "send-full-user-report":
|
||||||
|
if ExportUserDataJob(current_user).store_job_in_db():
|
||||||
|
flash(
|
||||||
|
"You will receive your SimpleLogin data via email shortly",
|
||||||
|
"success",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
flash("An export of your data is currently in progress", "error")
|
||||||
|
|
||||||
|
partner_sub = None
|
||||||
|
partner_name = None
|
||||||
|
|
||||||
|
return render_template(
|
||||||
|
"dashboard/account_setting.html",
|
||||||
|
csrf_form=csrf_form,
|
||||||
|
PlanEnum=PlanEnum,
|
||||||
|
SenderFormatEnum=SenderFormatEnum,
|
||||||
|
BlockBehaviourEnum=BlockBehaviourEnum,
|
||||||
|
change_email_form=change_email_form,
|
||||||
|
pending_email=pending_email,
|
||||||
|
AliasGeneratorEnum=AliasGeneratorEnum,
|
||||||
|
UnsubscribeBehaviourEnum=UnsubscribeBehaviourEnum,
|
||||||
|
partner_sub=partner_sub,
|
||||||
|
partner_name=partner_name,
|
||||||
|
FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN,
|
||||||
|
ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RANDOM_SUFFIX_LENGTH,
|
||||||
|
connect_with_proton=CONNECT_WITH_PROTON,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def send_reset_password_email(user):
|
||||||
|
"""
|
||||||
|
generate a new ResetPasswordCode and send it over email to user
|
||||||
|
"""
|
||||||
|
# the activation code is valid for 1h
|
||||||
|
reset_password_code = ResetPasswordCode.create(
|
||||||
|
user_id=user.id, code=random_string(60)
|
||||||
|
)
|
||||||
|
Session.commit()
|
||||||
|
|
||||||
|
reset_password_link = f"{URL}/auth/reset_password?code={reset_password_code.code}"
|
||||||
|
|
||||||
|
email_utils.send_reset_password_email(user.email, reset_password_link)
|
||||||
|
|
||||||
|
|
||||||
|
def send_change_email_confirmation(user: User, email_change: EmailChange):
|
||||||
|
"""
|
||||||
|
send confirmation email to the new email address
|
||||||
|
"""
|
||||||
|
|
||||||
|
link = f"{URL}/auth/change_email?code={email_change.code}"
|
||||||
|
|
||||||
|
email_utils.send_change_email(email_change.new_email, user.email, link)
|
||||||
|
|
||||||
|
|
||||||
|
@dashboard_bp.route("/resend_email_change", methods=["GET", "POST"])
|
||||||
|
@limiter.limit("5/hour")
|
||||||
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
def resend_email_change():
|
||||||
|
form = CSRFValidationForm()
|
||||||
|
if not form.validate():
|
||||||
|
flash("Invalid request. Please try again", "warning")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
email_change = EmailChange.get_by(user_id=current_user.id)
|
||||||
|
if email_change:
|
||||||
|
# extend email change expiration
|
||||||
|
email_change.expired = arrow.now().shift(hours=12)
|
||||||
|
Session.commit()
|
||||||
|
|
||||||
|
send_change_email_confirmation(current_user, email_change)
|
||||||
|
flash("A confirmation email is on the way, please check your inbox", "success")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
else:
|
||||||
|
flash(
|
||||||
|
"You have no pending email change. Redirect back to Setting page", "warning"
|
||||||
|
)
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
|
|
||||||
|
@dashboard_bp.route("/cancel_email_change", methods=["GET", "POST"])
|
||||||
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
def cancel_email_change():
|
||||||
|
form = CSRFValidationForm()
|
||||||
|
if not form.validate():
|
||||||
|
flash("Invalid request. Please try again", "warning")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
email_change = EmailChange.get_by(user_id=current_user.id)
|
||||||
|
if email_change:
|
||||||
|
EmailChange.delete(email_change.id)
|
||||||
|
Session.commit()
|
||||||
|
flash("Your email change is cancelled", "success")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
else:
|
||||||
|
flash(
|
||||||
|
"You have no pending email change. Redirect back to Setting page", "warning"
|
||||||
|
)
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
|
|
||||||
|
@dashboard_bp.route("/unlink_proton_account", methods=["POST"])
|
||||||
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
def unlink_proton_account():
|
||||||
|
csrf_form = CSRFValidationForm()
|
||||||
|
if not csrf_form.validate():
|
||||||
|
flash("Invalid request", "warning")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
|
perform_proton_account_unlink(current_user)
|
||||||
|
flash("Your Proton account has been unlinked", "success")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
|
@ -1,9 +1,13 @@
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
from flask_login import login_required, current_user
|
from flask_login import login_required, current_user
|
||||||
from app.alias_utils import alias_export_csv
|
from app.alias_utils import alias_export_csv
|
||||||
|
from app.dashboard.views.enter_sudo import sudo_required
|
||||||
|
from app.extensions import limiter
|
||||||
|
|
||||||
|
|
||||||
@dashboard_bp.route("/alias_export", methods=["GET"])
|
@dashboard_bp.route("/alias_export", methods=["GET"])
|
||||||
@login_required
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
@limiter.limit("2/minute")
|
||||||
def alias_export_route():
|
def alias_export_route():
|
||||||
return alias_export_csv(current_user)
|
return alias_export_csv(current_user)
|
||||||
|
|
|
@ -5,7 +5,9 @@ from flask_login import login_required, current_user
|
||||||
from app import s3
|
from app import s3
|
||||||
from app.config import JOB_BATCH_IMPORT
|
from app.config import JOB_BATCH_IMPORT
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
|
from app.dashboard.views.enter_sudo import sudo_required
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
|
from app.extensions import limiter
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import File, BatchImport, Job
|
from app.models import File, BatchImport, Job
|
||||||
from app.utils import random_string, CSRFValidationForm
|
from app.utils import random_string, CSRFValidationForm
|
||||||
|
@ -13,6 +15,8 @@ from app.utils import random_string, CSRFValidationForm
|
||||||
|
|
||||||
@dashboard_bp.route("/batch_import", methods=["GET", "POST"])
|
@dashboard_bp.route("/batch_import", methods=["GET", "POST"])
|
||||||
@login_required
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
@limiter.limit("10/minute", methods=["POST"])
|
||||||
def batch_import_route():
|
def batch_import_route():
|
||||||
# only for users who have custom domains
|
# only for users who have custom domains
|
||||||
if not current_user.verified_custom_domains():
|
if not current_user.verified_custom_domains():
|
||||||
|
@ -37,7 +41,7 @@ def batch_import_route():
|
||||||
return redirect(request.url)
|
return redirect(request.url)
|
||||||
if len(batch_imports) > 10:
|
if len(batch_imports) > 10:
|
||||||
flash(
|
flash(
|
||||||
"You have too many imports already. Wait until some get cleaned up",
|
"You have too many imports already. Please wait until some get cleaned up",
|
||||||
"error",
|
"error",
|
||||||
)
|
)
|
||||||
return render_template(
|
return render_template(
|
||||||
|
|
|
@ -6,15 +6,15 @@ from flask_login import login_required, current_user
|
||||||
from flask_wtf import FlaskForm
|
from flask_wtf import FlaskForm
|
||||||
from wtforms import PasswordField, validators
|
from wtforms import PasswordField, validators
|
||||||
|
|
||||||
from app.config import CONNECT_WITH_PROTON
|
from app.config import CONNECT_WITH_PROTON, OIDC_CLIENT_ID, CONNECT_WITH_OIDC_ICON
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
from app.extensions import limiter
|
from app.extensions import limiter
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import PartnerUser
|
from app.models import PartnerUser, SocialAuth
|
||||||
from app.proton.utils import get_proton_partner
|
from app.proton.utils import get_proton_partner
|
||||||
from app.utils import sanitize_next_url
|
from app.utils import sanitize_next_url
|
||||||
|
|
||||||
_SUDO_GAP = 900
|
_SUDO_GAP = 120
|
||||||
|
|
||||||
|
|
||||||
class LoginForm(FlaskForm):
|
class LoginForm(FlaskForm):
|
||||||
|
@ -51,11 +51,19 @@ def enter_sudo():
|
||||||
if not partner_user or partner_user.partner_id != get_proton_partner().id:
|
if not partner_user or partner_user.partner_id != get_proton_partner().id:
|
||||||
proton_enabled = False
|
proton_enabled = False
|
||||||
|
|
||||||
|
oidc_enabled = OIDC_CLIENT_ID is not None
|
||||||
|
if oidc_enabled:
|
||||||
|
oidc_enabled = (
|
||||||
|
SocialAuth.get_by(user_id=current_user.id, social="oidc") is not None
|
||||||
|
)
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
"dashboard/enter_sudo.html",
|
"dashboard/enter_sudo.html",
|
||||||
password_check_form=password_check_form,
|
password_check_form=password_check_form,
|
||||||
next=request.args.get("next"),
|
next=request.args.get("next"),
|
||||||
connect_with_proton=proton_enabled,
|
connect_with_proton=proton_enabled,
|
||||||
|
connect_with_oidc=oidc_enabled,
|
||||||
|
connect_with_oidc_icon=CONNECT_WITH_OIDC_ICON,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -141,12 +141,12 @@ def index():
|
||||||
)
|
)
|
||||||
|
|
||||||
if request.form.get("form-name") == "delete-alias":
|
if request.form.get("form-name") == "delete-alias":
|
||||||
LOG.d("delete alias %s", alias)
|
LOG.i(f"User {current_user} requested deletion of alias {alias}")
|
||||||
email = alias.email
|
email = alias.email
|
||||||
alias_utils.delete_alias(alias, current_user)
|
alias_utils.delete_alias(alias, current_user)
|
||||||
flash(f"Alias {email} has been deleted", "success")
|
flash(f"Alias {email} has been deleted", "success")
|
||||||
elif request.form.get("form-name") == "disable-alias":
|
elif request.form.get("form-name") == "disable-alias":
|
||||||
alias.enabled = False
|
alias_utils.change_alias_status(alias, enabled=False)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash(f"Alias {alias.email} has been disabled", "success")
|
flash(f"Alias {alias.email} has been disabled", "success")
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,11 @@ from wtforms.fields.html5 import EmailField
|
||||||
from app.config import ENFORCE_SPF, MAILBOX_SECRET
|
from app.config import ENFORCE_SPF, MAILBOX_SECRET
|
||||||
from app.config import URL
|
from app.config import URL
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
|
from app.dashboard.views.enter_sudo import sudo_required
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
from app.email_utils import email_can_be_used_as_mailbox
|
from app.email_utils import email_can_be_used_as_mailbox
|
||||||
from app.email_utils import mailbox_already_used, render, send_email
|
from app.email_utils import mailbox_already_used, render, send_email
|
||||||
|
from app.extensions import limiter
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import Alias, AuthorizedAddress
|
from app.models import Alias, AuthorizedAddress
|
||||||
from app.models import Mailbox
|
from app.models import Mailbox
|
||||||
|
@ -29,6 +31,8 @@ class ChangeEmailForm(FlaskForm):
|
||||||
|
|
||||||
@dashboard_bp.route("/mailbox/<int:mailbox_id>/", methods=["GET", "POST"])
|
@dashboard_bp.route("/mailbox/<int:mailbox_id>/", methods=["GET", "POST"])
|
||||||
@login_required
|
@login_required
|
||||||
|
@sudo_required
|
||||||
|
@limiter.limit("20/minute", methods=["POST"])
|
||||||
def mailbox_detail_route(mailbox_id):
|
def mailbox_detail_route(mailbox_id):
|
||||||
mailbox: Mailbox = Mailbox.get(mailbox_id)
|
mailbox: Mailbox = Mailbox.get(mailbox_id)
|
||||||
if not mailbox or mailbox.user_id != current_user.id:
|
if not mailbox or mailbox.user_id != current_user.id:
|
||||||
|
@ -179,8 +183,15 @@ def mailbox_detail_route(mailbox_id):
|
||||||
|
|
||||||
elif request.form.get("form-name") == "toggle-pgp":
|
elif request.form.get("form-name") == "toggle-pgp":
|
||||||
if request.form.get("pgp-enabled") == "on":
|
if request.form.get("pgp-enabled") == "on":
|
||||||
mailbox.disable_pgp = False
|
if mailbox.is_proton():
|
||||||
flash(f"PGP is enabled on {mailbox.email}", "success")
|
mailbox.disable_pgp = True
|
||||||
|
flash(
|
||||||
|
"Enabling PGP for a Proton Mail mailbox is redundant and does not add any security benefit",
|
||||||
|
"info",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
mailbox.disable_pgp = False
|
||||||
|
flash(f"PGP is enabled on {mailbox.email}", "info")
|
||||||
else:
|
else:
|
||||||
mailbox.disable_pgp = True
|
mailbox.disable_pgp = True
|
||||||
flash(f"PGP is disabled on {mailbox.email}", "info")
|
flash(f"PGP is disabled on {mailbox.email}", "info")
|
||||||
|
|
|
@ -13,34 +13,24 @@ from flask_login import login_required, current_user
|
||||||
from flask_wtf import FlaskForm
|
from flask_wtf import FlaskForm
|
||||||
from flask_wtf.file import FileField
|
from flask_wtf.file import FileField
|
||||||
from wtforms import StringField, validators
|
from wtforms import StringField, validators
|
||||||
from wtforms.fields.html5 import EmailField
|
|
||||||
|
|
||||||
from app import s3, email_utils
|
from app import s3
|
||||||
from app.config import (
|
from app.config import (
|
||||||
URL,
|
|
||||||
FIRST_ALIAS_DOMAIN,
|
FIRST_ALIAS_DOMAIN,
|
||||||
ALIAS_RANDOM_SUFFIX_LENGTH,
|
ALIAS_RANDOM_SUFFIX_LENGTH,
|
||||||
CONNECT_WITH_PROTON,
|
CONNECT_WITH_PROTON,
|
||||||
)
|
)
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
from app.email_utils import (
|
|
||||||
email_can_be_used_as_mailbox,
|
|
||||||
personal_email_already_used,
|
|
||||||
)
|
|
||||||
from app.errors import ProtonPartnerNotSetUp
|
from app.errors import ProtonPartnerNotSetUp
|
||||||
from app.extensions import limiter
|
from app.extensions import limiter
|
||||||
from app.image_validation import detect_image_format, ImageFormat
|
from app.image_validation import detect_image_format, ImageFormat
|
||||||
from app.jobs.export_user_data_job import ExportUserDataJob
|
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import (
|
from app.models import (
|
||||||
BlockBehaviourEnum,
|
BlockBehaviourEnum,
|
||||||
PlanEnum,
|
PlanEnum,
|
||||||
File,
|
File,
|
||||||
ResetPasswordCode,
|
|
||||||
EmailChange,
|
EmailChange,
|
||||||
User,
|
|
||||||
Alias,
|
|
||||||
CustomDomain,
|
CustomDomain,
|
||||||
AliasGeneratorEnum,
|
AliasGeneratorEnum,
|
||||||
AliasSuffixEnum,
|
AliasSuffixEnum,
|
||||||
|
@ -53,11 +43,10 @@ from app.models import (
|
||||||
PartnerSubscription,
|
PartnerSubscription,
|
||||||
UnsubscribeBehaviourEnum,
|
UnsubscribeBehaviourEnum,
|
||||||
)
|
)
|
||||||
from app.proton.utils import get_proton_partner, perform_proton_account_unlink
|
from app.proton.utils import get_proton_partner
|
||||||
from app.utils import (
|
from app.utils import (
|
||||||
random_string,
|
random_string,
|
||||||
CSRFValidationForm,
|
CSRFValidationForm,
|
||||||
canonicalize_email,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -66,12 +55,6 @@ class SettingForm(FlaskForm):
|
||||||
profile_picture = FileField("Profile Picture")
|
profile_picture = FileField("Profile Picture")
|
||||||
|
|
||||||
|
|
||||||
class ChangeEmailForm(FlaskForm):
|
|
||||||
email = EmailField(
|
|
||||||
"email", validators=[validators.DataRequired(), validators.Email()]
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class PromoCodeForm(FlaskForm):
|
class PromoCodeForm(FlaskForm):
|
||||||
code = StringField("Name", validators=[validators.DataRequired()])
|
code = StringField("Name", validators=[validators.DataRequired()])
|
||||||
|
|
||||||
|
@ -109,7 +92,6 @@ def get_partner_subscription_and_name(
|
||||||
def setting():
|
def setting():
|
||||||
form = SettingForm()
|
form = SettingForm()
|
||||||
promo_form = PromoCodeForm()
|
promo_form = PromoCodeForm()
|
||||||
change_email_form = ChangeEmailForm()
|
|
||||||
csrf_form = CSRFValidationForm()
|
csrf_form = CSRFValidationForm()
|
||||||
|
|
||||||
email_change = EmailChange.get_by(user_id=current_user.id)
|
email_change = EmailChange.get_by(user_id=current_user.id)
|
||||||
|
@ -122,63 +104,7 @@ def setting():
|
||||||
if not csrf_form.validate():
|
if not csrf_form.validate():
|
||||||
flash("Invalid request", "warning")
|
flash("Invalid request", "warning")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
if request.form.get("form-name") == "update-email":
|
|
||||||
if change_email_form.validate():
|
|
||||||
# whether user can proceed with the email update
|
|
||||||
new_email_valid = True
|
|
||||||
new_email = canonicalize_email(change_email_form.email.data)
|
|
||||||
if new_email != current_user.email and not pending_email:
|
|
||||||
# check if this email is not already used
|
|
||||||
if personal_email_already_used(new_email) or Alias.get_by(
|
|
||||||
email=new_email
|
|
||||||
):
|
|
||||||
flash(f"Email {new_email} already used", "error")
|
|
||||||
new_email_valid = False
|
|
||||||
elif not email_can_be_used_as_mailbox(new_email):
|
|
||||||
flash(
|
|
||||||
"You cannot use this email address as your personal inbox.",
|
|
||||||
"error",
|
|
||||||
)
|
|
||||||
new_email_valid = False
|
|
||||||
# a pending email change with the same email exists from another user
|
|
||||||
elif EmailChange.get_by(new_email=new_email):
|
|
||||||
other_email_change: EmailChange = EmailChange.get_by(
|
|
||||||
new_email=new_email
|
|
||||||
)
|
|
||||||
LOG.w(
|
|
||||||
"Another user has a pending %s with the same email address. Current user:%s",
|
|
||||||
other_email_change,
|
|
||||||
current_user,
|
|
||||||
)
|
|
||||||
|
|
||||||
if other_email_change.is_expired():
|
|
||||||
LOG.d(
|
|
||||||
"delete the expired email change %s", other_email_change
|
|
||||||
)
|
|
||||||
EmailChange.delete(other_email_change.id)
|
|
||||||
Session.commit()
|
|
||||||
else:
|
|
||||||
flash(
|
|
||||||
"You cannot use this email address as your personal inbox.",
|
|
||||||
"error",
|
|
||||||
)
|
|
||||||
new_email_valid = False
|
|
||||||
|
|
||||||
if new_email_valid:
|
|
||||||
email_change = EmailChange.create(
|
|
||||||
user_id=current_user.id,
|
|
||||||
code=random_string(
|
|
||||||
60
|
|
||||||
), # todo: make sure the code is unique
|
|
||||||
new_email=new_email,
|
|
||||||
)
|
|
||||||
Session.commit()
|
|
||||||
send_change_email_confirmation(current_user, email_change)
|
|
||||||
flash(
|
|
||||||
"A confirmation email is on the way, please check your inbox",
|
|
||||||
"success",
|
|
||||||
)
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
if request.form.get("form-name") == "update-profile":
|
if request.form.get("form-name") == "update-profile":
|
||||||
if form.validate():
|
if form.validate():
|
||||||
profile_updated = False
|
profile_updated = False
|
||||||
|
@ -222,15 +148,6 @@ def setting():
|
||||||
if profile_updated:
|
if profile_updated:
|
||||||
flash("Your profile has been updated", "success")
|
flash("Your profile has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "change-password":
|
|
||||||
flash(
|
|
||||||
"You are going to receive an email containing instructions to change your password",
|
|
||||||
"success",
|
|
||||||
)
|
|
||||||
send_reset_password_email(current_user)
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
|
|
||||||
elif request.form.get("form-name") == "notification-preference":
|
elif request.form.get("form-name") == "notification-preference":
|
||||||
choose = request.form.get("notification")
|
choose = request.form.get("notification")
|
||||||
if choose == "on":
|
if choose == "on":
|
||||||
|
@ -240,7 +157,6 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your notification preference has been updated", "success")
|
flash("Your notification preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "change-alias-generator":
|
elif request.form.get("form-name") == "change-alias-generator":
|
||||||
scheme = int(request.form.get("alias-generator-scheme"))
|
scheme = int(request.form.get("alias-generator-scheme"))
|
||||||
if AliasGeneratorEnum.has_value(scheme):
|
if AliasGeneratorEnum.has_value(scheme):
|
||||||
|
@ -248,7 +164,6 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your preference has been updated", "success")
|
flash("Your preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "change-random-alias-default-domain":
|
elif request.form.get("form-name") == "change-random-alias-default-domain":
|
||||||
default_domain = request.form.get("random-alias-default-domain")
|
default_domain = request.form.get("random-alias-default-domain")
|
||||||
|
|
||||||
|
@ -287,7 +202,6 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your preference has been updated", "success")
|
flash("Your preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "random-alias-suffix":
|
elif request.form.get("form-name") == "random-alias-suffix":
|
||||||
scheme = int(request.form.get("random-alias-suffix-generator"))
|
scheme = int(request.form.get("random-alias-suffix-generator"))
|
||||||
if AliasSuffixEnum.has_value(scheme):
|
if AliasSuffixEnum.has_value(scheme):
|
||||||
|
@ -295,7 +209,6 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your preference has been updated", "success")
|
flash("Your preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "change-sender-format":
|
elif request.form.get("form-name") == "change-sender-format":
|
||||||
sender_format = int(request.form.get("sender-format"))
|
sender_format = int(request.form.get("sender-format"))
|
||||||
if SenderFormatEnum.has_value(sender_format):
|
if SenderFormatEnum.has_value(sender_format):
|
||||||
|
@ -305,7 +218,6 @@ def setting():
|
||||||
flash("Your sender format preference has been updated", "success")
|
flash("Your sender format preference has been updated", "success")
|
||||||
Session.commit()
|
Session.commit()
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "replace-ra":
|
elif request.form.get("form-name") == "replace-ra":
|
||||||
choose = request.form.get("replace-ra")
|
choose = request.form.get("replace-ra")
|
||||||
if choose == "on":
|
if choose == "on":
|
||||||
|
@ -315,7 +227,21 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your preference has been updated", "success")
|
flash("Your preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
elif request.form.get("form-name") == "enable_data_breach_check":
|
||||||
|
if not current_user.is_premium():
|
||||||
|
flash("Only premium plan can enable data breach monitoring", "warning")
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
choose = request.form.get("enable_data_breach_check")
|
||||||
|
if choose == "on":
|
||||||
|
LOG.i("User {current_user} has enabled data breach monitoring")
|
||||||
|
current_user.enable_data_breach_check = True
|
||||||
|
flash("Data breach monitoring is enabled", "success")
|
||||||
|
else:
|
||||||
|
LOG.i("User {current_user} has disabled data breach monitoring")
|
||||||
|
current_user.enable_data_breach_check = False
|
||||||
|
flash("Data breach monitoring is disabled", "info")
|
||||||
|
Session.commit()
|
||||||
|
return redirect(url_for("dashboard.setting"))
|
||||||
elif request.form.get("form-name") == "sender-in-ra":
|
elif request.form.get("form-name") == "sender-in-ra":
|
||||||
choose = request.form.get("enable")
|
choose = request.form.get("enable")
|
||||||
if choose == "on":
|
if choose == "on":
|
||||||
|
@ -325,7 +251,6 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your preference has been updated", "success")
|
flash("Your preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
|
|
||||||
elif request.form.get("form-name") == "expand-alias-info":
|
elif request.form.get("form-name") == "expand-alias-info":
|
||||||
choose = request.form.get("enable")
|
choose = request.form.get("enable")
|
||||||
if choose == "on":
|
if choose == "on":
|
||||||
|
@ -387,14 +312,6 @@ def setting():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
flash("Your preference has been updated", "success")
|
flash("Your preference has been updated", "success")
|
||||||
return redirect(url_for("dashboard.setting"))
|
return redirect(url_for("dashboard.setting"))
|
||||||
elif request.form.get("form-name") == "send-full-user-report":
|
|
||||||
if ExportUserDataJob(current_user).store_job_in_db():
|
|
||||||
flash(
|
|
||||||
"You will receive your SimpleLogin data via email shortly",
|
|
||||||
"success",
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
flash("An export of your data is currently in progress", "error")
|
|
||||||
|
|
||||||
manual_sub = ManualSubscription.get_by(user_id=current_user.id)
|
manual_sub = ManualSubscription.get_by(user_id=current_user.id)
|
||||||
apple_sub = AppleSubscription.get_by(user_id=current_user.id)
|
apple_sub = AppleSubscription.get_by(user_id=current_user.id)
|
||||||
|
@ -417,7 +334,6 @@ def setting():
|
||||||
SenderFormatEnum=SenderFormatEnum,
|
SenderFormatEnum=SenderFormatEnum,
|
||||||
BlockBehaviourEnum=BlockBehaviourEnum,
|
BlockBehaviourEnum=BlockBehaviourEnum,
|
||||||
promo_form=promo_form,
|
promo_form=promo_form,
|
||||||
change_email_form=change_email_form,
|
|
||||||
pending_email=pending_email,
|
pending_email=pending_email,
|
||||||
AliasGeneratorEnum=AliasGeneratorEnum,
|
AliasGeneratorEnum=AliasGeneratorEnum,
|
||||||
UnsubscribeBehaviourEnum=UnsubscribeBehaviourEnum,
|
UnsubscribeBehaviourEnum=UnsubscribeBehaviourEnum,
|
||||||
|
@ -432,85 +348,3 @@ def setting():
|
||||||
connect_with_proton=CONNECT_WITH_PROTON,
|
connect_with_proton=CONNECT_WITH_PROTON,
|
||||||
proton_linked_account=proton_linked_account,
|
proton_linked_account=proton_linked_account,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def send_reset_password_email(user):
|
|
||||||
"""
|
|
||||||
generate a new ResetPasswordCode and send it over email to user
|
|
||||||
"""
|
|
||||||
# the activation code is valid for 1h
|
|
||||||
reset_password_code = ResetPasswordCode.create(
|
|
||||||
user_id=user.id, code=random_string(60)
|
|
||||||
)
|
|
||||||
Session.commit()
|
|
||||||
|
|
||||||
reset_password_link = f"{URL}/auth/reset_password?code={reset_password_code.code}"
|
|
||||||
|
|
||||||
email_utils.send_reset_password_email(user.email, reset_password_link)
|
|
||||||
|
|
||||||
|
|
||||||
def send_change_email_confirmation(user: User, email_change: EmailChange):
|
|
||||||
"""
|
|
||||||
send confirmation email to the new email address
|
|
||||||
"""
|
|
||||||
|
|
||||||
link = f"{URL}/auth/change_email?code={email_change.code}"
|
|
||||||
|
|
||||||
email_utils.send_change_email(email_change.new_email, user.email, link)
|
|
||||||
|
|
||||||
|
|
||||||
@dashboard_bp.route("/resend_email_change", methods=["GET", "POST"])
|
|
||||||
@limiter.limit("5/hour")
|
|
||||||
@login_required
|
|
||||||
def resend_email_change():
|
|
||||||
form = CSRFValidationForm()
|
|
||||||
if not form.validate():
|
|
||||||
flash("Invalid request. Please try again", "warning")
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
email_change = EmailChange.get_by(user_id=current_user.id)
|
|
||||||
if email_change:
|
|
||||||
# extend email change expiration
|
|
||||||
email_change.expired = arrow.now().shift(hours=12)
|
|
||||||
Session.commit()
|
|
||||||
|
|
||||||
send_change_email_confirmation(current_user, email_change)
|
|
||||||
flash("A confirmation email is on the way, please check your inbox", "success")
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
else:
|
|
||||||
flash(
|
|
||||||
"You have no pending email change. Redirect back to Setting page", "warning"
|
|
||||||
)
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
|
|
||||||
|
|
||||||
@dashboard_bp.route("/cancel_email_change", methods=["GET", "POST"])
|
|
||||||
@login_required
|
|
||||||
def cancel_email_change():
|
|
||||||
form = CSRFValidationForm()
|
|
||||||
if not form.validate():
|
|
||||||
flash("Invalid request. Please try again", "warning")
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
email_change = EmailChange.get_by(user_id=current_user.id)
|
|
||||||
if email_change:
|
|
||||||
EmailChange.delete(email_change.id)
|
|
||||||
Session.commit()
|
|
||||||
flash("Your email change is cancelled", "success")
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
else:
|
|
||||||
flash(
|
|
||||||
"You have no pending email change. Redirect back to Setting page", "warning"
|
|
||||||
)
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
|
|
||||||
|
|
||||||
@dashboard_bp.route("/unlink_proton_account", methods=["POST"])
|
|
||||||
@login_required
|
|
||||||
def unlink_proton_account():
|
|
||||||
csrf_form = CSRFValidationForm()
|
|
||||||
if not csrf_form.validate():
|
|
||||||
flash("Invalid request", "warning")
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
|
|
||||||
perform_proton_account_unlink(current_user)
|
|
||||||
flash("Your Proton account has been unlinked", "success")
|
|
||||||
return redirect(url_for("dashboard.setting"))
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ from app.db import Session
|
||||||
from flask import redirect, url_for, flash, request, render_template
|
from flask import redirect, url_for, flash, request, render_template
|
||||||
from flask_login import login_required, current_user
|
from flask_login import login_required, current_user
|
||||||
|
|
||||||
|
from app import alias_utils
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
from app.handler.unsubscribe_encoder import UnsubscribeAction
|
from app.handler.unsubscribe_encoder import UnsubscribeAction
|
||||||
from app.handler.unsubscribe_handler import UnsubscribeHandler
|
from app.handler.unsubscribe_handler import UnsubscribeHandler
|
||||||
|
@ -31,7 +32,7 @@ def unsubscribe(alias_id):
|
||||||
|
|
||||||
# automatic unsubscribe, according to https://tools.ietf.org/html/rfc8058
|
# automatic unsubscribe, according to https://tools.ietf.org/html/rfc8058
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
alias.enabled = False
|
alias_utils.change_alias_status(alias, False)
|
||||||
flash(f"Alias {alias.email} has been blocked", "success")
|
flash(f"Alias {alias.email} has been blocked", "success")
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ LIST_UNSUBSCRIBE = "List-Unsubscribe"
|
||||||
LIST_UNSUBSCRIBE_POST = "List-Unsubscribe-Post"
|
LIST_UNSUBSCRIBE_POST = "List-Unsubscribe-Post"
|
||||||
RETURN_PATH = "Return-Path"
|
RETURN_PATH = "Return-Path"
|
||||||
AUTHENTICATION_RESULTS = "Authentication-Results"
|
AUTHENTICATION_RESULTS = "Authentication-Results"
|
||||||
|
SL_QUEUE_ID = "X-SL-Queue-Id"
|
||||||
|
|
||||||
# headers used to DKIM sign in order of preference
|
# headers used to DKIM sign in order of preference
|
||||||
DKIM_HEADERS = [
|
DKIM_HEADERS = [
|
||||||
|
|
|
@ -33,6 +33,7 @@ from flanker.addresslib import address
|
||||||
from flanker.addresslib.address import EmailAddress
|
from flanker.addresslib.address import EmailAddress
|
||||||
from jinja2 import Environment, FileSystemLoader
|
from jinja2 import Environment, FileSystemLoader
|
||||||
from sqlalchemy import func
|
from sqlalchemy import func
|
||||||
|
from flask_login import current_user
|
||||||
|
|
||||||
from app import config
|
from app import config
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
|
@ -74,11 +75,16 @@ def render(template_name, **kwargs) -> str:
|
||||||
|
|
||||||
template = env.get_template(template_name)
|
template = env.get_template(template_name)
|
||||||
|
|
||||||
|
use_partner_template = False
|
||||||
|
if current_user and current_user.is_authenticated:
|
||||||
|
use_partner_template = current_user.has_used_alias_from_partner()
|
||||||
|
|
||||||
return template.render(
|
return template.render(
|
||||||
MAX_NB_EMAIL_FREE_PLAN=config.MAX_NB_EMAIL_FREE_PLAN,
|
MAX_NB_EMAIL_FREE_PLAN=config.MAX_NB_EMAIL_FREE_PLAN,
|
||||||
URL=config.URL,
|
URL=config.URL,
|
||||||
LANDING_PAGE_URL=config.LANDING_PAGE_URL,
|
LANDING_PAGE_URL=config.LANDING_PAGE_URL,
|
||||||
YEAR=arrow.now().year,
|
YEAR=arrow.now().year,
|
||||||
|
USE_PARTNER_TEMPLATE=use_partner_template,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -494,9 +500,10 @@ def delete_header(msg: Message, header: str):
|
||||||
|
|
||||||
def sanitize_header(msg: Message, header: str):
|
def sanitize_header(msg: Message, header: str):
|
||||||
"""remove trailing space and remove linebreak from a header"""
|
"""remove trailing space and remove linebreak from a header"""
|
||||||
|
header_lowercase = header.lower()
|
||||||
for i in reversed(range(len(msg._headers))):
|
for i in reversed(range(len(msg._headers))):
|
||||||
header_name = msg._headers[i][0].lower()
|
header_name = msg._headers[i][0].lower()
|
||||||
if header_name == header.lower():
|
if header_name == header_lowercase:
|
||||||
# msg._headers[i] is a tuple like ('From', 'hey@google.com')
|
# msg._headers[i] is a tuple like ('From', 'hey@google.com')
|
||||||
if msg._headers[i][1]:
|
if msg._headers[i][1]:
|
||||||
msg._headers[i] = (
|
msg._headers[i] = (
|
||||||
|
@ -1403,7 +1410,7 @@ def generate_verp_email(
|
||||||
# Time is in minutes granularity and start counting on 2022-01-01 to reduce bytes to represent time
|
# Time is in minutes granularity and start counting on 2022-01-01 to reduce bytes to represent time
|
||||||
data = [
|
data = [
|
||||||
verp_type.value,
|
verp_type.value,
|
||||||
object_id,
|
object_id or 0,
|
||||||
int((time.time() - VERP_TIME_START) / 60),
|
int((time.time() - VERP_TIME_START) / 60),
|
||||||
]
|
]
|
||||||
json_payload = json.dumps(data).encode("utf-8")
|
json_payload = json.dumps(data).encode("utf-8")
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
from abc import ABC, abstractmethod
|
||||||
|
from app import config
|
||||||
|
from app.db import Session
|
||||||
|
from app.errors import ProtonPartnerNotSetUp
|
||||||
|
from app.events.generated import event_pb2
|
||||||
|
from app.models import User, PartnerUser, SyncEvent
|
||||||
|
from app.proton.utils import get_proton_partner
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
NOTIFICATION_CHANNEL = "simplelogin_sync_events"
|
||||||
|
|
||||||
|
|
||||||
|
class Dispatcher(ABC):
|
||||||
|
@abstractmethod
|
||||||
|
def send(self, event: bytes):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class PostgresDispatcher(Dispatcher):
|
||||||
|
def send(self, event: bytes):
|
||||||
|
instance = SyncEvent.create(content=event, flush=True)
|
||||||
|
Session.execute(f"NOTIFY {NOTIFICATION_CHANNEL}, '{instance.id}';")
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def get():
|
||||||
|
return PostgresDispatcher()
|
||||||
|
|
||||||
|
|
||||||
|
class EventDispatcher:
|
||||||
|
@staticmethod
|
||||||
|
def send_event(
|
||||||
|
user: User,
|
||||||
|
content: event_pb2.EventContent,
|
||||||
|
dispatcher: Dispatcher = PostgresDispatcher.get(),
|
||||||
|
skip_if_webhook_missing: bool = True,
|
||||||
|
):
|
||||||
|
if config.EVENT_WEBHOOK_DISABLE:
|
||||||
|
return
|
||||||
|
|
||||||
|
if not config.EVENT_WEBHOOK and skip_if_webhook_missing:
|
||||||
|
return
|
||||||
|
|
||||||
|
partner_user = EventDispatcher.__partner_user(user.id)
|
||||||
|
if not partner_user:
|
||||||
|
return
|
||||||
|
|
||||||
|
event = event_pb2.Event(
|
||||||
|
user_id=user.id,
|
||||||
|
external_user_id=partner_user.external_user_id,
|
||||||
|
partner_id=partner_user.partner_id,
|
||||||
|
content=content,
|
||||||
|
)
|
||||||
|
|
||||||
|
serialized = event.SerializeToString()
|
||||||
|
dispatcher.send(serialized)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def __partner_user(user_id: int) -> Optional[PartnerUser]:
|
||||||
|
# Check if the current user has a partner_id
|
||||||
|
try:
|
||||||
|
proton_partner_id = get_proton_partner().id
|
||||||
|
except ProtonPartnerNotSetUp:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# It has. Retrieve the information for the PartnerUser
|
||||||
|
return PartnerUser.get_by(user_id=user_id, partner_id=proton_partner_id)
|
|
@ -0,0 +1,50 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||||
|
# NO CHECKED-IN PROTOBUF GENCODE
|
||||||
|
# source: event.proto
|
||||||
|
# Protobuf Python Version: 5.27.0
|
||||||
|
"""Generated protocol buffer code."""
|
||||||
|
from google.protobuf import descriptor as _descriptor
|
||||||
|
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||||
|
from google.protobuf import runtime_version as _runtime_version
|
||||||
|
from google.protobuf import symbol_database as _symbol_database
|
||||||
|
from google.protobuf.internal import builder as _builder
|
||||||
|
_runtime_version.ValidateProtobufRuntimeVersion(
|
||||||
|
_runtime_version.Domain.PUBLIC,
|
||||||
|
5,
|
||||||
|
27,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'event.proto'
|
||||||
|
)
|
||||||
|
# @@protoc_insertion_point(imports)
|
||||||
|
|
||||||
|
_sym_db = _symbol_database.Default()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x65vent.proto\x12\x12simplelogin_events\"(\n\x0fUserPlanChanged\x12\x15\n\rplan_end_time\x18\x01 \x01(\r\"\r\n\x0bUserDeleted\"Z\n\x0c\x41liasCreated\x12\x10\n\x08\x61lias_id\x18\x01 \x01(\r\x12\x13\n\x0b\x61lias_email\x18\x02 \x01(\t\x12\x12\n\nalias_note\x18\x03 \x01(\t\x12\x0f\n\x07\x65nabled\x18\x04 \x01(\x08\"L\n\x12\x41liasStatusChanged\x12\x10\n\x08\x61lias_id\x18\x01 \x01(\r\x12\x13\n\x0b\x61lias_email\x18\x02 \x01(\t\x12\x0f\n\x07\x65nabled\x18\x03 \x01(\x08\"5\n\x0c\x41liasDeleted\x12\x10\n\x08\x61lias_id\x18\x01 \x01(\r\x12\x13\n\x0b\x61lias_email\x18\x02 \x01(\t\"D\n\x10\x41liasCreatedList\x12\x30\n\x06\x65vents\x18\x01 \x03(\x0b\x32 .simplelogin_events.AliasCreated\"\x93\x03\n\x0c\x45ventContent\x12?\n\x10user_plan_change\x18\x01 \x01(\x0b\x32#.simplelogin_events.UserPlanChangedH\x00\x12\x37\n\x0cuser_deleted\x18\x02 \x01(\x0b\x32\x1f.simplelogin_events.UserDeletedH\x00\x12\x39\n\ralias_created\x18\x03 \x01(\x0b\x32 .simplelogin_events.AliasCreatedH\x00\x12\x45\n\x13\x61lias_status_change\x18\x04 \x01(\x0b\x32&.simplelogin_events.AliasStatusChangedH\x00\x12\x39\n\ralias_deleted\x18\x05 \x01(\x0b\x32 .simplelogin_events.AliasDeletedH\x00\x12\x41\n\x11\x61lias_create_list\x18\x06 \x01(\x0b\x32$.simplelogin_events.AliasCreatedListH\x00\x42\t\n\x07\x63ontent\"y\n\x05\x45vent\x12\x0f\n\x07user_id\x18\x01 \x01(\r\x12\x18\n\x10\x65xternal_user_id\x18\x02 \x01(\t\x12\x12\n\npartner_id\x18\x03 \x01(\r\x12\x31\n\x07\x63ontent\x18\x04 \x01(\x0b\x32 .simplelogin_events.EventContentb\x06proto3')
|
||||||
|
|
||||||
|
_globals = globals()
|
||||||
|
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
|
||||||
|
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'event_pb2', _globals)
|
||||||
|
if not _descriptor._USE_C_DESCRIPTORS:
|
||||||
|
DESCRIPTOR._loaded_options = None
|
||||||
|
_globals['_USERPLANCHANGED']._serialized_start=35
|
||||||
|
_globals['_USERPLANCHANGED']._serialized_end=75
|
||||||
|
_globals['_USERDELETED']._serialized_start=77
|
||||||
|
_globals['_USERDELETED']._serialized_end=90
|
||||||
|
_globals['_ALIASCREATED']._serialized_start=92
|
||||||
|
_globals['_ALIASCREATED']._serialized_end=182
|
||||||
|
_globals['_ALIASSTATUSCHANGED']._serialized_start=184
|
||||||
|
_globals['_ALIASSTATUSCHANGED']._serialized_end=260
|
||||||
|
_globals['_ALIASDELETED']._serialized_start=262
|
||||||
|
_globals['_ALIASDELETED']._serialized_end=315
|
||||||
|
_globals['_ALIASCREATEDLIST']._serialized_start=317
|
||||||
|
_globals['_ALIASCREATEDLIST']._serialized_end=385
|
||||||
|
_globals['_EVENTCONTENT']._serialized_start=388
|
||||||
|
_globals['_EVENTCONTENT']._serialized_end=791
|
||||||
|
_globals['_EVENT']._serialized_start=793
|
||||||
|
_globals['_EVENT']._serialized_end=914
|
||||||
|
# @@protoc_insertion_point(module_scope)
|
|
@ -0,0 +1,80 @@
|
||||||
|
from google.protobuf.internal import containers as _containers
|
||||||
|
from google.protobuf import descriptor as _descriptor
|
||||||
|
from google.protobuf import message as _message
|
||||||
|
from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
|
||||||
|
|
||||||
|
DESCRIPTOR: _descriptor.FileDescriptor
|
||||||
|
|
||||||
|
class UserPlanChanged(_message.Message):
|
||||||
|
__slots__ = ("plan_end_time",)
|
||||||
|
PLAN_END_TIME_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
plan_end_time: int
|
||||||
|
def __init__(self, plan_end_time: _Optional[int] = ...) -> None: ...
|
||||||
|
|
||||||
|
class UserDeleted(_message.Message):
|
||||||
|
__slots__ = ()
|
||||||
|
def __init__(self) -> None: ...
|
||||||
|
|
||||||
|
class AliasCreated(_message.Message):
|
||||||
|
__slots__ = ("alias_id", "alias_email", "alias_note", "enabled")
|
||||||
|
ALIAS_ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_EMAIL_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_NOTE_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ENABLED_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
alias_id: int
|
||||||
|
alias_email: str
|
||||||
|
alias_note: str
|
||||||
|
enabled: bool
|
||||||
|
def __init__(self, alias_id: _Optional[int] = ..., alias_email: _Optional[str] = ..., alias_note: _Optional[str] = ..., enabled: bool = ...) -> None: ...
|
||||||
|
|
||||||
|
class AliasStatusChanged(_message.Message):
|
||||||
|
__slots__ = ("alias_id", "alias_email", "enabled")
|
||||||
|
ALIAS_ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_EMAIL_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ENABLED_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
alias_id: int
|
||||||
|
alias_email: str
|
||||||
|
enabled: bool
|
||||||
|
def __init__(self, alias_id: _Optional[int] = ..., alias_email: _Optional[str] = ..., enabled: bool = ...) -> None: ...
|
||||||
|
|
||||||
|
class AliasDeleted(_message.Message):
|
||||||
|
__slots__ = ("alias_id", "alias_email")
|
||||||
|
ALIAS_ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_EMAIL_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
alias_id: int
|
||||||
|
alias_email: str
|
||||||
|
def __init__(self, alias_id: _Optional[int] = ..., alias_email: _Optional[str] = ...) -> None: ...
|
||||||
|
|
||||||
|
class AliasCreatedList(_message.Message):
|
||||||
|
__slots__ = ("events",)
|
||||||
|
EVENTS_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
events: _containers.RepeatedCompositeFieldContainer[AliasCreated]
|
||||||
|
def __init__(self, events: _Optional[_Iterable[_Union[AliasCreated, _Mapping]]] = ...) -> None: ...
|
||||||
|
|
||||||
|
class EventContent(_message.Message):
|
||||||
|
__slots__ = ("user_plan_change", "user_deleted", "alias_created", "alias_status_change", "alias_deleted", "alias_create_list")
|
||||||
|
USER_PLAN_CHANGE_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
USER_DELETED_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_CREATED_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_STATUS_CHANGE_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_DELETED_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ALIAS_CREATE_LIST_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
user_plan_change: UserPlanChanged
|
||||||
|
user_deleted: UserDeleted
|
||||||
|
alias_created: AliasCreated
|
||||||
|
alias_status_change: AliasStatusChanged
|
||||||
|
alias_deleted: AliasDeleted
|
||||||
|
alias_create_list: AliasCreatedList
|
||||||
|
def __init__(self, user_plan_change: _Optional[_Union[UserPlanChanged, _Mapping]] = ..., user_deleted: _Optional[_Union[UserDeleted, _Mapping]] = ..., alias_created: _Optional[_Union[AliasCreated, _Mapping]] = ..., alias_status_change: _Optional[_Union[AliasStatusChanged, _Mapping]] = ..., alias_deleted: _Optional[_Union[AliasDeleted, _Mapping]] = ..., alias_create_list: _Optional[_Union[AliasCreatedList, _Mapping]] = ...) -> None: ...
|
||||||
|
|
||||||
|
class Event(_message.Message):
|
||||||
|
__slots__ = ("user_id", "external_user_id", "partner_id", "content")
|
||||||
|
USER_ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
EXTERNAL_USER_ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
PARTNER_ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
CONTENT_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
user_id: int
|
||||||
|
external_user_id: str
|
||||||
|
partner_id: int
|
||||||
|
content: EventContent
|
||||||
|
def __init__(self, user_id: _Optional[int] = ..., external_user_id: _Optional[str] = ..., partner_id: _Optional[int] = ..., content: _Optional[_Union[EventContent, _Mapping]] = ...) -> None: ...
|
|
@ -30,7 +30,9 @@ def apply_dmarc_policy_for_forward_phase(
|
||||||
) -> Tuple[Message, Optional[str]]:
|
) -> Tuple[Message, Optional[str]]:
|
||||||
spam_result = SpamdResult.extract_from_headers(msg, Phase.forward)
|
spam_result = SpamdResult.extract_from_headers(msg, Phase.forward)
|
||||||
if not DMARC_CHECK_ENABLED or not spam_result:
|
if not DMARC_CHECK_ENABLED or not spam_result:
|
||||||
|
LOG.i("DMARC check disabled")
|
||||||
return msg, None
|
return msg, None
|
||||||
|
LOG.i(f"Spam check result in {spam_result}")
|
||||||
|
|
||||||
from_header = get_header_unicode(msg[headers.FROM])
|
from_header = get_header_unicode(msg[headers.FROM])
|
||||||
|
|
||||||
|
@ -131,7 +133,7 @@ def quarantine_dmarc_failed_forward_email(alias, contact, envelope, msg) -> Emai
|
||||||
refused_email = RefusedEmail.create(
|
refused_email = RefusedEmail.create(
|
||||||
full_report_path=s3_report_path, user_id=alias.user_id, flush=True
|
full_report_path=s3_report_path, user_id=alias.user_id, flush=True
|
||||||
)
|
)
|
||||||
return EmailLog.create(
|
email_log = EmailLog.create(
|
||||||
user_id=alias.user_id,
|
user_id=alias.user_id,
|
||||||
mailbox_id=alias.mailbox_id,
|
mailbox_id=alias.mailbox_id,
|
||||||
contact_id=contact.id,
|
contact_id=contact.id,
|
||||||
|
@ -142,6 +144,7 @@ def quarantine_dmarc_failed_forward_email(alias, contact, envelope, msg) -> Emai
|
||||||
blocked=True,
|
blocked=True,
|
||||||
commit=True,
|
commit=True,
|
||||||
)
|
)
|
||||||
|
return email_log
|
||||||
|
|
||||||
|
|
||||||
def apply_dmarc_policy_for_reply_phase(
|
def apply_dmarc_policy_for_reply_phase(
|
||||||
|
@ -149,8 +152,10 @@ def apply_dmarc_policy_for_reply_phase(
|
||||||
) -> Optional[str]:
|
) -> Optional[str]:
|
||||||
spam_result = SpamdResult.extract_from_headers(msg, Phase.reply)
|
spam_result = SpamdResult.extract_from_headers(msg, Phase.reply)
|
||||||
if not DMARC_CHECK_ENABLED or not spam_result:
|
if not DMARC_CHECK_ENABLED or not spam_result:
|
||||||
|
LOG.i("DMARC check disabled")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
LOG.i(f"Spam check result is {spam_result}")
|
||||||
if spam_result.dmarc not in (
|
if spam_result.dmarc not in (
|
||||||
DmarcCheckResult.quarantine,
|
DmarcCheckResult.quarantine,
|
||||||
DmarcCheckResult.reject,
|
DmarcCheckResult.reject,
|
||||||
|
|
|
@ -3,6 +3,7 @@ from email.header import Header
|
||||||
from email.message import Message
|
from email.message import Message
|
||||||
|
|
||||||
from app.email import headers
|
from app.email import headers
|
||||||
|
from app import config
|
||||||
from app.email_utils import add_or_replace_header, delete_header
|
from app.email_utils import add_or_replace_header, delete_header
|
||||||
from app.handler.unsubscribe_encoder import (
|
from app.handler.unsubscribe_encoder import (
|
||||||
UnsubscribeEncoder,
|
UnsubscribeEncoder,
|
||||||
|
@ -47,6 +48,11 @@ class UnsubscribeGenerator:
|
||||||
method = raw_method[start + 1 : end]
|
method = raw_method[start + 1 : end]
|
||||||
url_data = urllib.parse.urlparse(method)
|
url_data = urllib.parse.urlparse(method)
|
||||||
if url_data.scheme == "mailto":
|
if url_data.scheme == "mailto":
|
||||||
|
if url_data.path == config.UNSUBSCRIBER:
|
||||||
|
LOG.debug(
|
||||||
|
f"Skipping replacing unsubscribe since the original email already points to {config.UNSUBSCRIBER}"
|
||||||
|
)
|
||||||
|
return message
|
||||||
query_data = urllib.parse.parse_qs(url_data.query)
|
query_data = urllib.parse.parse_qs(url_data.query)
|
||||||
mailto_unsubs = (url_data.path, query_data.get("subject", [""])[0])
|
mailto_unsubs = (url_data.path, query_data.get("subject", [""])[0])
|
||||||
LOG.debug(f"Unsub is mailto to {mailto_unsubs}")
|
LOG.debug(f"Unsub is mailto to {mailto_unsubs}")
|
||||||
|
|
|
@ -5,6 +5,7 @@ from typing import Optional
|
||||||
from aiosmtpd.smtp import Envelope
|
from aiosmtpd.smtp import Envelope
|
||||||
|
|
||||||
from app import config
|
from app import config
|
||||||
|
from app import alias_utils
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
from app.email import headers, status
|
from app.email import headers, status
|
||||||
from app.email_utils import (
|
from app.email_utils import (
|
||||||
|
@ -101,7 +102,8 @@ class UnsubscribeHandler:
|
||||||
mailbox.email, alias
|
mailbox.email, alias
|
||||||
):
|
):
|
||||||
return status.E509
|
return status.E509
|
||||||
alias.enabled = False
|
LOG.i(f"User disabled alias {alias} via unsubscribe header")
|
||||||
|
alias_utils.change_alias_status(alias, enabled=False)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
enable_alias_url = config.URL + f"/dashboard/?highlight_alias_id={alias.id}"
|
enable_alias_url = config.URL + f"/dashboard/?highlight_alias_id={alias.id}"
|
||||||
for mailbox in alias.mailboxes:
|
for mailbox in alias.mailboxes:
|
||||||
|
|
|
@ -30,7 +30,10 @@ def handle_batch_import(batch_import: BatchImport):
|
||||||
|
|
||||||
LOG.d("Download file %s from %s", batch_import.file, file_url)
|
LOG.d("Download file %s from %s", batch_import.file, file_url)
|
||||||
r = requests.get(file_url)
|
r = requests.get(file_url)
|
||||||
lines = [line.decode("utf-8") for line in r.iter_lines()]
|
# Replace invisible character
|
||||||
|
lines = [
|
||||||
|
line.decode("utf-8").replace("\ufeff", "").strip() for line in r.iter_lines()
|
||||||
|
]
|
||||||
|
|
||||||
import_from_csv(batch_import, user, lines)
|
import_from_csv(batch_import, user, lines)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
from app.events.event_dispatcher import EventDispatcher, Dispatcher
|
||||||
|
from app.events.generated.event_pb2 import EventContent, AliasCreated, AliasCreatedList
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import User, Alias
|
||||||
|
|
||||||
|
|
||||||
|
def send_alias_creation_events_for_user(
|
||||||
|
user: User, dispatcher: Dispatcher, chunk_size=50
|
||||||
|
):
|
||||||
|
if user.disabled:
|
||||||
|
LOG.i("User {user} is disabled. Skipping sending events for that user")
|
||||||
|
return
|
||||||
|
chunk_size = min(chunk_size, 50)
|
||||||
|
event_list = []
|
||||||
|
for alias in (
|
||||||
|
Alias.yield_per_query(chunk_size)
|
||||||
|
.filter_by(user_id=user.id)
|
||||||
|
.order_by(Alias.id.asc())
|
||||||
|
):
|
||||||
|
event_list.append(
|
||||||
|
AliasCreated(
|
||||||
|
alias_id=alias.id,
|
||||||
|
alias_email=alias.email,
|
||||||
|
alias_note=alias.note,
|
||||||
|
enabled=alias.enabled,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if len(event_list) >= chunk_size:
|
||||||
|
EventDispatcher.send_event(
|
||||||
|
user,
|
||||||
|
EventContent(alias_create_list=AliasCreatedList(events=event_list)),
|
||||||
|
dispatcher=dispatcher,
|
||||||
|
)
|
||||||
|
event_list = []
|
||||||
|
if len(event_list) > 0:
|
||||||
|
EventDispatcher.send_event(
|
||||||
|
user,
|
||||||
|
EventContent(alias_create_list=AliasCreatedList(events=event_list)),
|
||||||
|
dispatcher=dispatcher,
|
||||||
|
)
|
178
app/models.py
178
app/models.py
|
@ -330,6 +330,7 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
FLAG_FREE_DISABLE_CREATE_ALIAS = 1 << 0
|
FLAG_FREE_DISABLE_CREATE_ALIAS = 1 << 0
|
||||||
FLAG_CREATED_FROM_PARTNER = 1 << 1
|
FLAG_CREATED_FROM_PARTNER = 1 << 1
|
||||||
FLAG_FREE_OLD_ALIAS_LIMIT = 1 << 2
|
FLAG_FREE_OLD_ALIAS_LIMIT = 1 << 2
|
||||||
|
FLAG_CREATED_ALIAS_FROM_PARTNER = 1 << 3
|
||||||
|
|
||||||
email = sa.Column(sa.String(256), unique=True, nullable=False)
|
email = sa.Column(sa.String(256), unique=True, nullable=False)
|
||||||
|
|
||||||
|
@ -525,6 +526,11 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
sa.Boolean, default=True, nullable=False, server_default="1"
|
sa.Boolean, default=True, nullable=False, server_default="1"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# user opted in for data breach check
|
||||||
|
enable_data_breach_check = sa.Column(
|
||||||
|
sa.Boolean, default=False, nullable=False, server_default="0"
|
||||||
|
)
|
||||||
|
|
||||||
# bitwise flags. Allow for future expansion
|
# bitwise flags. Allow for future expansion
|
||||||
flags = sa.Column(
|
flags = sa.Column(
|
||||||
sa.BigInteger,
|
sa.BigInteger,
|
||||||
|
@ -652,6 +658,21 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def delete(cls, obj_id, commit=False):
|
||||||
|
# Internal import to avoid global import cycles
|
||||||
|
from app.events.event_dispatcher import EventDispatcher
|
||||||
|
from app.events.generated.event_pb2 import UserDeleted, EventContent
|
||||||
|
|
||||||
|
user: User = cls.get(obj_id)
|
||||||
|
EventDispatcher.send_event(user, EventContent(user_deleted=UserDeleted()))
|
||||||
|
|
||||||
|
res = super(User, cls).delete(obj_id)
|
||||||
|
if commit:
|
||||||
|
Session.commit()
|
||||||
|
|
||||||
|
return res
|
||||||
|
|
||||||
def get_active_subscription(
|
def get_active_subscription(
|
||||||
self, include_partner_subscription: bool = True
|
self, include_partner_subscription: bool = True
|
||||||
) -> Optional[
|
) -> Optional[
|
||||||
|
@ -727,6 +748,11 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def is_active(self) -> bool:
|
||||||
|
if self.delete_on is None:
|
||||||
|
return True
|
||||||
|
return self.delete_on < arrow.now()
|
||||||
|
|
||||||
def in_trial(self):
|
def in_trial(self):
|
||||||
"""return True if user does not have lifetime licence or an active subscription AND is in trial period"""
|
"""return True if user does not have lifetime licence or an active subscription AND is in trial period"""
|
||||||
if self.lifetime_or_active_subscription():
|
if self.lifetime_or_active_subscription():
|
||||||
|
@ -828,6 +854,9 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
Whether user can create a new alias. User can't create a new alias if
|
Whether user can create a new alias. User can't create a new alias if
|
||||||
- has more than 15 aliases in the free plan, *even in the free trial*
|
- has more than 15 aliases in the free plan, *even in the free trial*
|
||||||
"""
|
"""
|
||||||
|
if not self.is_active():
|
||||||
|
return False
|
||||||
|
|
||||||
if self.disabled:
|
if self.disabled:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@ -908,7 +937,11 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
return sub
|
return sub
|
||||||
|
|
||||||
def verified_custom_domains(self) -> List["CustomDomain"]:
|
def verified_custom_domains(self) -> List["CustomDomain"]:
|
||||||
return CustomDomain.filter_by(user_id=self.id, ownership_verified=True).all()
|
return (
|
||||||
|
CustomDomain.filter_by(user_id=self.id, ownership_verified=True)
|
||||||
|
.order_by(CustomDomain.domain.asc())
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
|
||||||
def mailboxes(self) -> List["Mailbox"]:
|
def mailboxes(self) -> List["Mailbox"]:
|
||||||
"""list of mailbox that user own"""
|
"""list of mailbox that user own"""
|
||||||
|
@ -1121,6 +1154,13 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
||||||
return True
|
return True
|
||||||
return not config.DISABLE_CREATE_CONTACTS_FOR_FREE_USERS
|
return not config.DISABLE_CREATE_CONTACTS_FOR_FREE_USERS
|
||||||
|
|
||||||
|
def has_used_alias_from_partner(self) -> bool:
|
||||||
|
return (
|
||||||
|
self.flags
|
||||||
|
& (User.FLAG_CREATED_ALIAS_FROM_PARTNER | User.FLAG_CREATED_FROM_PARTNER)
|
||||||
|
> 0
|
||||||
|
)
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<User {self.id} {self.name} {self.email}>"
|
return f"<User {self.id} {self.name} {self.email}>"
|
||||||
|
|
||||||
|
@ -1410,6 +1450,9 @@ def generate_random_alias_email(
|
||||||
|
|
||||||
class Alias(Base, ModelMixin):
|
class Alias(Base, ModelMixin):
|
||||||
__tablename__ = "alias"
|
__tablename__ = "alias"
|
||||||
|
|
||||||
|
FLAG_PARTNER_CREATED = 1 << 0
|
||||||
|
|
||||||
user_id = sa.Column(
|
user_id = sa.Column(
|
||||||
sa.ForeignKey(User.id, ondelete="cascade"), nullable=False, index=True
|
sa.ForeignKey(User.id, ondelete="cascade"), nullable=False, index=True
|
||||||
)
|
)
|
||||||
|
@ -1419,6 +1462,9 @@ class Alias(Base, ModelMixin):
|
||||||
name = sa.Column(sa.String(128), nullable=True, default=None)
|
name = sa.Column(sa.String(128), nullable=True, default=None)
|
||||||
|
|
||||||
enabled = sa.Column(sa.Boolean(), default=True, nullable=False)
|
enabled = sa.Column(sa.Boolean(), default=True, nullable=False)
|
||||||
|
flags = sa.Column(
|
||||||
|
sa.BigInteger(), default=0, server_default="0", nullable=False, index=True
|
||||||
|
)
|
||||||
|
|
||||||
custom_domain_id = sa.Column(
|
custom_domain_id = sa.Column(
|
||||||
sa.ForeignKey("custom_domain.id", ondelete="cascade"), nullable=True, index=True
|
sa.ForeignKey("custom_domain.id", ondelete="cascade"), nullable=True, index=True
|
||||||
|
@ -1496,6 +1542,8 @@ class Alias(Base, ModelMixin):
|
||||||
TSVector(), sa.Computed("to_tsvector('english', note)", persisted=True)
|
TSVector(), sa.Computed("to_tsvector('english', note)", persisted=True)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
last_email_log_id = sa.Column(sa.Integer, default=None, nullable=True)
|
||||||
|
|
||||||
__table_args__ = (
|
__table_args__ = (
|
||||||
Index("ix_video___ts_vector__", ts_vector, postgresql_using="gin"),
|
Index("ix_video___ts_vector__", ts_vector, postgresql_using="gin"),
|
||||||
# index on note column using pg_trgm
|
# index on note column using pg_trgm
|
||||||
|
@ -1594,6 +1642,24 @@ class Alias(Base, ModelMixin):
|
||||||
Session.add(new_alias)
|
Session.add(new_alias)
|
||||||
DailyMetric.get_or_create_today_metric().nb_alias += 1
|
DailyMetric.get_or_create_today_metric().nb_alias += 1
|
||||||
|
|
||||||
|
# Internal import to avoid global import cycles
|
||||||
|
from app.events.event_dispatcher import EventDispatcher
|
||||||
|
from app.events.generated.event_pb2 import AliasCreated, EventContent
|
||||||
|
|
||||||
|
event = AliasCreated(
|
||||||
|
alias_id=new_alias.id,
|
||||||
|
alias_email=new_alias.email,
|
||||||
|
alias_note=new_alias.note,
|
||||||
|
enabled=True,
|
||||||
|
)
|
||||||
|
EventDispatcher.send_event(user, EventContent(alias_created=event))
|
||||||
|
|
||||||
|
if (
|
||||||
|
new_alias.flags & cls.FLAG_PARTNER_CREATED > 0
|
||||||
|
and new_alias.user.flags & User.FLAG_CREATED_ALIAS_FROM_PARTNER == 0
|
||||||
|
):
|
||||||
|
user.flags = user.flags | User.FLAG_CREATED_ALIAS_FROM_PARTNER
|
||||||
|
|
||||||
if commit:
|
if commit:
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
@ -2055,6 +2121,20 @@ class EmailLog(Base, ModelMixin):
|
||||||
def get_dashboard_url(self):
|
def get_dashboard_url(self):
|
||||||
return f"{config.URL}/dashboard/refused_email?highlight_id={self.id}"
|
return f"{config.URL}/dashboard/refused_email?highlight_id={self.id}"
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def create(cls, *args, **kwargs):
|
||||||
|
commit = kwargs.pop("commit", False)
|
||||||
|
email_log = super().create(*args, **kwargs)
|
||||||
|
Session.flush()
|
||||||
|
if "alias_id" in kwargs:
|
||||||
|
sql = "UPDATE alias SET last_email_log_id = :el_id WHERE id = :alias_id"
|
||||||
|
Session.execute(
|
||||||
|
sql, {"el_id": email_log.id, "alias_id": kwargs["alias_id"]}
|
||||||
|
)
|
||||||
|
if commit:
|
||||||
|
Session.commit()
|
||||||
|
return email_log
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<EmailLog {self.id}>"
|
return f"<EmailLog {self.id}>"
|
||||||
|
|
||||||
|
@ -2558,10 +2638,13 @@ class Job(Base, ModelMixin):
|
||||||
nullable=False,
|
nullable=False,
|
||||||
server_default=str(JobState.ready.value),
|
server_default=str(JobState.ready.value),
|
||||||
default=JobState.ready.value,
|
default=JobState.ready.value,
|
||||||
|
index=True,
|
||||||
)
|
)
|
||||||
attempts = sa.Column(sa.Integer, nullable=False, server_default="0", default=0)
|
attempts = sa.Column(sa.Integer, nullable=False, server_default="0", default=0)
|
||||||
taken_at = sa.Column(ArrowType, nullable=True)
|
taken_at = sa.Column(ArrowType, nullable=True)
|
||||||
|
|
||||||
|
__table_args__ = (Index("ix_state_run_at_taken_at", state, run_at, taken_at),)
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<Job {self.id} {self.name} {self.payload}>"
|
return f"<Job {self.id} {self.name} {self.payload}>"
|
||||||
|
|
||||||
|
@ -2607,10 +2690,15 @@ class Mailbox(Base, ModelMixin):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def nb_alias(self):
|
def nb_alias(self):
|
||||||
return (
|
alias_ids = set(
|
||||||
AliasMailbox.filter_by(mailbox_id=self.id).count()
|
am.alias_id
|
||||||
+ Alias.filter_by(mailbox_id=self.id).count()
|
for am in AliasMailbox.filter_by(mailbox_id=self.id).values(
|
||||||
|
AliasMailbox.alias_id
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
for alias in Alias.filter_by(mailbox_id=self.id).values(Alias.id):
|
||||||
|
alias_ids.add(alias.id)
|
||||||
|
return len(alias_ids)
|
||||||
|
|
||||||
def is_proton(self) -> bool:
|
def is_proton(self) -> bool:
|
||||||
if (
|
if (
|
||||||
|
@ -2659,12 +2747,15 @@ class Mailbox(Base, ModelMixin):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def aliases(self) -> [Alias]:
|
def aliases(self) -> [Alias]:
|
||||||
ret = Alias.filter_by(mailbox_id=self.id).all()
|
ret = dict(
|
||||||
|
(alias.id, alias) for alias in Alias.filter_by(mailbox_id=self.id).all()
|
||||||
|
)
|
||||||
|
|
||||||
for am in AliasMailbox.filter_by(mailbox_id=self.id):
|
for am in AliasMailbox.filter_by(mailbox_id=self.id):
|
||||||
ret.append(am.alias)
|
if am.alias_id not in ret:
|
||||||
|
ret[am.alias_id] = am.alias
|
||||||
|
|
||||||
return ret
|
return list(ret.values())
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def create(cls, **kw):
|
def create(cls, **kw):
|
||||||
|
@ -2894,11 +2985,7 @@ class RecoveryCode(Base, ModelMixin):
|
||||||
@classmethod
|
@classmethod
|
||||||
def find_by_user_code(cls, user: User, code: str):
|
def find_by_user_code(cls, user: User, code: str):
|
||||||
hashed_code = cls._hash_code(code)
|
hashed_code = cls._hash_code(code)
|
||||||
# TODO: Only return hashed codes once there aren't unhashed codes in the db.
|
return cls.get_by(user_id=user.id, code=hashed_code)
|
||||||
found_code = cls.get_by(user_id=user.id, code=hashed_code)
|
|
||||||
if found_code:
|
|
||||||
return found_code
|
|
||||||
return cls.get_by(user_id=user.id, code=code)
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def empty(cls, user):
|
def empty(cls, user):
|
||||||
|
@ -2909,7 +2996,9 @@ class RecoveryCode(Base, ModelMixin):
|
||||||
|
|
||||||
class Notification(Base, ModelMixin):
|
class Notification(Base, ModelMixin):
|
||||||
__tablename__ = "notification"
|
__tablename__ = "notification"
|
||||||
user_id = sa.Column(sa.ForeignKey(User.id, ondelete="cascade"), nullable=False)
|
user_id = sa.Column(
|
||||||
|
sa.ForeignKey(User.id, ondelete="cascade"), nullable=False, index=True
|
||||||
|
)
|
||||||
message = sa.Column(sa.Text, nullable=False)
|
message = sa.Column(sa.Text, nullable=False)
|
||||||
title = sa.Column(sa.String(512))
|
title = sa.Column(sa.String(512))
|
||||||
|
|
||||||
|
@ -3150,6 +3239,20 @@ class TransactionalEmail(Base, ModelMixin):
|
||||||
|
|
||||||
__table_args__ = (sa.Index("ix_transactional_email_created_at", "created_at"),)
|
__table_args__ = (sa.Index("ix_transactional_email_created_at", "created_at"),)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def create(cls, **kw):
|
||||||
|
# whether to call Session.commit
|
||||||
|
commit = kw.pop("commit", False)
|
||||||
|
|
||||||
|
r = cls(**kw)
|
||||||
|
if not config.STORE_TRANSACTIONAL_EMAILS:
|
||||||
|
return r
|
||||||
|
|
||||||
|
Session.add(r)
|
||||||
|
if commit:
|
||||||
|
Session.commit()
|
||||||
|
return r
|
||||||
|
|
||||||
|
|
||||||
class Payout(Base, ModelMixin):
|
class Payout(Base, ModelMixin):
|
||||||
"""Referral payouts"""
|
"""Referral payouts"""
|
||||||
|
@ -3582,3 +3685,52 @@ class ApiToCookieToken(Base, ModelMixin):
|
||||||
code = secrets.token_urlsafe(32)
|
code = secrets.token_urlsafe(32)
|
||||||
|
|
||||||
return super().create(code=code, **kwargs)
|
return super().create(code=code, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class SyncEvent(Base, ModelMixin):
|
||||||
|
"""This model holds the events that need to be sent to the webhook"""
|
||||||
|
|
||||||
|
__tablename__ = "sync_event"
|
||||||
|
content = sa.Column(sa.LargeBinary, unique=False, nullable=False)
|
||||||
|
taken_time = sa.Column(
|
||||||
|
ArrowType, default=None, nullable=True, server_default=None, index=True
|
||||||
|
)
|
||||||
|
|
||||||
|
__table_args__ = (
|
||||||
|
sa.Index("ix_sync_event_created_at", "created_at"),
|
||||||
|
sa.Index("ix_sync_event_taken_time", "taken_time"),
|
||||||
|
)
|
||||||
|
|
||||||
|
def mark_as_taken(self) -> bool:
|
||||||
|
sql = """
|
||||||
|
UPDATE sync_event
|
||||||
|
SET taken_time = :taken_time
|
||||||
|
WHERE id = :sync_event_id
|
||||||
|
AND taken_time IS NULL
|
||||||
|
"""
|
||||||
|
args = {"taken_time": arrow.now().datetime, "sync_event_id": self.id}
|
||||||
|
|
||||||
|
res = Session.execute(sql, args)
|
||||||
|
Session.commit()
|
||||||
|
|
||||||
|
return res.rowcount > 0
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_dead_letter(cls, older_than: Arrow) -> [SyncEvent]:
|
||||||
|
return (
|
||||||
|
SyncEvent.filter(
|
||||||
|
(
|
||||||
|
(
|
||||||
|
SyncEvent.taken_time.isnot(None)
|
||||||
|
& (SyncEvent.taken_time < older_than)
|
||||||
|
)
|
||||||
|
| (
|
||||||
|
SyncEvent.taken_time.is_(None)
|
||||||
|
& (SyncEvent.created_at < older_than)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.order_by(SyncEvent.id)
|
||||||
|
.limit(100)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
|
|
@ -140,7 +140,7 @@ def authorize():
|
||||||
Scope=Scope,
|
Scope=Scope,
|
||||||
)
|
)
|
||||||
else: # POST - user allows or denies
|
else: # POST - user allows or denies
|
||||||
if not current_user.is_authenticated or not current_user.is_active:
|
if not current_user.is_authenticated or not current_user.is_active():
|
||||||
LOG.i(
|
LOG.i(
|
||||||
"Attempt to validate a OAUth allow request by an unauthenticated user"
|
"Attempt to validate a OAUth allow request by an unauthenticated user"
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,6 +2,7 @@ from newrelic import agent
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
|
from app.log import LOG
|
||||||
from app.errors import ProtonPartnerNotSetUp
|
from app.errors import ProtonPartnerNotSetUp
|
||||||
from app.models import Partner, PartnerUser, User
|
from app.models import Partner, PartnerUser, User
|
||||||
|
|
||||||
|
@ -30,6 +31,7 @@ def perform_proton_account_unlink(current_user: User):
|
||||||
user_id=current_user.id, partner_id=proton_partner.id
|
user_id=current_user.id, partner_id=proton_partner.id
|
||||||
)
|
)
|
||||||
if partner_user is not None:
|
if partner_user is not None:
|
||||||
|
LOG.info(f"User {current_user} has unlinked the account from {partner_user}")
|
||||||
PartnerUser.delete(partner_user.id)
|
PartnerUser.delete(partner_user.id)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
agent.record_custom_event("AccountUnlinked", {"partner": proton_partner.name})
|
agent.record_custom_event("AccountUnlinked", {"partner": proton_partner.name})
|
||||||
|
|
|
@ -6,7 +6,7 @@ import redis.exceptions
|
||||||
import werkzeug.exceptions
|
import werkzeug.exceptions
|
||||||
from limits.storage import RedisStorage
|
from limits.storage import RedisStorage
|
||||||
|
|
||||||
from app.log import log
|
from app.log import LOG
|
||||||
|
|
||||||
lock_redis: Optional[RedisStorage] = None
|
lock_redis: Optional[RedisStorage] = None
|
||||||
|
|
||||||
|
@ -22,17 +22,21 @@ def check_bucket_limit(
|
||||||
bucket_seconds: int = 3600,
|
bucket_seconds: int = 3600,
|
||||||
):
|
):
|
||||||
# Calculate current bucket time
|
# Calculate current bucket time
|
||||||
bucket_id = int(datetime.utcnow().timestamp()) % bucket_seconds
|
int_time = int(datetime.utcnow().timestamp())
|
||||||
|
bucket_id = int_time - (int_time % bucket_seconds)
|
||||||
bucket_lock_name = f"bl:{lock_name}:{bucket_id}"
|
bucket_lock_name = f"bl:{lock_name}:{bucket_id}"
|
||||||
if not lock_redis:
|
if not lock_redis:
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
value = lock_redis.incr(bucket_lock_name, bucket_seconds)
|
value = lock_redis.incr(bucket_lock_name, bucket_seconds)
|
||||||
if value > max_hits:
|
if value > max_hits:
|
||||||
|
LOG.i(
|
||||||
|
f"Rate limit hit for {lock_name} (bucket id {bucket_id}) -> {value}/{max_hits}"
|
||||||
|
)
|
||||||
newrelic.agent.record_custom_event(
|
newrelic.agent.record_custom_event(
|
||||||
"BucketRateLimit",
|
"BucketRateLimit",
|
||||||
{"lock_name": lock_name, "bucket_seconds": bucket_seconds},
|
{"lock_name": lock_name, "bucket_seconds": bucket_seconds},
|
||||||
)
|
)
|
||||||
raise werkzeug.exceptions.TooManyRequests()
|
raise werkzeug.exceptions.TooManyRequests()
|
||||||
except (redis.exceptions.RedisError, AttributeError):
|
except (redis.exceptions.RedisError, AttributeError):
|
||||||
log.e("Cannot connect to redis")
|
LOG.e("Cannot connect to redis")
|
||||||
|
|
59
app/s3.py
59
app/s3.py
|
@ -5,19 +5,9 @@ from typing import Optional
|
||||||
import boto3
|
import boto3
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from app.config import (
|
from app import config
|
||||||
AWS_REGION,
|
|
||||||
BUCKET,
|
|
||||||
AWS_ACCESS_KEY_ID,
|
|
||||||
AWS_SECRET_ACCESS_KEY,
|
|
||||||
LOCAL_FILE_UPLOAD,
|
|
||||||
UPLOAD_DIR,
|
|
||||||
URL,
|
|
||||||
AWS_ENDPOINT_URL,
|
|
||||||
)
|
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
|
|
||||||
|
|
||||||
_s3_client = None
|
_s3_client = None
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,12 +15,12 @@ def _get_s3client():
|
||||||
global _s3_client
|
global _s3_client
|
||||||
if _s3_client is None:
|
if _s3_client is None:
|
||||||
args = {
|
args = {
|
||||||
"aws_access_key_id": AWS_ACCESS_KEY_ID,
|
"aws_access_key_id": config.AWS_ACCESS_KEY_ID,
|
||||||
"aws_secret_access_key": AWS_SECRET_ACCESS_KEY,
|
"aws_secret_access_key": config.AWS_SECRET_ACCESS_KEY,
|
||||||
"region_name": AWS_REGION,
|
"region_name": config.AWS_REGION,
|
||||||
}
|
}
|
||||||
if AWS_ENDPOINT_URL:
|
if config.AWS_ENDPOINT_URL:
|
||||||
args["endpoint_url"] = AWS_ENDPOINT_URL
|
args["endpoint_url"] = config.AWS_ENDPOINT_URL
|
||||||
_s3_client = boto3.client("s3", **args)
|
_s3_client = boto3.client("s3", **args)
|
||||||
return _s3_client
|
return _s3_client
|
||||||
|
|
||||||
|
@ -38,8 +28,8 @@ def _get_s3client():
|
||||||
def upload_from_bytesio(key: str, bs: BytesIO, content_type="application/octet-stream"):
|
def upload_from_bytesio(key: str, bs: BytesIO, content_type="application/octet-stream"):
|
||||||
bs.seek(0)
|
bs.seek(0)
|
||||||
|
|
||||||
if LOCAL_FILE_UPLOAD:
|
if config.LOCAL_FILE_UPLOAD:
|
||||||
file_path = os.path.join(UPLOAD_DIR, key)
|
file_path = os.path.join(config.UPLOAD_DIR, key)
|
||||||
file_dir = os.path.dirname(file_path)
|
file_dir = os.path.dirname(file_path)
|
||||||
os.makedirs(file_dir, exist_ok=True)
|
os.makedirs(file_dir, exist_ok=True)
|
||||||
with open(file_path, "wb") as f:
|
with open(file_path, "wb") as f:
|
||||||
|
@ -47,7 +37,7 @@ def upload_from_bytesio(key: str, bs: BytesIO, content_type="application/octet-s
|
||||||
|
|
||||||
else:
|
else:
|
||||||
_get_s3client().put_object(
|
_get_s3client().put_object(
|
||||||
Bucket=BUCKET,
|
Bucket=config.BUCKET,
|
||||||
Key=key,
|
Key=key,
|
||||||
Body=bs,
|
Body=bs,
|
||||||
ContentType=content_type,
|
ContentType=content_type,
|
||||||
|
@ -57,8 +47,8 @@ def upload_from_bytesio(key: str, bs: BytesIO, content_type="application/octet-s
|
||||||
def upload_email_from_bytesio(path: str, bs: BytesIO, filename):
|
def upload_email_from_bytesio(path: str, bs: BytesIO, filename):
|
||||||
bs.seek(0)
|
bs.seek(0)
|
||||||
|
|
||||||
if LOCAL_FILE_UPLOAD:
|
if config.LOCAL_FILE_UPLOAD:
|
||||||
file_path = os.path.join(UPLOAD_DIR, path)
|
file_path = os.path.join(config.UPLOAD_DIR, path)
|
||||||
file_dir = os.path.dirname(file_path)
|
file_dir = os.path.dirname(file_path)
|
||||||
os.makedirs(file_dir, exist_ok=True)
|
os.makedirs(file_dir, exist_ok=True)
|
||||||
with open(file_path, "wb") as f:
|
with open(file_path, "wb") as f:
|
||||||
|
@ -66,7 +56,7 @@ def upload_email_from_bytesio(path: str, bs: BytesIO, filename):
|
||||||
|
|
||||||
else:
|
else:
|
||||||
_get_s3client().put_object(
|
_get_s3client().put_object(
|
||||||
Bucket=BUCKET,
|
Bucket=config.BUCKET,
|
||||||
Key=path,
|
Key=path,
|
||||||
Body=bs,
|
Body=bs,
|
||||||
# Support saving a remote file using Http header
|
# Support saving a remote file using Http header
|
||||||
|
@ -77,12 +67,12 @@ def upload_email_from_bytesio(path: str, bs: BytesIO, filename):
|
||||||
|
|
||||||
|
|
||||||
def download_email(path: str) -> Optional[str]:
|
def download_email(path: str) -> Optional[str]:
|
||||||
if LOCAL_FILE_UPLOAD:
|
if config.LOCAL_FILE_UPLOAD:
|
||||||
file_path = os.path.join(UPLOAD_DIR, path)
|
file_path = os.path.join(config.UPLOAD_DIR, path)
|
||||||
with open(file_path, "rb") as f:
|
with open(file_path, "rb") as f:
|
||||||
return f.read()
|
return f.read()
|
||||||
resp = _get_s3client().get_object(
|
resp = _get_s3client().get_object(
|
||||||
Bucket=BUCKET,
|
Bucket=config.BUCKET,
|
||||||
Key=path,
|
Key=path,
|
||||||
)
|
)
|
||||||
if not resp or "Body" not in resp:
|
if not resp or "Body" not in resp:
|
||||||
|
@ -96,29 +86,30 @@ def upload_from_url(url: str, upload_path):
|
||||||
|
|
||||||
|
|
||||||
def get_url(key: str, expires_in=3600) -> str:
|
def get_url(key: str, expires_in=3600) -> str:
|
||||||
if LOCAL_FILE_UPLOAD:
|
if config.LOCAL_FILE_UPLOAD:
|
||||||
return URL + "/static/upload/" + key
|
return config.URL + "/static/upload/" + key
|
||||||
else:
|
else:
|
||||||
return _get_s3client().generate_presigned_url(
|
return _get_s3client().generate_presigned_url(
|
||||||
ExpiresIn=expires_in,
|
ExpiresIn=expires_in,
|
||||||
ClientMethod="get_object",
|
ClientMethod="get_object",
|
||||||
Params={"Bucket": BUCKET, "Key": key},
|
Params={"Bucket": config.BUCKET, "Key": key},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def delete(path: str):
|
def delete(path: str):
|
||||||
if LOCAL_FILE_UPLOAD:
|
if config.LOCAL_FILE_UPLOAD:
|
||||||
os.remove(os.path.join(UPLOAD_DIR, path))
|
file_path = os.path.join(config.UPLOAD_DIR, path)
|
||||||
|
os.remove(file_path)
|
||||||
else:
|
else:
|
||||||
_get_s3client().delete_object(Bucket=BUCKET, Key=path)
|
_get_s3client().delete_object(Bucket=config.BUCKET, Key=path)
|
||||||
|
|
||||||
|
|
||||||
def create_bucket_if_not_exists():
|
def create_bucket_if_not_exists():
|
||||||
s3client = _get_s3client()
|
s3client = _get_s3client()
|
||||||
buckets = s3client.list_buckets()
|
buckets = s3client.list_buckets()
|
||||||
for bucket in buckets["Buckets"]:
|
for bucket in buckets["Buckets"]:
|
||||||
if bucket["Name"] == BUCKET:
|
if bucket["Name"] == config.BUCKET:
|
||||||
LOG.i("Bucket already exists")
|
LOG.i("Bucket already exists")
|
||||||
return
|
return
|
||||||
s3client.create_bucket(Bucket=BUCKET)
|
s3client.create_bucket(Bucket=config.BUCKET)
|
||||||
LOG.i(f"Bucket {BUCKET} created")
|
LOG.i(f"Bucket {config.BUCKET} created")
|
||||||
|
|
|
@ -2,6 +2,8 @@ import requests
|
||||||
from requests import RequestException
|
from requests import RequestException
|
||||||
|
|
||||||
from app import config
|
from app import config
|
||||||
|
from app.events.event_dispatcher import EventDispatcher
|
||||||
|
from app.events.generated.event_pb2 import EventContent, UserPlanChanged
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import User
|
from app.models import User
|
||||||
|
|
||||||
|
@ -31,3 +33,6 @@ def execute_subscription_webhook(user: User):
|
||||||
)
|
)
|
||||||
except RequestException as e:
|
except RequestException as e:
|
||||||
LOG.error(f"Subscription request exception: {e}")
|
LOG.error(f"Subscription request exception: {e}")
|
||||||
|
|
||||||
|
event = UserPlanChanged(plan_end_time=sl_subscription_end)
|
||||||
|
EventDispatcher.send_event(user, EventContent(user_plan_change=event))
|
||||||
|
|
176
cron.py
176
cron.py
|
@ -61,6 +61,11 @@ from app.pgp_utils import load_public_key_and_check, PGPException
|
||||||
from app.proton.utils import get_proton_partner
|
from app.proton.utils import get_proton_partner
|
||||||
from app.utils import sanitize_email
|
from app.utils import sanitize_email
|
||||||
from server import create_light_app
|
from server import create_light_app
|
||||||
|
from tasks.cleanup_old_imports import cleanup_old_imports
|
||||||
|
from tasks.cleanup_old_jobs import cleanup_old_jobs
|
||||||
|
from tasks.cleanup_old_notifications import cleanup_old_notifications
|
||||||
|
|
||||||
|
DELETE_GRACE_DAYS = 30
|
||||||
|
|
||||||
|
|
||||||
def notify_trial_end():
|
def notify_trial_end():
|
||||||
|
@ -960,6 +965,9 @@ async def _hibp_check(api_key, queue):
|
||||||
|
|
||||||
This function to be ran simultaneously (multiple _hibp_check functions with different keys on the same queue) to make maximum use of multiple API keys.
|
This function to be ran simultaneously (multiple _hibp_check functions with different keys on the same queue) to make maximum use of multiple API keys.
|
||||||
"""
|
"""
|
||||||
|
default_rate_sleep = (60.0 / config.HIBP_RPM) + 0.1
|
||||||
|
rate_sleep = default_rate_sleep
|
||||||
|
rate_hit_counter = 0
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
alias_id = queue.get_nowait()
|
alias_id = queue.get_nowait()
|
||||||
|
@ -967,9 +975,14 @@ async def _hibp_check(api_key, queue):
|
||||||
return
|
return
|
||||||
|
|
||||||
alias = Alias.get(alias_id)
|
alias = Alias.get(alias_id)
|
||||||
# an alias can be deleted in the meantime
|
|
||||||
if not alias:
|
if not alias:
|
||||||
return
|
continue
|
||||||
|
user = alias.user
|
||||||
|
if user.disabled or not user.is_paid():
|
||||||
|
# Mark it as hibp done to skip it as if it had been checked
|
||||||
|
alias.hibp_last_check = arrow.utcnow()
|
||||||
|
Session.commit()
|
||||||
|
continue
|
||||||
|
|
||||||
LOG.d("Checking HIBP for %s", alias)
|
LOG.d("Checking HIBP for %s", alias)
|
||||||
|
|
||||||
|
@ -981,7 +994,6 @@ async def _hibp_check(api_key, queue):
|
||||||
f"https://haveibeenpwned.com/api/v3/breachedaccount/{urllib.parse.quote(alias.email)}",
|
f"https://haveibeenpwned.com/api/v3/breachedaccount/{urllib.parse.quote(alias.email)}",
|
||||||
headers=request_headers,
|
headers=request_headers,
|
||||||
)
|
)
|
||||||
|
|
||||||
if r.status_code == 200:
|
if r.status_code == 200:
|
||||||
# Breaches found
|
# Breaches found
|
||||||
alias.hibp_breaches = [
|
alias.hibp_breaches = [
|
||||||
|
@ -989,20 +1001,27 @@ async def _hibp_check(api_key, queue):
|
||||||
]
|
]
|
||||||
if len(alias.hibp_breaches) > 0:
|
if len(alias.hibp_breaches) > 0:
|
||||||
LOG.w("%s appears in HIBP breaches %s", alias, alias.hibp_breaches)
|
LOG.w("%s appears in HIBP breaches %s", alias, alias.hibp_breaches)
|
||||||
|
if rate_hit_counter > 0:
|
||||||
|
rate_hit_counter -= 1
|
||||||
elif r.status_code == 404:
|
elif r.status_code == 404:
|
||||||
# No breaches found
|
# No breaches found
|
||||||
alias.hibp_breaches = []
|
alias.hibp_breaches = []
|
||||||
elif r.status_code == 429:
|
elif r.status_code == 429:
|
||||||
# rate limited
|
# rate limited
|
||||||
LOG.w("HIBP rate limited, check alias %s in the next run", alias)
|
LOG.w("HIBP rate limited, check alias %s in the next run", alias)
|
||||||
await asyncio.sleep(1.6)
|
rate_hit_counter += 1
|
||||||
return
|
rate_sleep = default_rate_sleep + (0.2 * rate_hit_counter)
|
||||||
|
if rate_hit_counter > 10:
|
||||||
|
LOG.w(f"HIBP rate limited too many times stopping with alias {alias}")
|
||||||
|
return
|
||||||
|
# Just sleep for a while
|
||||||
|
asyncio.sleep(5)
|
||||||
elif r.status_code > 500:
|
elif r.status_code > 500:
|
||||||
LOG.w("HIBP server 5** error %s", r.status_code)
|
LOG.w("HIBP server 5** error %s", r.status_code)
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
LOG.error(
|
LOG.error(
|
||||||
"An error occured while checking alias %s: %s - %s",
|
"An error occurred while checking alias %s: %s - %s",
|
||||||
alias,
|
alias,
|
||||||
r.status_code,
|
r.status_code,
|
||||||
r.text,
|
r.text,
|
||||||
|
@ -1013,9 +1032,63 @@ async def _hibp_check(api_key, queue):
|
||||||
Session.add(alias)
|
Session.add(alias)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
LOG.d("Updated breaches info for %s", alias)
|
LOG.d("Updated breach info for %s", alias)
|
||||||
|
await asyncio.sleep(rate_sleep)
|
||||||
|
|
||||||
await asyncio.sleep(1.6)
|
|
||||||
|
def get_alias_to_check_hibp(
|
||||||
|
oldest_hibp_allowed: arrow.Arrow,
|
||||||
|
user_ids_to_skip: list[int],
|
||||||
|
min_alias_id: int,
|
||||||
|
max_alias_id: int,
|
||||||
|
):
|
||||||
|
now = arrow.now()
|
||||||
|
alias_query = (
|
||||||
|
Session.query(Alias)
|
||||||
|
.join(User, User.id == Alias.user_id)
|
||||||
|
.join(Subscription, User.id == Subscription.user_id, isouter=True)
|
||||||
|
.join(ManualSubscription, User.id == ManualSubscription.user_id, isouter=True)
|
||||||
|
.join(AppleSubscription, User.id == AppleSubscription.user_id, isouter=True)
|
||||||
|
.join(
|
||||||
|
CoinbaseSubscription,
|
||||||
|
User.id == CoinbaseSubscription.user_id,
|
||||||
|
isouter=True,
|
||||||
|
)
|
||||||
|
.join(PartnerUser, User.id == PartnerUser.user_id, isouter=True)
|
||||||
|
.join(
|
||||||
|
PartnerSubscription,
|
||||||
|
PartnerSubscription.partner_user_id == PartnerUser.id,
|
||||||
|
isouter=True,
|
||||||
|
)
|
||||||
|
.filter(
|
||||||
|
or_(
|
||||||
|
Alias.hibp_last_check.is_(None),
|
||||||
|
Alias.hibp_last_check < oldest_hibp_allowed,
|
||||||
|
),
|
||||||
|
Alias.user_id.notin_(user_ids_to_skip),
|
||||||
|
Alias.enabled,
|
||||||
|
Alias.id >= min_alias_id,
|
||||||
|
Alias.id < max_alias_id,
|
||||||
|
User.disabled == False, # noqa: E712
|
||||||
|
User.enable_data_breach_check,
|
||||||
|
or_(
|
||||||
|
User.lifetime,
|
||||||
|
ManualSubscription.end_at > now,
|
||||||
|
Subscription.next_bill_date > now.date(),
|
||||||
|
AppleSubscription.expires_date > now,
|
||||||
|
CoinbaseSubscription.end_at > now,
|
||||||
|
PartnerSubscription.end_at > now,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if config.HIBP_SKIP_PARTNER_ALIAS:
|
||||||
|
alias_query = alias_query.filter(
|
||||||
|
Alias.flags.op("&")(Alias.FLAG_PARTNER_CREATED) == 0
|
||||||
|
)
|
||||||
|
for alias in (
|
||||||
|
alias_query.order_by(Alias.id.asc()).enable_eagerloads(False).yield_per(500)
|
||||||
|
):
|
||||||
|
yield alias
|
||||||
|
|
||||||
|
|
||||||
async def check_hibp():
|
async def check_hibp():
|
||||||
|
@ -1038,40 +1111,49 @@ async def check_hibp():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
LOG.d("Updated list of known breaches")
|
LOG.d("Updated list of known breaches")
|
||||||
|
|
||||||
LOG.d("Preparing list of aliases to check")
|
LOG.d("Getting the list of users to skip")
|
||||||
|
query = "select u.id, count(a.id) from users u, alias a where a.user_id=u.id group by u.id having count(a.id) > :max_alias"
|
||||||
|
rows = Session.execute(query, {"max_alias": config.HIBP_MAX_ALIAS_CHECK})
|
||||||
|
user_ids = [row[0] for row in rows]
|
||||||
|
LOG.d("Got %d users to skip" % len(user_ids))
|
||||||
|
|
||||||
|
LOG.d("Checking aliases")
|
||||||
queue = asyncio.Queue()
|
queue = asyncio.Queue()
|
||||||
max_date = arrow.now().shift(days=-config.HIBP_SCAN_INTERVAL_DAYS)
|
min_alias_id = 0
|
||||||
for alias in (
|
max_alias_id = Session.query(func.max(Alias.id)).scalar()
|
||||||
Alias.filter(
|
step = 10000
|
||||||
or_(Alias.hibp_last_check.is_(None), Alias.hibp_last_check < max_date)
|
now = arrow.now()
|
||||||
|
oldest_hibp_allowed = now.shift(days=-config.HIBP_SCAN_INTERVAL_DAYS)
|
||||||
|
alias_checked = 0
|
||||||
|
for alias_batch_id in range(min_alias_id, max_alias_id, step):
|
||||||
|
for alias in get_alias_to_check_hibp(
|
||||||
|
oldest_hibp_allowed, user_ids, alias_batch_id, alias_batch_id + step
|
||||||
|
):
|
||||||
|
await queue.put(alias.id)
|
||||||
|
|
||||||
|
alias_checked += queue.qsize()
|
||||||
|
LOG.d(
|
||||||
|
f"Need to check about {queue.qsize()} aliases in this loop {alias_batch_id}/{max_alias_id}"
|
||||||
)
|
)
|
||||||
.filter(Alias.enabled)
|
|
||||||
.order_by(Alias.hibp_last_check.asc())
|
|
||||||
.yield_per(500)
|
|
||||||
.enable_eagerloads(False)
|
|
||||||
):
|
|
||||||
await queue.put(alias.id)
|
|
||||||
|
|
||||||
LOG.d("Need to check about %s aliases", queue.qsize())
|
# Start one checking process per API key
|
||||||
|
# Each checking process will take one alias from the queue, get the info
|
||||||
# Start one checking process per API key
|
# and then sleep for 1.5 seconds (due to HIBP API request limits)
|
||||||
# Each checking process will take one alias from the queue, get the info
|
checkers = []
|
||||||
# and then sleep for 1.5 seconds (due to HIBP API request limits)
|
for i in range(len(config.HIBP_API_KEYS)):
|
||||||
checkers = []
|
checker = asyncio.create_task(
|
||||||
for i in range(len(config.HIBP_API_KEYS)):
|
_hibp_check(
|
||||||
checker = asyncio.create_task(
|
config.HIBP_API_KEYS[i],
|
||||||
_hibp_check(
|
queue,
|
||||||
config.HIBP_API_KEYS[i],
|
)
|
||||||
queue,
|
|
||||||
)
|
)
|
||||||
)
|
checkers.append(checker)
|
||||||
checkers.append(checker)
|
|
||||||
|
|
||||||
# Wait until all checking processes are done
|
# Wait until all checking processes are done
|
||||||
for checker in checkers:
|
for checker in checkers:
|
||||||
await checker
|
await checker
|
||||||
|
|
||||||
LOG.d("Done checking HIBP API for aliases in breaches")
|
LOG.d(f"Done checking {alias_checked} HIBP API for aliases in breaches")
|
||||||
|
|
||||||
|
|
||||||
def notify_hibp():
|
def notify_hibp():
|
||||||
|
@ -1126,18 +1208,30 @@ def notify_hibp():
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
|
||||||
def clear_users_scheduled_to_be_deleted():
|
def clear_users_scheduled_to_be_deleted(dry_run=False):
|
||||||
users = User.filter(
|
users = User.filter(
|
||||||
and_(User.delete_on.isnot(None), User.delete_on < arrow.now())
|
and_(
|
||||||
|
User.delete_on.isnot(None),
|
||||||
|
User.delete_on <= arrow.now().shift(days=-DELETE_GRACE_DAYS),
|
||||||
|
)
|
||||||
).all()
|
).all()
|
||||||
for user in users:
|
for user in users:
|
||||||
LOG.i(
|
LOG.i(
|
||||||
f"Scheduled deletion of user {user} with scheduled delete on {user.delete_on}"
|
f"Scheduled deletion of user {user} with scheduled delete on {user.delete_on}"
|
||||||
)
|
)
|
||||||
|
if dry_run:
|
||||||
|
continue
|
||||||
User.delete(user.id)
|
User.delete(user.id)
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def delete_old_data():
|
||||||
|
oldest_valid = arrow.now().shift(days=-config.KEEP_OLD_DATA_DAYS)
|
||||||
|
cleanup_old_imports(oldest_valid)
|
||||||
|
cleanup_old_jobs(oldest_valid)
|
||||||
|
cleanup_old_notifications(oldest_valid)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
LOG.d("Start running cronjob")
|
LOG.d("Start running cronjob")
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
|
@ -1152,6 +1246,7 @@ if __name__ == "__main__":
|
||||||
"notify_manual_subscription_end",
|
"notify_manual_subscription_end",
|
||||||
"notify_premium_end",
|
"notify_premium_end",
|
||||||
"delete_logs",
|
"delete_logs",
|
||||||
|
"delete_old_data",
|
||||||
"poll_apple_subscription",
|
"poll_apple_subscription",
|
||||||
"sanity_check",
|
"sanity_check",
|
||||||
"delete_old_monitoring",
|
"delete_old_monitoring",
|
||||||
|
@ -1180,6 +1275,9 @@ if __name__ == "__main__":
|
||||||
elif args.job == "delete_logs":
|
elif args.job == "delete_logs":
|
||||||
LOG.d("Deleted Logs")
|
LOG.d("Deleted Logs")
|
||||||
delete_logs()
|
delete_logs()
|
||||||
|
elif args.job == "delete_old_data":
|
||||||
|
LOG.d("Delete old data")
|
||||||
|
delete_old_data()
|
||||||
elif args.job == "poll_apple_subscription":
|
elif args.job == "poll_apple_subscription":
|
||||||
LOG.d("Poll Apple Subscriptions")
|
LOG.d("Poll Apple Subscriptions")
|
||||||
poll_apple_subscription()
|
poll_apple_subscription()
|
||||||
|
@ -1206,4 +1304,4 @@ if __name__ == "__main__":
|
||||||
load_unsent_mails_from_fs_and_resend()
|
load_unsent_mails_from_fs_and_resend()
|
||||||
elif args.job == "delete_scheduled_users":
|
elif args.job == "delete_scheduled_users":
|
||||||
LOG.d("Deleting users scheduled to be deleted")
|
LOG.d("Deleting users scheduled to be deleted")
|
||||||
clear_users_scheduled_to_be_deleted()
|
clear_users_scheduled_to_be_deleted(dry_run=True)
|
||||||
|
|
|
@ -37,6 +37,12 @@ jobs:
|
||||||
schedule: "15 5 * * *"
|
schedule: "15 5 * * *"
|
||||||
captureStderr: true
|
captureStderr: true
|
||||||
|
|
||||||
|
- name: SimpleLogin Delete Old data
|
||||||
|
command: python /code/cron.py -j delete_old_data
|
||||||
|
shell: /bin/bash
|
||||||
|
schedule: "30 5 * * *"
|
||||||
|
captureStderr: true
|
||||||
|
|
||||||
- name: SimpleLogin Poll Apple Subscriptions
|
- name: SimpleLogin Poll Apple Subscriptions
|
||||||
command: python /code/cron.py -j poll_apple_subscription
|
command: python /code/cron.py -j poll_apple_subscription
|
||||||
shell: /bin/bash
|
shell: /bin/bash
|
||||||
|
@ -62,7 +68,7 @@ jobs:
|
||||||
captureStderr: true
|
captureStderr: true
|
||||||
|
|
||||||
- name: SimpleLogin delete users scheduled to be deleted
|
- name: SimpleLogin delete users scheduled to be deleted
|
||||||
command: echo disabled_user_deletion #python /code/cron.py -j delete_scheduled_users
|
command: python /code/cron.py -j delete_scheduled_users
|
||||||
shell: /bin/bash
|
shell: /bin/bash
|
||||||
schedule: "15 11 * * *"
|
schedule: "15 11 * * *"
|
||||||
captureStderr: true
|
captureStderr: true
|
||||||
|
|
|
@ -53,7 +53,7 @@ from flanker.addresslib.address import EmailAddress
|
||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
|
||||||
from app import pgp_utils, s3, config
|
from app import pgp_utils, s3, config
|
||||||
from app.alias_utils import try_auto_create
|
from app.alias_utils import try_auto_create, change_alias_status
|
||||||
from app.config import (
|
from app.config import (
|
||||||
EMAIL_DOMAIN,
|
EMAIL_DOMAIN,
|
||||||
URL,
|
URL,
|
||||||
|
@ -236,15 +236,16 @@ def get_or_create_contact(from_header: str, mail_from: str, alias: Alias) -> Con
|
||||||
Session.commit()
|
Session.commit()
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
|
contact_email_for_reply = (
|
||||||
|
contact_email if is_valid_email(contact_email) else ""
|
||||||
|
)
|
||||||
contact = Contact.create(
|
contact = Contact.create(
|
||||||
user_id=alias.user_id,
|
user_id=alias.user_id,
|
||||||
alias_id=alias.id,
|
alias_id=alias.id,
|
||||||
website_email=contact_email,
|
website_email=contact_email,
|
||||||
name=contact_name,
|
name=contact_name,
|
||||||
mail_from=mail_from,
|
mail_from=mail_from,
|
||||||
reply_email=generate_reply_email(contact_email, alias)
|
reply_email=generate_reply_email(contact_email_for_reply, alias),
|
||||||
if is_valid_email(contact_email)
|
|
||||||
else NOREPLY,
|
|
||||||
automatic_created=True,
|
automatic_created=True,
|
||||||
)
|
)
|
||||||
if not contact_email:
|
if not contact_email:
|
||||||
|
@ -636,6 +637,10 @@ def handle_forward(envelope, msg: Message, rcpt_to: str) -> List[Tuple[bool, str
|
||||||
|
|
||||||
user = alias.user
|
user = alias.user
|
||||||
|
|
||||||
|
if not user.is_active():
|
||||||
|
LOG.w(f"User {user} has been soft deleted")
|
||||||
|
return False, status.E502
|
||||||
|
|
||||||
if not user.can_send_or_receive():
|
if not user.can_send_or_receive():
|
||||||
LOG.i(f"User {user} cannot receive emails")
|
LOG.i(f"User {user} cannot receive emails")
|
||||||
if should_ignore_bounce(envelope.mail_from):
|
if should_ignore_bounce(envelope.mail_from):
|
||||||
|
@ -870,6 +875,7 @@ def forward_email_to_mailbox(
|
||||||
# References and In-Reply-To are used for keeping the email thread
|
# References and In-Reply-To are used for keeping the email thread
|
||||||
headers.REFERENCES,
|
headers.REFERENCES,
|
||||||
headers.IN_REPLY_TO,
|
headers.IN_REPLY_TO,
|
||||||
|
headers.SL_QUEUE_ID,
|
||||||
headers.LIST_UNSUBSCRIBE,
|
headers.LIST_UNSUBSCRIBE,
|
||||||
headers.LIST_UNSUBSCRIBE_POST,
|
headers.LIST_UNSUBSCRIBE_POST,
|
||||||
] + headers.MIME_HEADERS
|
] + headers.MIME_HEADERS
|
||||||
|
@ -1055,6 +1061,9 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
|
||||||
if not contact:
|
if not contact:
|
||||||
LOG.w(f"No contact with {reply_email} as reverse alias")
|
LOG.w(f"No contact with {reply_email} as reverse alias")
|
||||||
return False, status.E502
|
return False, status.E502
|
||||||
|
if not contact.user.is_active():
|
||||||
|
LOG.w(f"User {contact.user} has been soft deleted")
|
||||||
|
return False, status.E502
|
||||||
|
|
||||||
alias = contact.alias
|
alias = contact.alias
|
||||||
alias_address: str = contact.alias.email
|
alias_address: str = contact.alias.email
|
||||||
|
@ -1171,6 +1180,7 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
|
||||||
# References and In-Reply-To are used for keeping the email thread
|
# References and In-Reply-To are used for keeping the email thread
|
||||||
headers.REFERENCES,
|
headers.REFERENCES,
|
||||||
headers.IN_REPLY_TO,
|
headers.IN_REPLY_TO,
|
||||||
|
headers.SL_QUEUE_ID,
|
||||||
]
|
]
|
||||||
+ headers.MIME_HEADERS,
|
+ headers.MIME_HEADERS,
|
||||||
)
|
)
|
||||||
|
@ -1575,7 +1585,7 @@ def handle_bounce_forward_phase(msg: Message, email_log: EmailLog):
|
||||||
LOG.w(
|
LOG.w(
|
||||||
f"Disable alias {alias} because {reason}. {alias.mailboxes} {alias.user}. Last contact {contact}"
|
f"Disable alias {alias} because {reason}. {alias.mailboxes} {alias.user}. Last contact {contact}"
|
||||||
)
|
)
|
||||||
alias.enabled = False
|
change_alias_status(alias, enabled=False)
|
||||||
|
|
||||||
Notification.create(
|
Notification.create(
|
||||||
user_id=user.id,
|
user_id=user.id,
|
||||||
|
@ -1883,24 +1893,30 @@ def handle_transactional_bounce(
|
||||||
envelope: Envelope, msg, rcpt_to, transactional_id=None
|
envelope: Envelope, msg, rcpt_to, transactional_id=None
|
||||||
):
|
):
|
||||||
LOG.d("handle transactional bounce sent to %s", rcpt_to)
|
LOG.d("handle transactional bounce sent to %s", rcpt_to)
|
||||||
|
if transactional_id is None:
|
||||||
|
LOG.i(
|
||||||
|
f"No transactional record for {envelope.mail_from} -> {envelope.rcpt_tos}"
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
# parse the TransactionalEmail
|
|
||||||
transactional_id = transactional_id or parse_id_from_bounce(rcpt_to)
|
|
||||||
transactional = TransactionalEmail.get(transactional_id)
|
transactional = TransactionalEmail.get(transactional_id)
|
||||||
|
|
||||||
# a transaction might have been deleted in delete_logs()
|
# a transaction might have been deleted in delete_logs()
|
||||||
if transactional:
|
if not transactional:
|
||||||
LOG.i("Create bounce for %s", transactional.email)
|
LOG.i(
|
||||||
bounce_info = get_mailbox_bounce_info(msg)
|
f"No transactional record for {envelope.mail_from} -> {envelope.rcpt_tos}"
|
||||||
if bounce_info:
|
)
|
||||||
Bounce.create(
|
return
|
||||||
email=transactional.email,
|
LOG.i("Create bounce for %s", transactional.email)
|
||||||
info=bounce_info.as_bytes().decode(),
|
bounce_info = get_mailbox_bounce_info(msg)
|
||||||
commit=True,
|
if bounce_info:
|
||||||
)
|
Bounce.create(
|
||||||
else:
|
email=transactional.email,
|
||||||
LOG.w("cannot get bounce info, debug at %s", save_email_for_debugging(msg))
|
info=bounce_info.as_bytes().decode(),
|
||||||
Bounce.create(email=transactional.email, commit=True)
|
commit=True,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
LOG.w("cannot get bounce info, debug at %s", save_email_for_debugging(msg))
|
||||||
|
Bounce.create(email=transactional.email, commit=True)
|
||||||
|
|
||||||
|
|
||||||
def handle_bounce(envelope, email_log: EmailLog, msg: Message) -> str:
|
def handle_bounce(envelope, email_log: EmailLog, msg: Message) -> str:
|
||||||
|
@ -1921,6 +1937,9 @@ def handle_bounce(envelope, email_log: EmailLog, msg: Message) -> str:
|
||||||
contact,
|
contact,
|
||||||
alias,
|
alias,
|
||||||
)
|
)
|
||||||
|
if not email_log.user.is_active():
|
||||||
|
LOG.d(f"User {email_log.user} is not active")
|
||||||
|
return status.E510
|
||||||
|
|
||||||
if email_log.is_reply:
|
if email_log.is_reply:
|
||||||
content_type = msg.get_content_type().lower()
|
content_type = msg.get_content_type().lower()
|
||||||
|
@ -1982,6 +2001,9 @@ def send_no_reply_response(mail_from: str, msg: Message):
|
||||||
if not mailbox:
|
if not mailbox:
|
||||||
LOG.d("Unknown sender. Skipping reply from {}".format(NOREPLY))
|
LOG.d("Unknown sender. Skipping reply from {}".format(NOREPLY))
|
||||||
return
|
return
|
||||||
|
if not mailbox.user.is_active():
|
||||||
|
LOG.d(f"User {mailbox.user} is soft-deleted. Skipping sending reply response")
|
||||||
|
return
|
||||||
send_email_at_most_times(
|
send_email_at_most_times(
|
||||||
mailbox.user,
|
mailbox.user,
|
||||||
ALERT_TO_NOREPLY,
|
ALERT_TO_NOREPLY,
|
||||||
|
@ -2020,10 +2042,11 @@ def handle(envelope: Envelope, msg: Message) -> str:
|
||||||
return status.E204
|
return status.E204
|
||||||
|
|
||||||
# sanitize email headers
|
# sanitize email headers
|
||||||
sanitize_header(msg, "from")
|
sanitize_header(msg, headers.FROM)
|
||||||
sanitize_header(msg, "to")
|
sanitize_header(msg, headers.TO)
|
||||||
sanitize_header(msg, "cc")
|
sanitize_header(msg, headers.CC)
|
||||||
sanitize_header(msg, "reply-to")
|
sanitize_header(msg, headers.REPLY_TO)
|
||||||
|
sanitize_header(msg, headers.MESSAGE_ID)
|
||||||
|
|
||||||
LOG.d(
|
LOG.d(
|
||||||
"==>> Handle mail_from:%s, rcpt_tos:%s, header_from:%s, header_to:%s, "
|
"==>> Handle mail_from:%s, rcpt_tos:%s, header_from:%s, header_to:%s, "
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
import argparse
|
||||||
|
from enum import Enum
|
||||||
|
from sys import argv, exit
|
||||||
|
|
||||||
|
from app.config import DB_URI
|
||||||
|
from app.log import LOG
|
||||||
|
from events.runner import Runner
|
||||||
|
from events.event_source import DeadLetterEventSource, PostgresEventSource
|
||||||
|
from events.event_sink import ConsoleEventSink, HttpEventSink
|
||||||
|
|
||||||
|
|
||||||
|
class Mode(Enum):
|
||||||
|
DEAD_LETTER = "dead_letter"
|
||||||
|
LISTENER = "listener"
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def from_str(value: str):
|
||||||
|
if value == Mode.DEAD_LETTER.value:
|
||||||
|
return Mode.DEAD_LETTER
|
||||||
|
elif value == Mode.LISTENER.value:
|
||||||
|
return Mode.LISTENER
|
||||||
|
else:
|
||||||
|
raise ValueError(f"Invalid mode: {value}")
|
||||||
|
|
||||||
|
|
||||||
|
def main(mode: Mode, dry_run: bool):
|
||||||
|
if mode == Mode.DEAD_LETTER:
|
||||||
|
LOG.i("Using DeadLetterEventSource")
|
||||||
|
source = DeadLetterEventSource()
|
||||||
|
elif mode == Mode.LISTENER:
|
||||||
|
LOG.i("Using PostgresEventSource")
|
||||||
|
source = PostgresEventSource(DB_URI)
|
||||||
|
else:
|
||||||
|
raise ValueError(f"Invalid mode: {mode}")
|
||||||
|
|
||||||
|
if dry_run:
|
||||||
|
LOG.i("Starting with ConsoleEventSink")
|
||||||
|
sink = ConsoleEventSink()
|
||||||
|
else:
|
||||||
|
LOG.i("Starting with HttpEventSink")
|
||||||
|
sink = HttpEventSink()
|
||||||
|
|
||||||
|
runner = Runner(source=source, sink=sink)
|
||||||
|
runner.run()
|
||||||
|
|
||||||
|
|
||||||
|
def args():
|
||||||
|
parser = argparse.ArgumentParser(description="Run event listener")
|
||||||
|
parser.add_argument(
|
||||||
|
"mode",
|
||||||
|
help="Mode to run",
|
||||||
|
choices=[Mode.DEAD_LETTER.value, Mode.LISTENER.value],
|
||||||
|
)
|
||||||
|
parser.add_argument("--dry-run", help="Dry run mode", action="store_true")
|
||||||
|
return parser.parse_args()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
if len(argv) < 2:
|
||||||
|
print("Invalid usage. Pass 'listener' or 'dead_letter' as argument")
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
args = args()
|
||||||
|
main(Mode.from_str(args.mode), args.dry_run)
|
|
@ -0,0 +1,42 @@
|
||||||
|
import requests
|
||||||
|
|
||||||
|
from abc import ABC, abstractmethod
|
||||||
|
from app.config import EVENT_WEBHOOK, EVENT_WEBHOOK_SKIP_VERIFY_SSL
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import SyncEvent
|
||||||
|
|
||||||
|
|
||||||
|
class EventSink(ABC):
|
||||||
|
@abstractmethod
|
||||||
|
def process(self, event: SyncEvent) -> bool:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class HttpEventSink(EventSink):
|
||||||
|
def process(self, event: SyncEvent) -> bool:
|
||||||
|
if not EVENT_WEBHOOK:
|
||||||
|
LOG.warning("Skipping sending event because there is no webhook configured")
|
||||||
|
return False
|
||||||
|
|
||||||
|
LOG.info(f"Sending event {event.id} to {EVENT_WEBHOOK}")
|
||||||
|
|
||||||
|
res = requests.post(
|
||||||
|
url=EVENT_WEBHOOK,
|
||||||
|
data=event.content,
|
||||||
|
headers={"Content-Type": "application/x-protobuf"},
|
||||||
|
verify=not EVENT_WEBHOOK_SKIP_VERIFY_SSL,
|
||||||
|
)
|
||||||
|
if res.status_code != 200:
|
||||||
|
LOG.warning(
|
||||||
|
f"Failed to send event to webhook: {res.status_code} {res.text}"
|
||||||
|
)
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
LOG.info(f"Event {event.id} sent successfully to webhook")
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
class ConsoleEventSink(EventSink):
|
||||||
|
def process(self, event: SyncEvent) -> bool:
|
||||||
|
LOG.info(f"Handling event {event.id}")
|
||||||
|
return True
|
|
@ -0,0 +1,100 @@
|
||||||
|
import arrow
|
||||||
|
import newrelic.agent
|
||||||
|
import psycopg2
|
||||||
|
import select
|
||||||
|
|
||||||
|
from abc import ABC, abstractmethod
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import SyncEvent
|
||||||
|
from app.events.event_dispatcher import NOTIFICATION_CHANNEL
|
||||||
|
from time import sleep
|
||||||
|
from typing import Callable, NoReturn
|
||||||
|
|
||||||
|
_DEAD_LETTER_THRESHOLD_MINUTES = 10
|
||||||
|
_DEAD_LETTER_INTERVAL_SECONDS = 30
|
||||||
|
|
||||||
|
_POSTGRES_RECONNECT_INTERVAL_SECONDS = 5
|
||||||
|
|
||||||
|
|
||||||
|
class EventSource(ABC):
|
||||||
|
@abstractmethod
|
||||||
|
def run(self, on_event: Callable[[SyncEvent], NoReturn]):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class PostgresEventSource(EventSource):
|
||||||
|
def __init__(self, connection_string: str):
|
||||||
|
self.__connection_string = connection_string
|
||||||
|
self.__connect()
|
||||||
|
|
||||||
|
def run(self, on_event: Callable[[SyncEvent], NoReturn]):
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
self.__listen(on_event)
|
||||||
|
except Exception as e:
|
||||||
|
LOG.warn(f"Error listening to events: {e}")
|
||||||
|
sleep(_POSTGRES_RECONNECT_INTERVAL_SECONDS)
|
||||||
|
self.__connect()
|
||||||
|
|
||||||
|
def __listen(self, on_event: Callable[[SyncEvent], NoReturn]):
|
||||||
|
self.__connection.set_isolation_level(
|
||||||
|
psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT
|
||||||
|
)
|
||||||
|
|
||||||
|
cursor = self.__connection.cursor()
|
||||||
|
cursor.execute(f"LISTEN {NOTIFICATION_CHANNEL};")
|
||||||
|
|
||||||
|
while True:
|
||||||
|
if select.select([self.__connection], [], [], 5) != ([], [], []):
|
||||||
|
self.__connection.poll()
|
||||||
|
while self.__connection.notifies:
|
||||||
|
notify = self.__connection.notifies.pop(0)
|
||||||
|
LOG.debug(
|
||||||
|
f"Got NOTIFY: pid={notify.pid} channel={notify.channel} payload={notify.payload}"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
webhook_id = int(notify.payload)
|
||||||
|
event = SyncEvent.get_by(id=webhook_id)
|
||||||
|
if event is not None:
|
||||||
|
if event.mark_as_taken():
|
||||||
|
on_event(event)
|
||||||
|
else:
|
||||||
|
LOG.info(
|
||||||
|
f"Event {event.id} was handled by another runner"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
LOG.info(f"Could not find event with id={notify.payload}")
|
||||||
|
except Exception as e:
|
||||||
|
LOG.warn(f"Error getting event: {e}")
|
||||||
|
|
||||||
|
def __connect(self):
|
||||||
|
self.__connection = psycopg2.connect(self.__connection_string)
|
||||||
|
|
||||||
|
from app.db import Session
|
||||||
|
|
||||||
|
Session.close()
|
||||||
|
|
||||||
|
|
||||||
|
class DeadLetterEventSource(EventSource):
|
||||||
|
@newrelic.agent.background_task()
|
||||||
|
def run(self, on_event: Callable[[SyncEvent], NoReturn]):
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
threshold = arrow.utcnow().shift(
|
||||||
|
minutes=-_DEAD_LETTER_THRESHOLD_MINUTES
|
||||||
|
)
|
||||||
|
events = SyncEvent.get_dead_letter(older_than=threshold)
|
||||||
|
if events:
|
||||||
|
LOG.info(f"Got {len(events)} dead letter events")
|
||||||
|
if events:
|
||||||
|
newrelic.agent.record_custom_metric(
|
||||||
|
"Custom/dead_letter_events_to_process", len(events)
|
||||||
|
)
|
||||||
|
for event in events:
|
||||||
|
on_event(event)
|
||||||
|
else:
|
||||||
|
LOG.debug("No dead letter events")
|
||||||
|
sleep(_DEAD_LETTER_INTERVAL_SECONDS)
|
||||||
|
except Exception as e:
|
||||||
|
LOG.warn(f"Error getting dead letter event: {e}")
|
||||||
|
sleep(_DEAD_LETTER_INTERVAL_SECONDS)
|
|
@ -0,0 +1,42 @@
|
||||||
|
import arrow
|
||||||
|
import newrelic.agent
|
||||||
|
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import SyncEvent
|
||||||
|
from events.event_sink import EventSink
|
||||||
|
from events.event_source import EventSource
|
||||||
|
|
||||||
|
|
||||||
|
class Runner:
|
||||||
|
def __init__(self, source: EventSource, sink: EventSink):
|
||||||
|
self.__source = source
|
||||||
|
self.__sink = sink
|
||||||
|
|
||||||
|
def run(self):
|
||||||
|
self.__source.run(self.__on_event)
|
||||||
|
|
||||||
|
@newrelic.agent.background_task()
|
||||||
|
def __on_event(self, event: SyncEvent):
|
||||||
|
try:
|
||||||
|
event_created_at = event.created_at
|
||||||
|
start_time = arrow.now()
|
||||||
|
success = self.__sink.process(event)
|
||||||
|
if success:
|
||||||
|
event_id = event.id
|
||||||
|
SyncEvent.delete(event.id, commit=True)
|
||||||
|
LOG.info(f"Marked {event_id} as done")
|
||||||
|
|
||||||
|
end_time = arrow.now() - start_time
|
||||||
|
time_between_taken_and_created = start_time - event_created_at
|
||||||
|
|
||||||
|
newrelic.agent.record_custom_metric("Custom/sync_event_processed", 1)
|
||||||
|
newrelic.agent.record_custom_metric(
|
||||||
|
"Custom/sync_event_process_time", end_time.total_seconds()
|
||||||
|
)
|
||||||
|
newrelic.agent.record_custom_metric(
|
||||||
|
"Custom/sync_event_elapsed_time",
|
||||||
|
time_between_taken_and_created.total_seconds(),
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
LOG.warn(f"Exception processing event [id={event.id}]: {e}")
|
||||||
|
newrelic.agent.record_custom_metric("Custom/sync_event_failed", 1)
|
|
@ -116,6 +116,14 @@ WORDS_FILE_PATH=local_data/test_words.txt
|
||||||
# CONNECT_WITH_PROTON=true
|
# CONNECT_WITH_PROTON=true
|
||||||
# CONNECT_WITH_PROTON_COOKIE_NAME=to_fill
|
# CONNECT_WITH_PROTON_COOKIE_NAME=to_fill
|
||||||
|
|
||||||
|
# Login with OIDC
|
||||||
|
# CONNECT_WITH_OIDC_ICON=fa-github
|
||||||
|
# OIDC_WELL_KNOWN_URL=to_fill
|
||||||
|
# OIDC_SCOPES=openid email profile
|
||||||
|
# OIDC_NAME_FIELD=name
|
||||||
|
# OIDC_CLIENT_ID=to_fill
|
||||||
|
# OIDC_CLIENT_SECRET=to_fill
|
||||||
|
|
||||||
# Flask profiler
|
# Flask profiler
|
||||||
# FLASK_PROFILER_PATH=/tmp/flask-profiler.sql
|
# FLASK_PROFILER_PATH=/tmp/flask-profiler.sql
|
||||||
# FLASK_PROFILER_PASSWORD=password
|
# FLASK_PROFILER_PASSWORD=password
|
||||||
|
|
|
@ -15,6 +15,7 @@ from app.email_utils import (
|
||||||
render,
|
render,
|
||||||
)
|
)
|
||||||
from app.import_utils import handle_batch_import
|
from app.import_utils import handle_batch_import
|
||||||
|
from app.jobs.event_jobs import send_alias_creation_events_for_user
|
||||||
from app.jobs.export_user_data_job import ExportUserDataJob
|
from app.jobs.export_user_data_job import ExportUserDataJob
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import User, Job, BatchImport, Mailbox, CustomDomain, JobState
|
from app.models import User, Job, BatchImport, Mailbox, CustomDomain, JobState
|
||||||
|
@ -197,13 +198,18 @@ def process_job(job: Job):
|
||||||
onboarding_mailbox(user)
|
onboarding_mailbox(user)
|
||||||
elif job.name == config.JOB_ONBOARDING_4:
|
elif job.name == config.JOB_ONBOARDING_4:
|
||||||
user_id = job.payload.get("user_id")
|
user_id = job.payload.get("user_id")
|
||||||
user = User.get(user_id)
|
user: User = User.get(user_id)
|
||||||
|
|
||||||
# user might delete their account in the meantime
|
# user might delete their account in the meantime
|
||||||
# or disable the notification
|
# or disable the notification
|
||||||
if user and user.notification and user.activated:
|
if user and user.notification and user.activated:
|
||||||
LOG.d("send onboarding pgp email to user %s", user)
|
# if user only has 1 mailbox which is Proton then do not send PGP onboarding email
|
||||||
onboarding_pgp(user)
|
mailboxes = user.mailboxes()
|
||||||
|
if len(mailboxes) == 1 and mailboxes[0].is_proton():
|
||||||
|
LOG.d("Do not send onboarding PGP email to Proton mailbox")
|
||||||
|
else:
|
||||||
|
LOG.d("send onboarding pgp email to user %s", user)
|
||||||
|
onboarding_pgp(user)
|
||||||
|
|
||||||
elif job.name == config.JOB_BATCH_IMPORT:
|
elif job.name == config.JOB_BATCH_IMPORT:
|
||||||
batch_import_id = job.payload.get("batch_import_id")
|
batch_import_id = job.payload.get("batch_import_id")
|
||||||
|
@ -264,8 +270,14 @@ SimpleLogin team.
|
||||||
user_id = job.payload.get("user_id")
|
user_id = job.payload.get("user_id")
|
||||||
user = User.get(user_id)
|
user = User.get(user_id)
|
||||||
if user and user.activated:
|
if user and user.activated:
|
||||||
LOG.d("send proton welcome email to user %s", user)
|
LOG.d("Send proton welcome email to user %s", user)
|
||||||
welcome_proton(user)
|
welcome_proton(user)
|
||||||
|
elif job.name == config.JOB_SEND_ALIAS_CREATION_EVENTS:
|
||||||
|
user_id = job.payload.get("user_id")
|
||||||
|
user = User.get(user_id)
|
||||||
|
if user and user.activated:
|
||||||
|
LOG.d(f"Sending alias creation events for {user}")
|
||||||
|
send_alias_creation_events_for_user(user)
|
||||||
else:
|
else:
|
||||||
LOG.e("Unknown job name %s", job.name)
|
LOG.e("Unknown job name %s", job.name)
|
||||||
|
|
||||||
|
|
|
@ -7460,9 +7460,7 @@ villain
|
||||||
vindicate
|
vindicate
|
||||||
vineyard
|
vineyard
|
||||||
vintage
|
vintage
|
||||||
violate
|
|
||||||
violation
|
violation
|
||||||
violator
|
|
||||||
violet
|
violet
|
||||||
violin
|
violin
|
||||||
viper
|
viper
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
"""empty message
|
||||||
|
|
||||||
|
Revision ID: 818b0a956205
|
||||||
|
Revises: 4bc54632d9aa
|
||||||
|
Create Date: 2024-02-01 10:43:46.253184
|
||||||
|
|
||||||
|
"""
|
||||||
|
import sqlalchemy_utils
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = '818b0a956205'
|
||||||
|
down_revision = '4bc54632d9aa'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('alias', sa.Column('last_email_log_id', sa.Integer(), nullable=True))
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('alias', 'last_email_log_id')
|
||||||
|
# ### end Alembic commands ###
|
|
@ -0,0 +1,48 @@
|
||||||
|
"""empty message
|
||||||
|
|
||||||
|
Revision ID: 52510a633d6f
|
||||||
|
Revises: 818b0a956205
|
||||||
|
Create Date: 2024-03-12 12:46:24.161644
|
||||||
|
|
||||||
|
"""
|
||||||
|
import sqlalchemy_utils
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = "52510a633d6f"
|
||||||
|
down_revision = "818b0a956205"
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column(
|
||||||
|
"alias", sa.Column("flags", sa.BigInteger(), server_default="0", nullable=False)
|
||||||
|
)
|
||||||
|
with op.get_context().autocommit_block():
|
||||||
|
op.create_index(op.f("ix_alias_flags"), "alias", ["flags"], unique=False)
|
||||||
|
op.create_index(op.f("ix_job_state"), "job", ["state"], unique=False)
|
||||||
|
op.create_index(
|
||||||
|
"ix_state_run_at_taken_at",
|
||||||
|
"job",
|
||||||
|
["state", "run_at", "taken_at"],
|
||||||
|
unique=False,
|
||||||
|
)
|
||||||
|
op.create_index(
|
||||||
|
op.f("ix_notification_user_id"), "notification", ["user_id"], unique=False
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
with op.get_context().autocommit_block():
|
||||||
|
op.drop_index(op.f("ix_notification_user_id"), table_name="notification")
|
||||||
|
op.drop_index("ix_state_run_at_taken_at", table_name="job")
|
||||||
|
op.drop_index(op.f("ix_job_state"), table_name="job")
|
||||||
|
op.drop_index(op.f("ix_alias_flags"), table_name="alias")
|
||||||
|
op.drop_column("alias", "flags")
|
||||||
|
# ### end Alembic commands ###
|
|
@ -0,0 +1,29 @@
|
||||||
|
"""empty message
|
||||||
|
|
||||||
|
Revision ID: fa2f19bb4e5a
|
||||||
|
Revises: 52510a633d6f
|
||||||
|
Create Date: 2024-04-09 13:12:26.305340
|
||||||
|
|
||||||
|
"""
|
||||||
|
import sqlalchemy_utils
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = 'fa2f19bb4e5a'
|
||||||
|
down_revision = '52510a633d6f'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('users', sa.Column('enable_data_breach_check', sa.Boolean(), server_default='0', nullable=False))
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('users', 'enable_data_breach_check')
|
||||||
|
# ### end Alembic commands ###
|
|
@ -0,0 +1,38 @@
|
||||||
|
"""Create sync_event table
|
||||||
|
|
||||||
|
Revision ID: 06a9a7133445
|
||||||
|
Revises: fa2f19bb4e5a
|
||||||
|
Create Date: 2024-05-17 13:11:20.402259
|
||||||
|
|
||||||
|
"""
|
||||||
|
import sqlalchemy_utils
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = '06a9a7133445'
|
||||||
|
down_revision = 'fa2f19bb4e5a'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.create_table('sync_event',
|
||||||
|
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||||
|
sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
|
||||||
|
sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
|
||||||
|
sa.Column('content', sa.LargeBinary(), nullable=False),
|
||||||
|
sa.Column('taken_time', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_index(op.f('ix_sync_event_created_at'), 'sync_event', ['created_at'], unique=False)
|
||||||
|
op.create_index(op.f('ix_sync_event_taken_time'), 'sync_event', ['taken_time'], unique=False)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table('sync_event')
|
||||||
|
# ### end Alembic commands ###
|
|
@ -4,6 +4,7 @@ import subprocess
|
||||||
from time import sleep
|
from time import sleep
|
||||||
from typing import List, Dict
|
from typing import List, Dict
|
||||||
|
|
||||||
|
import arrow
|
||||||
import newrelic.agent
|
import newrelic.agent
|
||||||
|
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
|
@ -93,11 +94,44 @@ def log_nb_db_connection():
|
||||||
newrelic.agent.record_custom_metric("Custom/nb_db_connections", nb_connection)
|
newrelic.agent.record_custom_metric("Custom/nb_db_connections", nb_connection)
|
||||||
|
|
||||||
|
|
||||||
|
@newrelic.agent.background_task()
|
||||||
|
def log_pending_to_process_events():
|
||||||
|
r = Session.execute("select count(*) from sync_event WHERE taken_time IS NULL;")
|
||||||
|
events_pending = list(r)[0][0]
|
||||||
|
|
||||||
|
LOG.d("number of events pending to process %s", events_pending)
|
||||||
|
newrelic.agent.record_custom_metric(
|
||||||
|
"Custom/sync_events_pending_to_process", events_pending
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@newrelic.agent.background_task()
|
||||||
|
def log_events_pending_dead_letter():
|
||||||
|
since = arrow.now().shift(minutes=-10).datetime
|
||||||
|
r = Session.execute(
|
||||||
|
"""
|
||||||
|
SELECT COUNT(*)
|
||||||
|
FROM sync_event
|
||||||
|
WHERE (taken_time IS NOT NULL AND taken_time < :since)
|
||||||
|
OR (taken_time IS NULL AND created_at < :since)
|
||||||
|
""",
|
||||||
|
{"since": since},
|
||||||
|
)
|
||||||
|
events_pending = list(r)[0][0]
|
||||||
|
|
||||||
|
LOG.d("number of events pending dead letter %s", events_pending)
|
||||||
|
newrelic.agent.record_custom_metric(
|
||||||
|
"Custom/sync_events_pending_dead_letter", events_pending
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
exporter = MetricExporter(get_newrelic_license())
|
exporter = MetricExporter(get_newrelic_license())
|
||||||
while True:
|
while True:
|
||||||
log_postfix_metrics()
|
log_postfix_metrics()
|
||||||
log_nb_db_connection()
|
log_nb_db_connection()
|
||||||
|
log_pending_to_process_events()
|
||||||
|
log_events_pending_dead_letter()
|
||||||
Session.close()
|
Session.close()
|
||||||
|
|
||||||
exporter.run()
|
exporter.run()
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import time
|
||||||
|
|
||||||
|
from sqlalchemy import func
|
||||||
|
from app.models import Alias
|
||||||
|
from app.db import Session
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog="Backfill alias", description="Backfill alias las use"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-s", "--start_alias_id", default=0, type=int, help="Initial alias_id"
|
||||||
|
)
|
||||||
|
parser.add_argument("-e", "--end_alias_id", default=0, type=int, help="Last alias_id")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
alias_id_start = args.start_alias_id
|
||||||
|
max_alias_id = args.end_alias_id
|
||||||
|
if max_alias_id == 0:
|
||||||
|
max_alias_id = Session.query(func.max(Alias.id)).scalar()
|
||||||
|
|
||||||
|
print(f"Checking alias {alias_id_start} to {max_alias_id}")
|
||||||
|
step = 1000
|
||||||
|
el_query = "SELECT alias_id, MAX(id) from email_log where alias_id>=:start AND alias_id < :end GROUP BY alias_id"
|
||||||
|
alias_query = "UPDATE alias set last_email_log_id = :el_id where id = :alias_id"
|
||||||
|
updated = 0
|
||||||
|
start_time = time.time()
|
||||||
|
for batch_start in range(alias_id_start, max_alias_id, step):
|
||||||
|
rows = Session.execute(el_query, {"start": batch_start, "end": batch_start + step})
|
||||||
|
for row in rows:
|
||||||
|
Session.execute(alias_query, {"alias_id": row[0], "el_id": row[1]})
|
||||||
|
Session.commit()
|
||||||
|
updated += 1
|
||||||
|
elapsed = time.time() - start_time
|
||||||
|
time_per_alias = elapsed / (updated + 1)
|
||||||
|
last_batch_id = batch_start + step
|
||||||
|
remaining = max_alias_id - last_batch_id
|
||||||
|
time_remaining = (max_alias_id - last_batch_id) * time_per_alias
|
||||||
|
hours_remaining = time_remaining / 3600.0
|
||||||
|
print(
|
||||||
|
f"\rAlias {batch_start}/{max_alias_id} {updated} {hours_remaining:.2f}hrs remaining"
|
||||||
|
)
|
||||||
|
print("")
|
|
@ -0,0 +1,37 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import random
|
||||||
|
import time
|
||||||
|
|
||||||
|
from sqlalchemy import func
|
||||||
|
|
||||||
|
from app import config
|
||||||
|
from app.models import Alias, Contact
|
||||||
|
from app.db import Session
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog=f"Replace {config.NOREPLY}",
|
||||||
|
description=f"Replace {config.NOREPLY} from contacts reply email",
|
||||||
|
)
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
max_alias_id: int = Session.query(func.max(Alias.id)).scalar()
|
||||||
|
|
||||||
|
start = time.time()
|
||||||
|
tests = 1000
|
||||||
|
for i in range(tests):
|
||||||
|
alias = (
|
||||||
|
Alias.filter(Alias.id > int(random.random() * max_alias_id))
|
||||||
|
.order_by(Alias.id.asc())
|
||||||
|
.limit(1)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
contact = Contact.filter_by(alias_id=alias.id).order_by(Contact.id.asc()).first()
|
||||||
|
mailboxes = alias.mailboxes
|
||||||
|
user = alias.user
|
||||||
|
if i % 10:
|
||||||
|
print("{i} -> {alias.id}")
|
||||||
|
|
||||||
|
end = time.time()
|
||||||
|
time_taken = end - start
|
||||||
|
print(f"Took {time_taken} -> {time_taken/tests} per test")
|
|
@ -0,0 +1,56 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import time
|
||||||
|
|
||||||
|
from sqlalchemy import func
|
||||||
|
|
||||||
|
from app.models import Alias, SLDomain
|
||||||
|
from app.db import Session
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog="Mark partner created aliases with the PARTNER_CREATED flag",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-s", "--start_alias_id", default=0, type=int, help="Initial alias_id"
|
||||||
|
)
|
||||||
|
parser.add_argument("-e", "--end_alias_id", default=0, type=int, help="Last alias_id")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
alias_id_start = args.start_alias_id
|
||||||
|
max_alias_id = args.end_alias_id
|
||||||
|
if max_alias_id == 0:
|
||||||
|
max_alias_id = Session.query(func.max(Alias.id)).scalar()
|
||||||
|
|
||||||
|
print(f"Updating aliases from {alias_id_start} to {max_alias_id}")
|
||||||
|
|
||||||
|
domains = SLDomain.filter(SLDomain.partner_id.isnot(None)).all()
|
||||||
|
cond = [f"email like '%{domain.domain}'" for domain in domains]
|
||||||
|
sql_or_cond = " OR ".join(cond)
|
||||||
|
sql = f"UPDATE alias set flags = (flags | :flag) WHERE id >= :start and id<:end and flags & :flag = 0 and ({sql_or_cond})"
|
||||||
|
print(sql)
|
||||||
|
|
||||||
|
step = 1000
|
||||||
|
updated = 0
|
||||||
|
start_time = time.time()
|
||||||
|
for batch_start in range(alias_id_start, max_alias_id, step):
|
||||||
|
updated += Session.execute(
|
||||||
|
sql,
|
||||||
|
{
|
||||||
|
"start": batch_start,
|
||||||
|
"end": batch_start + step,
|
||||||
|
"flag": Alias.FLAG_PARTNER_CREATED,
|
||||||
|
},
|
||||||
|
).rowcount
|
||||||
|
elapsed = time.time() - start_time
|
||||||
|
time_per_alias = elapsed / (batch_start - alias_id_start + step)
|
||||||
|
last_batch_id = batch_start + step
|
||||||
|
remaining = max_alias_id - last_batch_id
|
||||||
|
time_remaining = (max_alias_id - last_batch_id) * time_per_alias
|
||||||
|
hours_remaining = time_remaining / 3600.0
|
||||||
|
percent = int(
|
||||||
|
((batch_start - alias_id_start) * 100) / (max_alias_id - alias_id_start)
|
||||||
|
)
|
||||||
|
print(
|
||||||
|
f"\rAlias {batch_start}/{max_alias_id} {percent}% {updated} updated {hours_remaining:.2f}hrs remaining"
|
||||||
|
)
|
||||||
|
print(f"Updated aliases up to {max_alias_id}")
|
|
@ -0,0 +1,55 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import time
|
||||||
|
|
||||||
|
from sqlalchemy import func
|
||||||
|
from app.models import Alias, User
|
||||||
|
from app.db import Session
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog="Backfill alias", description="Backfill user flags for partner alias created"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-s", "--start_user_id", default=0, type=int, help="Initial user_id"
|
||||||
|
)
|
||||||
|
parser.add_argument("-e", "--end_user_id", default=0, type=int, help="Last user_id")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
user_id_start = args.start_user_id
|
||||||
|
max_user_id = args.end_user_id
|
||||||
|
if max_user_id == 0:
|
||||||
|
max_user_id = Session.query(func.max(User.id)).scalar()
|
||||||
|
|
||||||
|
print(f"Checking user {user_id_start} to {max_user_id}")
|
||||||
|
step = 1000
|
||||||
|
el_query = "SELECT user_id, count(id) from alias where user_id>=:start AND user_id < :end AND flags & :alias_flag > 0 GROUP BY user_id"
|
||||||
|
user_update_query = "UPDATE users set flags = flags | :user_flag where id = :user_id"
|
||||||
|
updated = 0
|
||||||
|
start_time = time.time()
|
||||||
|
for batch_start in range(user_id_start, max_user_id, step):
|
||||||
|
rows = Session.execute(
|
||||||
|
el_query,
|
||||||
|
{
|
||||||
|
"start": batch_start,
|
||||||
|
"end": batch_start + step,
|
||||||
|
"alias_flag": Alias.FLAG_PARTNER_CREATED,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
for row in rows:
|
||||||
|
if row[1] > 0:
|
||||||
|
Session.execute(
|
||||||
|
user_update_query,
|
||||||
|
{"user_id": row[0], "user_flag": User.FLAG_CREATED_ALIAS_FROM_PARTNER},
|
||||||
|
)
|
||||||
|
Session.commit()
|
||||||
|
updated += 1
|
||||||
|
elapsed = time.time() - start_time
|
||||||
|
time_per_alias = elapsed / (updated + 1)
|
||||||
|
last_batch_id = batch_start + step
|
||||||
|
remaining = max_user_id - last_batch_id
|
||||||
|
time_remaining = (max_user_id - last_batch_id) * time_per_alias
|
||||||
|
hours_remaining = time_remaining / 3600.0
|
||||||
|
print(
|
||||||
|
f"\rUser {batch_start}/{max_user_id} {updated} {hours_remaining:.2f}hrs remaining"
|
||||||
|
)
|
||||||
|
print("")
|
|
@ -0,0 +1,53 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
import argparse
|
||||||
|
import time
|
||||||
|
|
||||||
|
|
||||||
|
from app import config
|
||||||
|
from app.email_utils import generate_reply_email
|
||||||
|
from app.email_validation import is_valid_email
|
||||||
|
from app.models import Alias
|
||||||
|
from app.db import Session
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog=f"Replace {config.NOREPLY}",
|
||||||
|
description=f"Replace {config.NOREPLY} from contacts reply email",
|
||||||
|
)
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
el_query = "SELECT id, alias_id, website_email from contact where id>=:last_id AND reply_email=:reply_email ORDER BY id ASC LIMIT :step"
|
||||||
|
update_query = "UPDATE contact SET reply_email=:reply_email WHERE id=:contact_id "
|
||||||
|
updated = 0
|
||||||
|
start_time = time.time()
|
||||||
|
step = 100
|
||||||
|
last_id = 0
|
||||||
|
print(f"Replacing contacts with reply_email={config.NOREPLY}")
|
||||||
|
while True:
|
||||||
|
rows = Session.execute(
|
||||||
|
el_query, {"last_id": last_id, "reply_email": config.NOREPLY, "step": step}
|
||||||
|
)
|
||||||
|
loop_updated = 0
|
||||||
|
for row in rows:
|
||||||
|
contact_id = row[0]
|
||||||
|
alias_id = row[1]
|
||||||
|
last_id = contact_id
|
||||||
|
website_email = row[2]
|
||||||
|
contact_email_for_reply = website_email if is_valid_email(website_email) else ""
|
||||||
|
alias = Alias.get(alias_id)
|
||||||
|
if alias is None:
|
||||||
|
print(f"CANNOT find alias {alias_id} in database for contact {contact_id}")
|
||||||
|
reply_email = generate_reply_email(contact_email_for_reply, alias)
|
||||||
|
print(
|
||||||
|
f"Replacing contact {contact_id} with {website_email} reply_email for {reply_email}"
|
||||||
|
)
|
||||||
|
Session.execute(
|
||||||
|
update_query, {"contact_id": row[0], "reply_email": reply_email}
|
||||||
|
)
|
||||||
|
Session.commit()
|
||||||
|
updated += 1
|
||||||
|
loop_updated += 1
|
||||||
|
elapsed = time.time() - start_time
|
||||||
|
print(f"\rContact {last_id} done")
|
||||||
|
if loop_updated == 0:
|
||||||
|
break
|
||||||
|
print("")
|
|
@ -2150,24 +2150,22 @@ wcwidth = "*"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "protobuf"
|
name = "protobuf"
|
||||||
version = "4.24.3"
|
version = "5.27.1"
|
||||||
description = ""
|
description = ""
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.7"
|
python-versions = ">=3.8"
|
||||||
files = [
|
files = [
|
||||||
{file = "protobuf-4.24.3-cp310-abi3-win32.whl", hash = "sha256:20651f11b6adc70c0f29efbe8f4a94a74caf61b6200472a9aea6e19898f9fcf4"},
|
{file = "protobuf-5.27.1-cp310-abi3-win32.whl", hash = "sha256:3adc15ec0ff35c5b2d0992f9345b04a540c1e73bfee3ff1643db43cc1d734333"},
|
||||||
{file = "protobuf-4.24.3-cp310-abi3-win_amd64.whl", hash = "sha256:3d42e9e4796a811478c783ef63dc85b5a104b44aaaca85d4864d5b886e4b05e3"},
|
{file = "protobuf-5.27.1-cp310-abi3-win_amd64.whl", hash = "sha256:25236b69ab4ce1bec413fd4b68a15ef8141794427e0b4dc173e9d5d9dffc3bcd"},
|
||||||
{file = "protobuf-4.24.3-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:6e514e8af0045be2b56e56ae1bb14f43ce7ffa0f68b1c793670ccbe2c4fc7d2b"},
|
{file = "protobuf-5.27.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:4e38fc29d7df32e01a41cf118b5a968b1efd46b9c41ff515234e794011c78b17"},
|
||||||
{file = "protobuf-4.24.3-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:ba53c2f04798a326774f0e53b9c759eaef4f6a568ea7072ec6629851c8435959"},
|
{file = "protobuf-5.27.1-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:917ed03c3eb8a2d51c3496359f5b53b4e4b7e40edfbdd3d3f34336e0eef6825a"},
|
||||||
{file = "protobuf-4.24.3-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:f6ccbcf027761a2978c1406070c3788f6de4a4b2cc20800cc03d52df716ad675"},
|
{file = "protobuf-5.27.1-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:ee52874a9e69a30271649be88ecbe69d374232e8fd0b4e4b0aaaa87f429f1631"},
|
||||||
{file = "protobuf-4.24.3-cp37-cp37m-win32.whl", hash = "sha256:1b182c7181a2891e8f7f3a1b5242e4ec54d1f42582485a896e4de81aa17540c2"},
|
{file = "protobuf-5.27.1-cp38-cp38-win32.whl", hash = "sha256:7a97b9c5aed86b9ca289eb5148df6c208ab5bb6906930590961e08f097258107"},
|
||||||
{file = "protobuf-4.24.3-cp37-cp37m-win_amd64.whl", hash = "sha256:b0271a701e6782880d65a308ba42bc43874dabd1a0a0f41f72d2dac3b57f8e76"},
|
{file = "protobuf-5.27.1-cp38-cp38-win_amd64.whl", hash = "sha256:f6abd0f69968792da7460d3c2cfa7d94fd74e1c21df321eb6345b963f9ec3d8d"},
|
||||||
{file = "protobuf-4.24.3-cp38-cp38-win32.whl", hash = "sha256:e29d79c913f17a60cf17c626f1041e5288e9885c8579832580209de8b75f2a52"},
|
{file = "protobuf-5.27.1-cp39-cp39-win32.whl", hash = "sha256:dfddb7537f789002cc4eb00752c92e67885badcc7005566f2c5de9d969d3282d"},
|
||||||
{file = "protobuf-4.24.3-cp38-cp38-win_amd64.whl", hash = "sha256:067f750169bc644da2e1ef18c785e85071b7c296f14ac53e0900e605da588719"},
|
{file = "protobuf-5.27.1-cp39-cp39-win_amd64.whl", hash = "sha256:39309898b912ca6febb0084ea912e976482834f401be35840a008da12d189340"},
|
||||||
{file = "protobuf-4.24.3-cp39-cp39-win32.whl", hash = "sha256:2da777d34b4f4f7613cdf85c70eb9a90b1fbef9d36ae4a0ccfe014b0b07906f1"},
|
{file = "protobuf-5.27.1-py3-none-any.whl", hash = "sha256:4ac7249a1530a2ed50e24201d6630125ced04b30619262f06224616e0030b6cf"},
|
||||||
{file = "protobuf-4.24.3-cp39-cp39-win_amd64.whl", hash = "sha256:f631bb982c5478e0c1c70eab383af74a84be66945ebf5dd6b06fc90079668d0b"},
|
{file = "protobuf-5.27.1.tar.gz", hash = "sha256:df5e5b8e39b7d1c25b186ffdf9f44f40f810bbcc9d2b71d9d3156fee5a9adf15"},
|
||||||
{file = "protobuf-4.24.3-py3-none-any.whl", hash = "sha256:f6f8dc65625dadaad0c8545319c2e2f0424fede988368893ca3844261342c11a"},
|
|
||||||
{file = "protobuf-4.24.3.tar.gz", hash = "sha256:12e9ad2ec079b833176d2921be2cb24281fa591f0b119b208b788adc48c2561d"},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
package simplelogin_events;
|
||||||
|
|
||||||
|
message UserPlanChanged {
|
||||||
|
uint32 plan_end_time = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UserDeleted {
|
||||||
|
}
|
||||||
|
|
||||||
|
message AliasCreated {
|
||||||
|
uint32 alias_id = 1;
|
||||||
|
string alias_email = 2;
|
||||||
|
string alias_note = 3;
|
||||||
|
bool enabled = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
message AliasStatusChanged {
|
||||||
|
uint32 alias_id = 1;
|
||||||
|
string alias_email = 2;
|
||||||
|
bool enabled = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message AliasDeleted {
|
||||||
|
uint32 alias_id = 1;
|
||||||
|
string alias_email = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message AliasCreatedList {
|
||||||
|
repeated AliasCreated events = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message EventContent {
|
||||||
|
oneof content {
|
||||||
|
UserPlanChanged user_plan_change = 1;
|
||||||
|
UserDeleted user_deleted = 2;
|
||||||
|
AliasCreated alias_created = 3;
|
||||||
|
AliasStatusChanged alias_status_change = 4;
|
||||||
|
AliasDeleted alias_deleted = 5;
|
||||||
|
AliasCreatedList alias_create_list = 6;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message Event {
|
||||||
|
uint32 user_id = 1;
|
||||||
|
string external_user_id = 2;
|
||||||
|
uint32 partner_id = 3;
|
||||||
|
EventContent content = 4;
|
||||||
|
}
|
|
@ -14,13 +14,14 @@ exclude = '''
|
||||||
| build
|
| build
|
||||||
| dist
|
| dist
|
||||||
| migrations # migrations/ is generated by alembic
|
| migrations # migrations/ is generated by alembic
|
||||||
|
| app/events/generated
|
||||||
)/
|
)/
|
||||||
)
|
)
|
||||||
'''
|
'''
|
||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
ignore-init-module-imports = true
|
ignore-init-module-imports = true
|
||||||
exclude = [".venv", "migrations"]
|
exclude = [".venv", "migrations", "app/events/generated"]
|
||||||
|
|
||||||
[tool.djlint]
|
[tool.djlint]
|
||||||
indent = 2
|
indent = 2
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -euxo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "$0")" || exit 1; pwd -P)"
|
||||||
|
REPO_ROOT=$(echo "${SCRIPT_DIR}" | sed 's:scripts::g')
|
||||||
|
|
||||||
|
DEST_DIR="${REPO_ROOT}/app/events/generated"
|
||||||
|
|
||||||
|
PROTOC=${PROTOC:-"protoc"}
|
||||||
|
|
||||||
|
if ! eval "${PROTOC} --version" &> /dev/null ; then
|
||||||
|
echo "Cannot find $PROTOC"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -rf "${DEST_DIR}"
|
||||||
|
mkdir -p "${DEST_DIR}"
|
||||||
|
|
||||||
|
pushd $REPO_ROOT || exit 1
|
||||||
|
|
||||||
|
eval "${PROTOC} --proto_path=proto --python_out=\"${DEST_DIR}\" --pyi_out=\"${DEST_DIR}\" proto/event.proto"
|
||||||
|
|
||||||
|
popd || exit 1
|
|
@ -228,6 +228,8 @@ def load_user(alternative_id):
|
||||||
sentry_sdk.set_user({"email": user.email, "id": user.id})
|
sentry_sdk.set_user({"email": user.email, "id": user.id})
|
||||||
if user.disabled:
|
if user.disabled:
|
||||||
return None
|
return None
|
||||||
|
if not user.is_active():
|
||||||
|
return None
|
||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 3.2 KiB |
|
@ -0,0 +1,19 @@
|
||||||
|
import arrow
|
||||||
|
|
||||||
|
from app import s3
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import BatchImport
|
||||||
|
|
||||||
|
|
||||||
|
def cleanup_old_imports(oldest_allowed: arrow.Arrow):
|
||||||
|
LOG.i(f"Deleting imports older than {oldest_allowed}")
|
||||||
|
for batch_import in (
|
||||||
|
BatchImport.filter(BatchImport.created_at < oldest_allowed).yield_per(500).all()
|
||||||
|
):
|
||||||
|
LOG.i(
|
||||||
|
f"Deleting batch import {batch_import} with file {batch_import.file.path}"
|
||||||
|
)
|
||||||
|
file = batch_import.file
|
||||||
|
if file is not None:
|
||||||
|
s3.delete(file.path)
|
||||||
|
BatchImport.delete(batch_import.id, commit=True)
|
|
@ -0,0 +1,24 @@
|
||||||
|
import arrow
|
||||||
|
from sqlalchemy import or_, and_
|
||||||
|
|
||||||
|
from app import config
|
||||||
|
from app.db import Session
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import Job, JobState
|
||||||
|
|
||||||
|
|
||||||
|
def cleanup_old_jobs(oldest_allowed: arrow.Arrow):
|
||||||
|
LOG.i(f"Deleting jobs older than {oldest_allowed}")
|
||||||
|
count = Job.filter(
|
||||||
|
or_(
|
||||||
|
Job.state == JobState.done.value,
|
||||||
|
Job.state == JobState.error.value,
|
||||||
|
and_(
|
||||||
|
Job.state == JobState.taken.value,
|
||||||
|
Job.attempts >= config.JOB_MAX_ATTEMPTS,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Job.updated_at < oldest_allowed,
|
||||||
|
).delete()
|
||||||
|
Session.commit()
|
||||||
|
LOG.i(f"Deleted {count} jobs")
|
|
@ -0,0 +1,12 @@
|
||||||
|
import arrow
|
||||||
|
|
||||||
|
from app.db import Session
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import Notification
|
||||||
|
|
||||||
|
|
||||||
|
def cleanup_old_notifications(oldest_allowed: arrow.Arrow):
|
||||||
|
LOG.i(f"Deleting notifications older than {oldest_allowed}")
|
||||||
|
count = Notification.filter(Notification.created_at < oldest_allowed).delete()
|
||||||
|
Session.commit()
|
||||||
|
LOG.i(f"Deleted {count} notifications")
|
|
@ -38,11 +38,21 @@
|
||||||
<span>or</span>
|
<span>or</span>
|
||||||
</div>
|
</div>
|
||||||
<a class="btn btn-primary btn-block mt-2 proton-button"
|
<a class="btn btn-primary btn-block mt-2 proton-button"
|
||||||
href="{{ url_for("auth.proton_login", next=next_url) }}">
|
href="{{ url_for('auth.proton_login', next=next_url) }}">
|
||||||
<img class="mr-2" src="/static/images/proton.svg" />
|
<img class="mr-2" src="/static/images/proton.svg" />
|
||||||
Log in with Proton
|
Log in with Proton
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if connect_with_oidc %}
|
||||||
|
|
||||||
|
<div class="text-center my-2 text-gray">
|
||||||
|
<span>or</span>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-primary btn-block mt-2 btn-social"
|
||||||
|
href="{{ url_for('auth.oidc_login', next=next_url) }}">
|
||||||
|
<i class="fa {{ connect_with_oidc_icon }}"></i> Log in with SSO
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center text-muted mt-2">
|
<div class="text-center text-muted mt-2">
|
||||||
|
|
|
@ -50,11 +50,21 @@
|
||||||
<span>or</span>
|
<span>or</span>
|
||||||
</div>
|
</div>
|
||||||
<a class="btn btn-primary btn-block mt-2 proton-button"
|
<a class="btn btn-primary btn-block mt-2 proton-button"
|
||||||
href="{{ url_for("auth.proton_login", next=next_url) }}">
|
href="{{ url_for('auth.proton_login', next=next_url) }}">
|
||||||
<img class="mr-2" src="/static/images/proton.svg" />
|
<img class="mr-2" src="/static/images/proton.svg" />
|
||||||
Sign up with Proton
|
Sign up with Proton
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if connect_with_oidc %}
|
||||||
|
|
||||||
|
<div class="text-center my-2 text-gray">
|
||||||
|
<span>or</span>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-primary btn-block mt-2 btn-social"
|
||||||
|
href="{{ url_for('auth.oidc_login', next=next_url) }}">
|
||||||
|
<i class="fa {{ connect_with_oidc_icon }}"></i> Sign up with SSO
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div class="text-center text-muted mb-6">
|
<div class="text-center text-muted mb-6">
|
||||||
|
|
|
@ -0,0 +1,164 @@
|
||||||
|
{% extends "default.html" %}
|
||||||
|
|
||||||
|
{% set active_page = "setting" %}
|
||||||
|
{% block title %}Settings{% endblock %}
|
||||||
|
{% block head %}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.card-title {
|
||||||
|
font-size: 22px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 3px;
|
||||||
|
}
|
||||||
|
.highlighted{
|
||||||
|
border: solid 2px #5675E2;
|
||||||
|
}
|
||||||
|
li {
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
{% endblock %}
|
||||||
|
{% block default_content %}
|
||||||
|
|
||||||
|
<div class="col pb-3">
|
||||||
|
<!-- Change email -->
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<form method="post" enctype="multipart/form-data">
|
||||||
|
<input type="hidden" name="form-name" value="update-email">
|
||||||
|
{{ change_email_form.csrf_token }}
|
||||||
|
<div class="card-title">Account Email</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
This email address is used to log in to SimpleLogin.
|
||||||
|
<br />
|
||||||
|
If you want to change the mailbox that emails are forwarded to, use the
|
||||||
|
<a href="{{ url_for('dashboard.mailbox_route') }}">
|
||||||
|
<i class="fe fe-inbox"></i> Mailboxes page
|
||||||
|
</a>
|
||||||
|
instead.
|
||||||
|
</div>
|
||||||
|
<div class="form-group mt-2">
|
||||||
|
<!-- Not allow user to change email if there's a pending change -->
|
||||||
|
{{ change_email_form.email(class="form-control", value=current_user.email, readonly=pending_email != None) }}
|
||||||
|
{{ render_field_errors(change_email_form.email) }}
|
||||||
|
</div>
|
||||||
|
<button class="btn btn-outline-primary">Change Email</button>
|
||||||
|
</form>
|
||||||
|
{% if pending_email %}
|
||||||
|
|
||||||
|
<div class="mt-2">
|
||||||
|
<span class="text-danger float-left">Pending email change: {{ pending_email }}</span>
|
||||||
|
<form method="POST"
|
||||||
|
action="{{ url_for('dashboard.resend_email_change') }}"
|
||||||
|
class="float-left ml-2">
|
||||||
|
{{ change_email_form.csrf_token }}
|
||||||
|
<a onclick="this.closest('form').submit()"
|
||||||
|
class="btn btn-secondary btn-sm">Resend confirmation email</a>
|
||||||
|
</form>
|
||||||
|
<form method="POST"
|
||||||
|
action="{{ url_for('dashboard.cancel_email_change') }}"
|
||||||
|
class="float-left ml-2">
|
||||||
|
{{ change_email_form.csrf_token }}
|
||||||
|
<a onclick="this.closest('form').submit()"
|
||||||
|
class="btn btn-secondary btn-sm">Cancel email change</a>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END Change email -->
|
||||||
|
<!-- Change password -->
|
||||||
|
<div class="card" id="change_password">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="card-title">Password</div>
|
||||||
|
<div class="mb-3">You will receive an email containing instructions on how to change your password.</div>
|
||||||
|
<form method="post">
|
||||||
|
{{ csrf_form.csrf_token }}
|
||||||
|
<input type="hidden" name="form-name" value="change-password">
|
||||||
|
<button class="btn btn-outline-primary">Change password</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END Change password -->
|
||||||
|
<!-- TOTP -->
|
||||||
|
<div class="card" id="totp">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="card-title">Two Factor Authentication</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
|
||||||
|
<br />
|
||||||
|
</div>
|
||||||
|
{% if not current_user.enable_otp %}
|
||||||
|
|
||||||
|
<a href="{{ url_for('dashboard.mfa_setup') }}"
|
||||||
|
class="btn btn-outline-primary">Setup TOTP</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="{{ url_for('dashboard.mfa_cancel') }}"
|
||||||
|
class="btn btn-outline-danger">Disable TOTP</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END TOTP -->
|
||||||
|
<!-- WebAuthn -->
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="card-title">Security Key (WebAuthn)</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
You can secure your account by linking either your FIDO-supported physical key such as Yubikey, Google
|
||||||
|
Titan,
|
||||||
|
or a device with appropriate hardware to your account.
|
||||||
|
</div>
|
||||||
|
{% if current_user.fido_uuid is none %}
|
||||||
|
|
||||||
|
<a href="{{ url_for('dashboard.fido_setup') }}"
|
||||||
|
class="btn btn-outline-primary">Setup WebAuthn</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="{{ url_for('dashboard.fido_manage') }}"
|
||||||
|
class="btn btn-outline-info">Manage WebAuthn</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END WebAuthn -->
|
||||||
|
<!-- data export -->
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="card-title">SimpleLogin data export</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
As per GDPR (General Data Protection Regulation) law, you can request a copy of your data which are stored on
|
||||||
|
SimpleLogin.
|
||||||
|
A zip file that contains all information will be sent to your SimpleLogin account address.
|
||||||
|
</div>
|
||||||
|
<div class="d-flex">
|
||||||
|
<div>
|
||||||
|
<form method="post">
|
||||||
|
{{ csrf_form.csrf_token }}
|
||||||
|
<input type="hidden" name="form-name" value="send-full-user-report">
|
||||||
|
<button class="btn btn-outline-info">Request your data</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END data export -->
|
||||||
|
<!-- Delete account -->
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="card-title">Account Deletion</div>
|
||||||
|
<div class="mb-3">If SimpleLogin isn't the right fit for you, you can simply delete your account.</div>
|
||||||
|
<a href="{{ url_for('dashboard.delete_account') }}"
|
||||||
|
class="btn btn-outline-danger">Delete account</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END Delete account -->
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
{% block script %}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
let anchor = window.location.hash;
|
||||||
|
$(anchor).addClass("highlighted")
|
||||||
|
|
||||||
|
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
|
@ -22,11 +22,20 @@
|
||||||
<p>Alternatively you can use your Proton credentials to ensure it's you.</p>
|
<p>Alternatively you can use your Proton credentials to ensure it's you.</p>
|
||||||
</div>
|
</div>
|
||||||
<a class="btn btn-primary btn-block mt-2 proton-button w-25"
|
<a class="btn btn-primary btn-block mt-2 proton-button w-25"
|
||||||
href="{{ url_for("auth.proton_login", next=next) }}">
|
href="{{ url_for('auth.proton_login', next=next) }}">
|
||||||
<img class="mr-2" src="/static/images/proton.svg" />
|
<img class="mr-2" src="/static/images/proton.svg" />
|
||||||
Authenticate with Proton
|
Authenticate with Proton
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if connect_with_oidc %}
|
||||||
|
|
||||||
|
<div class="my-3">
|
||||||
|
<p>Alternatively you can use your SSO credentials to ensure it's you.</p>
|
||||||
|
<a class="btn btn-primary btn-block mt-2 btn-social w-25"
|
||||||
|
href="{{ url_for('auth.oidc_login', next=next) }}">
|
||||||
|
<i class="fa {{ connect_with_oidc_icon }}"></i> Authenticate with SSO
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endblock %}
|
||||||
{% endblock %}
|
|
||||||
|
|
|
@ -88,45 +88,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- END Current plan -->
|
<!-- END Current plan -->
|
||||||
<!-- TOTP -->
|
|
||||||
<div class="card" id="totp">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="card-title">Two Factor Authentication</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
|
|
||||||
<br />
|
|
||||||
</div>
|
|
||||||
{% if not current_user.enable_otp %}
|
|
||||||
|
|
||||||
<a href="{{ url_for('dashboard.mfa_setup') }}"
|
|
||||||
class="btn btn-outline-primary">Setup TOTP</a>
|
|
||||||
{% else %}
|
|
||||||
<a href="{{ url_for('dashboard.mfa_cancel') }}"
|
|
||||||
class="btn btn-outline-danger">Disable TOTP</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- END TOTP -->
|
|
||||||
<!-- WebAuthn -->
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="card-title">Security Key (WebAuthn)</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
You can secure your account by linking either your FIDO-supported physical key such as Yubikey, Google
|
|
||||||
Titan,
|
|
||||||
or a device with appropriate hardware to your account.
|
|
||||||
</div>
|
|
||||||
{% if current_user.fido_uuid is none %}
|
|
||||||
|
|
||||||
<a href="{{ url_for('dashboard.fido_setup') }}"
|
|
||||||
class="btn btn-outline-primary">Setup WebAuthn</a>
|
|
||||||
{% else %}
|
|
||||||
<a href="{{ url_for('dashboard.fido_manage') }}"
|
|
||||||
class="btn btn-outline-info">Manage WebAuthn</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- END WebAuthn -->
|
|
||||||
<!-- Newsletter -->
|
<!-- Newsletter -->
|
||||||
<div class="card" id="notification">
|
<div class="card" id="notification">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
@ -179,52 +140,6 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<!-- END change name & profile picture -->
|
<!-- END change name & profile picture -->
|
||||||
<!-- Change email -->
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<form method="post" enctype="multipart/form-data">
|
|
||||||
<input type="hidden" name="form-name" value="update-email">
|
|
||||||
{{ change_email_form.csrf_token }}
|
|
||||||
<div class="card-title">Account Email</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
This email address is used to log in to SimpleLogin.
|
|
||||||
<br />
|
|
||||||
If you want to change the mailbox that emails are forwarded to, use the
|
|
||||||
<a href="{{ url_for('dashboard.mailbox_route') }}">
|
|
||||||
<i class="fe fe-inbox"></i> Mailboxes page
|
|
||||||
</a>
|
|
||||||
instead.
|
|
||||||
</div>
|
|
||||||
<div class="form-group mt-2">
|
|
||||||
<!-- Not allow user to change email if there's a pending change -->
|
|
||||||
{{ change_email_form.email(class="form-control", value=current_user.email, readonly=pending_email != None) }}
|
|
||||||
{{ render_field_errors(change_email_form.email) }}
|
|
||||||
</div>
|
|
||||||
<button class="btn btn-outline-primary">Change Email</button>
|
|
||||||
</form>
|
|
||||||
{% if pending_email %}
|
|
||||||
|
|
||||||
<div class="mt-2">
|
|
||||||
<span class="text-danger float-left">Pending email change: {{ pending_email }}</span>
|
|
||||||
<form method="POST"
|
|
||||||
action="{{ url_for('dashboard.resend_email_change') }}"
|
|
||||||
class="float-left ml-2">
|
|
||||||
{{ change_email_form.csrf_token }}
|
|
||||||
<a onclick="this.closest('form').submit()"
|
|
||||||
class="btn btn-secondary btn-sm">Resend confirmation email</a>
|
|
||||||
</form>
|
|
||||||
<form method="POST"
|
|
||||||
action="{{ url_for('dashboard.cancel_email_change') }}"
|
|
||||||
class="float-left ml-2">
|
|
||||||
{{ change_email_form.csrf_token }}
|
|
||||||
<a onclick="this.closest('form').submit()"
|
|
||||||
class="btn btn-secondary btn-sm">Cancel email change</a>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- END Change email -->
|
|
||||||
<!-- Connect with Proton -->
|
<!-- Connect with Proton -->
|
||||||
{% if connect_with_proton %}
|
{% if connect_with_proton %}
|
||||||
|
|
||||||
|
@ -265,32 +180,11 @@
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!-- END Connect with Proton -->
|
<!-- END Connect with Proton -->
|
||||||
<!-- Change password -->
|
|
||||||
<div class="card" id="change_password">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="card-title">Password</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
You will receive an email containing instructions on how to change your password.
|
|
||||||
</div>
|
|
||||||
<form method="post">
|
|
||||||
{{ csrf_form.csrf_token }}
|
|
||||||
<input type="hidden" name="form-name" value="change-password">
|
|
||||||
<button class="btn btn-outline-primary">
|
|
||||||
Change password
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- END Change password -->
|
|
||||||
<!-- Random alias -->
|
<!-- Random alias -->
|
||||||
<div id="random-alias" class="card">
|
<div id="random-alias" class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="card-title">
|
<div class="card-title">Aliases</div>
|
||||||
Aliases
|
<div class="mt-3 mb-1">Change the way random aliases are generated by default.</div>
|
||||||
</div>
|
|
||||||
<div class="mt-3 mb-1">
|
|
||||||
Change the way random aliases are generated by default.
|
|
||||||
</div>
|
|
||||||
<form method="post" action="#random-alias" class="form-inline">
|
<form method="post" action="#random-alias" class="form-inline">
|
||||||
{{ csrf_form.csrf_token }}
|
{{ csrf_form.csrf_token }}
|
||||||
<input type="hidden" name="form-name" value="change-alias-generator">
|
<input type="hidden" name="form-name" value="change-alias-generator">
|
||||||
|
@ -306,13 +200,9 @@
|
||||||
on {{ AliasGeneratorEnum.uuid.name.upper() }}
|
on {{ AliasGeneratorEnum.uuid.name.upper() }}
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
<button class="btn btn-outline-primary">
|
<button class="btn btn-outline-primary">Update</button>
|
||||||
Update
|
|
||||||
</button>
|
|
||||||
</form>
|
</form>
|
||||||
<div class="mt-3 mb-1">
|
<div class="mt-3 mb-1">Select the default domain for aliases.</div>
|
||||||
Select the default domain for aliases.
|
|
||||||
</div>
|
|
||||||
<form method="post" action="#random-alias" class="form-inline">
|
<form method="post" action="#random-alias" class="form-inline">
|
||||||
{{ csrf_form.csrf_token }}
|
{{ csrf_form.csrf_token }}
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
|
@ -338,13 +228,9 @@
|
||||||
</option>
|
</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
<button class="btn btn-outline-primary">
|
<button class="btn btn-outline-primary">Update</button>
|
||||||
Update
|
|
||||||
</button>
|
|
||||||
</form>
|
</form>
|
||||||
<div id="random-alias-suffix" class="mt-3 mb-1">
|
<div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
|
||||||
Select the default suffix generator for aliases.
|
|
||||||
</div>
|
|
||||||
<form method="post" action="#random-alias-suffix" class="form-inline">
|
<form method="post" action="#random-alias-suffix" class="form-inline">
|
||||||
{{ csrf_form.csrf_token }}
|
{{ csrf_form.csrf_token }}
|
||||||
<input type="hidden" name="form-name" value="random-alias-suffix">
|
<input type="hidden" name="form-name" value="random-alias-suffix">
|
||||||
|
@ -358,19 +244,51 @@
|
||||||
Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
|
Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
<button class="btn btn-outline-primary">
|
<button class="btn btn-outline-primary">Update</button>
|
||||||
Update
|
|
||||||
</button>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- END Random alias -->
|
<!-- END Random alias -->
|
||||||
|
<!-- Data breach check -->
|
||||||
|
<div class="card" id="data-breach">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="card-title">Data breach monitoring</div>
|
||||||
|
<div class="mt-1 mb-3">
|
||||||
|
{% if not current_user.is_premium() %}
|
||||||
|
|
||||||
|
<div class="alert alert-info" role="alert">
|
||||||
|
This feature is only available on Premium plan.
|
||||||
|
<a href="{{ url_for('dashboard.pricing') }}"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer">
|
||||||
|
Upgrade<i class="fe fe-external-link"></i>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
If enabled, we will inform you via email if one of your aliases appears in a data breach.
|
||||||
|
<br>
|
||||||
|
SimpleLogin uses <a href="https://haveibeenpwned.com/">HaveIBeenPwned</a> API for checking for data breaches.
|
||||||
|
</div>
|
||||||
|
<form method="post" action="#data-breach">
|
||||||
|
{{ csrf_form.csrf_token }}
|
||||||
|
<input type="hidden" name="form-name" value="enable_data_breach_check">
|
||||||
|
<div class="form-check">
|
||||||
|
<input type="checkbox"
|
||||||
|
id="enable_data_breach_check"
|
||||||
|
name="enable_data_breach_check"
|
||||||
|
{% if current_user.enable_data_breach_check %} checked{% endif %}
|
||||||
|
class="form-check-input">
|
||||||
|
<label for="enable_data_breach_check">Enable data breach monitoring</label>
|
||||||
|
</div>
|
||||||
|
<button type="submit" class="btn btn-outline-primary">Update</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END Data breach check -->
|
||||||
<!-- Sender Format -->
|
<!-- Sender Format -->
|
||||||
<div class="card" id="sender-format">
|
<div class="card" id="sender-format">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="card-title">
|
<div class="card-title">Sender Address Format</div>
|
||||||
Sender Address Format
|
|
||||||
</div>
|
|
||||||
<div class="mt-1 mb-3">
|
<div class="mt-1 mb-3">
|
||||||
When your alias receives an email, say from: <b>John Wick <john@wick.com></b>,
|
When your alias receives an email, say from: <b>John Wick <john@wick.com></b>,
|
||||||
SimpleLogin forwards it to your mailbox.
|
SimpleLogin forwards it to your mailbox.
|
||||||
|
@ -685,7 +603,7 @@
|
||||||
sender address.
|
sender address.
|
||||||
<br />
|
<br />
|
||||||
If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>
|
If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>
|
||||||
and the original From header is stored in <b>X-SimpleLogin-Original-From<b>.
|
and the original From header is stored in <b>X-SimpleLogin-Original-From</b>.
|
||||||
You can choose to display this header in your email client.
|
You can choose to display this header in your email client.
|
||||||
<br />
|
<br />
|
||||||
As email headers aren't encrypted, your mailbox service can know the sender address via this header.
|
As email headers aren't encrypted, your mailbox service can know the sender address via this header.
|
||||||
|
@ -709,6 +627,7 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Alias import/export -->
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="card-title">
|
<div class="card-title">
|
||||||
|
@ -719,52 +638,12 @@
|
||||||
You can also export your aliases to a readable csv format for a future batch import.
|
You can also export your aliases to a readable csv format for a future batch import.
|
||||||
</div>
|
</div>
|
||||||
<a href="{{ url_for('dashboard.batch_import_route') }}"
|
<a href="{{ url_for('dashboard.batch_import_route') }}"
|
||||||
class="btn btn-outline-primary">
|
class="btn btn-outline-primary">Batch Import</a>
|
||||||
Batch Import
|
|
||||||
</a>
|
|
||||||
<a href="{{ url_for('dashboard.alias_export_route') }}"
|
<a href="{{ url_for('dashboard.alias_export_route') }}"
|
||||||
class="btn btn-outline-secondary">
|
class="btn btn-outline-secondary">Export Aliases</a>
|
||||||
Export Aliases
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="card-title">
|
|
||||||
SimpleLogin data export
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
As per GDPR (General Data Protection Regulation) law, you can request a copy of your data which are stored on
|
|
||||||
SimpleLogin.
|
|
||||||
A zip file that contains all information will be sent to your SimpleLogin account address.
|
|
||||||
</div>
|
|
||||||
<div class="d-flex">
|
|
||||||
<div>
|
|
||||||
<form method="post">
|
|
||||||
{{ csrf_form.csrf_token }}
|
|
||||||
<input type="hidden" name="form-name" value="send-full-user-report">
|
|
||||||
<button class="btn btn-outline-info">
|
|
||||||
Request your data
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="card-title">
|
|
||||||
Account Deletion
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
If SimpleLogin isn't the right fit for you, you can simply delete your account.
|
|
||||||
</div>
|
|
||||||
<a href="{{ url_for('dashboard.delete_account') }}"
|
|
||||||
class="btn btn-outline-danger">
|
|
||||||
Delete account
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- END Alias import/export -->
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block script %}
|
{% block script %}
|
||||||
|
|
|
@ -1,623 +1,8 @@
|
||||||
{% from "_emailhelpers.html" import render_text, text, render_button, raw_url, grey_section, section %}
|
{% if USE_PARTNER_TEMPLATE %}
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
|
|
||||||
<head>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<meta name="x-apple-disable-message-reformatting" />
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
||||||
<style type="text/css" rel="stylesheet" media="all">
|
|
||||||
/* Base ------------------------------ */
|
|
||||||
body {
|
|
||||||
width: 100% !important;
|
|
||||||
height: 100%;
|
|
||||||
margin: 0;
|
|
||||||
-webkit-text-size-adjust: none;
|
|
||||||
line-height: 1.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
{% extends "base_partner.html" %}
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
{% else %}
|
||||||
color: #3869D4;
|
{% extends "base_sl.html" %}
|
||||||
}
|
|
||||||
|
|
||||||
a img {
|
{% endif %}
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
td {
|
|
||||||
word-break: break-word;
|
|
||||||
}
|
|
||||||
|
|
||||||
.preheader {
|
|
||||||
display: none !important;
|
|
||||||
visibility: hidden;
|
|
||||||
mso-hide: all;
|
|
||||||
font-size: 1px;
|
|
||||||
line-height: 1px;
|
|
||||||
max-height: 0;
|
|
||||||
max-width: 0;
|
|
||||||
opacity: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
/* Type ------------------------------ */
|
|
||||||
|
|
||||||
body,
|
|
||||||
td,
|
|
||||||
th {
|
|
||||||
font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin-top: 0;
|
|
||||||
color: #333333;
|
|
||||||
font-size: 22px;
|
|
||||||
font-weight: bold;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
margin-top: 0;
|
|
||||||
color: #333333;
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: bold;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
margin-top: 0;
|
|
||||||
color: #333333;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: bold;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
td,
|
|
||||||
th {
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
p,
|
|
||||||
ul,
|
|
||||||
ol,
|
|
||||||
blockquote {
|
|
||||||
margin: .4em 0 1.1875em;
|
|
||||||
font-size: 16px;
|
|
||||||
line-height: 1.625;
|
|
||||||
}
|
|
||||||
|
|
||||||
p.sub {
|
|
||||||
font-size: 13px;
|
|
||||||
}
|
|
||||||
/* Utilities ------------------------------ */
|
|
||||||
|
|
||||||
.align-right {
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.align-left {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.align-center {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
/* Buttons ------------------------------ */
|
|
||||||
|
|
||||||
.button {
|
|
||||||
background-color: #3869D4;
|
|
||||||
border-top: 10px solid #3869D4;
|
|
||||||
border-right: 18px solid #3869D4;
|
|
||||||
border-bottom: 10px solid #3869D4;
|
|
||||||
border-left: 18px solid #3869D4;
|
|
||||||
display: inline-block;
|
|
||||||
color: #FFF;
|
|
||||||
text-decoration: none;
|
|
||||||
border-radius: 3px;
|
|
||||||
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
|
|
||||||
-webkit-text-size-adjust: none;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button--green {
|
|
||||||
background-color: #22BC66;
|
|
||||||
border-top: 10px solid #22BC66;
|
|
||||||
border-right: 18px solid #22BC66;
|
|
||||||
border-bottom: 10px solid #22BC66;
|
|
||||||
border-left: 18px solid #22BC66;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button--red {
|
|
||||||
background-color: #FF6136;
|
|
||||||
border-top: 10px solid #FF6136;
|
|
||||||
border-right: 18px solid #FF6136;
|
|
||||||
border-bottom: 10px solid #FF6136;
|
|
||||||
border-left: 18px solid #FF6136;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media only screen and (max-width: 500px) {
|
|
||||||
.button {
|
|
||||||
width: 100% !important;
|
|
||||||
text-align: center !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Attribute list ------------------------------ */
|
|
||||||
|
|
||||||
.attributes {
|
|
||||||
margin: 0 0 21px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.attributes_content {
|
|
||||||
background-color: #F4F4F7;
|
|
||||||
padding: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.attributes_item {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
/* Related Items ------------------------------ */
|
|
||||||
|
|
||||||
.related {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 25px 0 0 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.related_item {
|
|
||||||
padding: 10px 0;
|
|
||||||
color: #CBCCCF;
|
|
||||||
font-size: 15px;
|
|
||||||
line-height: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.related_item-title {
|
|
||||||
display: block;
|
|
||||||
margin: .5em 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.related_item-thumb {
|
|
||||||
display: block;
|
|
||||||
padding-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.related_heading {
|
|
||||||
border-top: 1px solid #CBCCCF;
|
|
||||||
text-align: center;
|
|
||||||
padding: 25px 0 10px;
|
|
||||||
}
|
|
||||||
/* Discount Code ------------------------------ */
|
|
||||||
|
|
||||||
.discount {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 24px;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
background-color: #F4F4F7;
|
|
||||||
border: 2px dashed #CBCCCF;
|
|
||||||
}
|
|
||||||
|
|
||||||
.discount_heading {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.discount_body {
|
|
||||||
text-align: center;
|
|
||||||
font-size: 15px;
|
|
||||||
}
|
|
||||||
/* Social Icons ------------------------------ */
|
|
||||||
|
|
||||||
.social {
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social td {
|
|
||||||
padding: 0;
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social_icon {
|
|
||||||
height: 20px;
|
|
||||||
margin: 0 8px 10px 8px;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
/* Data table ------------------------------ */
|
|
||||||
|
|
||||||
.purchase {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 35px 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_content {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 25px 0 0 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_item {
|
|
||||||
padding: 10px 0;
|
|
||||||
color: #51545E;
|
|
||||||
font-size: 15px;
|
|
||||||
line-height: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_heading {
|
|
||||||
padding-bottom: 8px;
|
|
||||||
border-bottom: 1px solid #EAEAEC;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_heading p {
|
|
||||||
margin: 0;
|
|
||||||
color: #85878E;
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_footer {
|
|
||||||
padding-top: 15px;
|
|
||||||
border-top: 1px solid #EAEAEC;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_total {
|
|
||||||
margin: 0;
|
|
||||||
text-align: right;
|
|
||||||
font-weight: bold;
|
|
||||||
color: #333333;
|
|
||||||
}
|
|
||||||
|
|
||||||
.purchase_total--label {
|
|
||||||
padding: 0 15px 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: #F2F4F6;
|
|
||||||
color: #51545E;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
color: #51545E;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-wrapper {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
background-color: #F2F4F6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-content {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
}
|
|
||||||
/* Masthead ----------------------- */
|
|
||||||
|
|
||||||
.email-masthead {
|
|
||||||
padding: 25px 0;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-masthead_logo {
|
|
||||||
width: 94px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-masthead_name {
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: bold;
|
|
||||||
color: #A8AAAF;
|
|
||||||
text-decoration: none;
|
|
||||||
text-shadow: 0 1px 0 white;
|
|
||||||
}
|
|
||||||
/* Body ------------------------------ */
|
|
||||||
|
|
||||||
.email-body {
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-body_inner {
|
|
||||||
width: 750px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0;
|
|
||||||
-premailer-width: 750px;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-footer {
|
|
||||||
width: 750px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0;
|
|
||||||
-premailer-width: 750px;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.email-footer p {
|
|
||||||
color: #A8AAAF;
|
|
||||||
}
|
|
||||||
|
|
||||||
.body-action {
|
|
||||||
width: 100%;
|
|
||||||
margin: 30px auto;
|
|
||||||
padding: 0;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.body-sub {
|
|
||||||
margin-top: 25px;
|
|
||||||
padding-top: 25px;
|
|
||||||
border-top: 1px solid #EAEAEC;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content-cell {
|
|
||||||
padding: 30px;
|
|
||||||
}
|
|
||||||
/*Media Queries ------------------------------ */
|
|
||||||
|
|
||||||
@media only screen and (max-width: 600px) {
|
|
||||||
.email-body_inner,
|
|
||||||
.email-footer {
|
|
||||||
width: 100% !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
|
||||||
body,
|
|
||||||
.email-body,
|
|
||||||
.email-body_inner,
|
|
||||||
.email-content,
|
|
||||||
.email-wrapper,
|
|
||||||
.email-masthead,
|
|
||||||
.email-footer {
|
|
||||||
background-color: #333333 !important;
|
|
||||||
color: #FFF !important;
|
|
||||||
}
|
|
||||||
p,
|
|
||||||
ul,
|
|
||||||
ol,
|
|
||||||
blockquote,
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3 {
|
|
||||||
color: #FFF !important;
|
|
||||||
}
|
|
||||||
.attributes_content,
|
|
||||||
.discount {
|
|
||||||
background-color: #222 !important;
|
|
||||||
}
|
|
||||||
.email-masthead_name {
|
|
||||||
text-shadow: none !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<!--[if mso]>
|
|
||||||
<style type="text/css">
|
|
||||||
.f-fallback {
|
|
||||||
font-family: Arial, sans-serif;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<![endif]-->
|
|
||||||
<style type="text/css" rel="stylesheet" media="all">
|
|
||||||
body {
|
|
||||||
width: 100% !important;
|
|
||||||
height: 100%;
|
|
||||||
margin: 0;
|
|
||||||
-webkit-text-size-adjust: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: #F2F4F6;
|
|
||||||
color: #51545E;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body style="width: 100% !important;
|
|
||||||
height: 100%;
|
|
||||||
-webkit-text-size-adjust: none;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
background-color: #F2F4F6;
|
|
||||||
color: #51545E;
|
|
||||||
margin: 0;"
|
|
||||||
bgcolor="#F2F4F6">
|
|
||||||
<span class="preheader"
|
|
||||||
style="display: none !important;
|
|
||||||
visibility: hidden;
|
|
||||||
mso-hide: all;
|
|
||||||
font-size: 1px;
|
|
||||||
line-height: 1px;
|
|
||||||
max-height: 0;
|
|
||||||
max-width: 0;
|
|
||||||
opacity: 0;
|
|
||||||
overflow: hidden;">{{ pre_header }}</span>
|
|
||||||
<table class="email-wrapper"
|
|
||||||
width="100%"
|
|
||||||
cellpadding="0"
|
|
||||||
cellspacing="0"
|
|
||||||
role="presentation"
|
|
||||||
style="width: 100%;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
background-color: #F2F4F6;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;"
|
|
||||||
bgcolor="#F2F4F6">
|
|
||||||
<tr>
|
|
||||||
<td align="center"
|
|
||||||
style="word-break: break-word;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 16px;">
|
|
||||||
<table class="email-content"
|
|
||||||
width="100%"
|
|
||||||
cellpadding="0"
|
|
||||||
cellspacing="0"
|
|
||||||
role="presentation"
|
|
||||||
style="width: 100%;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;">
|
|
||||||
<tr>
|
|
||||||
<td class="email-masthead"
|
|
||||||
style="word-break: break-word;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 16px;
|
|
||||||
text-align: center;
|
|
||||||
padding: 25px 0;"
|
|
||||||
align="center">
|
|
||||||
<a href="{{ LANDING_PAGE_URL }}"
|
|
||||||
class="f-fallback email-masthead_name"
|
|
||||||
style="color: #A8AAAF;
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: bold;
|
|
||||||
text-decoration: none;
|
|
||||||
text-shadow: 0 1px 0 white;">
|
|
||||||
{% block logo %}<img src="{{ URL }}/static/logo.png" style="width: 150px; margin: auto">{% endblock %}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<!-- Email Body -->
|
|
||||||
<tr>
|
|
||||||
<td class="email-body"
|
|
||||||
width="750"
|
|
||||||
cellpadding="0"
|
|
||||||
cellspacing="0"
|
|
||||||
style="word-break: break-word;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 16px;
|
|
||||||
width: 100%;
|
|
||||||
-premailer-width: 100%;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;">
|
|
||||||
<table class="email-body_inner"
|
|
||||||
align="center"
|
|
||||||
width="750"
|
|
||||||
cellpadding="0"
|
|
||||||
cellspacing="0"
|
|
||||||
role="presentation"
|
|
||||||
style="width: 750px;
|
|
||||||
-premailer-width: 750px;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0;"
|
|
||||||
bgcolor="#FFFFFF">
|
|
||||||
<!-- Body content -->
|
|
||||||
<tr>
|
|
||||||
<td class="content-cell"
|
|
||||||
style="word-break: break-word;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 30px;">
|
|
||||||
<div class="f-fallback">
|
|
||||||
{% block greeting %}{% endblock %}
|
|
||||||
{% block content %}{% endblock %}
|
|
||||||
<!-- Sub copy -->
|
|
||||||
{% block sub_copy %}{% endblock %}
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="word-break: break-word;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 16px;">
|
|
||||||
<table class="email-footer"
|
|
||||||
align="center"
|
|
||||||
width="750"
|
|
||||||
cellpadding="0"
|
|
||||||
cellspacing="0"
|
|
||||||
role="presentation"
|
|
||||||
style="width: 750px;
|
|
||||||
-premailer-width: 750px;
|
|
||||||
-premailer-cellpadding: 0;
|
|
||||||
-premailer-cellspacing: 0;
|
|
||||||
text-align: center;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0;">
|
|
||||||
<tr>
|
|
||||||
<td class="content-cell"
|
|
||||||
align="center"
|
|
||||||
style="word-break: break-word;
|
|
||||||
font-family: Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 30px;">
|
|
||||||
<p class="f-fallback sub align-center"
|
|
||||||
style="font-size: 13px;
|
|
||||||
line-height: 1.625;
|
|
||||||
text-align: center;
|
|
||||||
color: #A8AAAF;
|
|
||||||
margin: .4em 0 1.1875em;"
|
|
||||||
align="center">
|
|
||||||
© {{ YEAR }} SimpleLogin - a Proton product. All rights reserved.
|
|
||||||
<br />
|
|
||||||
{% block footer %}{% endblock %}
|
|
||||||
</p>
|
|
||||||
{% if unsubscribe_oneclick is defined %}
|
|
||||||
|
|
||||||
<p class="f-fallback sub align-center"
|
|
||||||
style="font-size: 13px;
|
|
||||||
line-height: 1.625;
|
|
||||||
text-align: center;
|
|
||||||
margin: .4em 0 1.1875em;">
|
|
||||||
<a href="{{ unsubscribe_oneclick }}">Unsubscribe from our newsletter</a>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<p class="f-fallback sub align-center"
|
|
||||||
style="font-size: 13px;
|
|
||||||
line-height: 1.625;
|
|
||||||
text-align: center;
|
|
||||||
color: #A8AAAF;
|
|
||||||
margin: .4em 0 1.1875em;"
|
|
||||||
align="center">
|
|
||||||
<a href="https://app.simplelogin.io/dashboard/support">Do you have a question?</a>
|
|
||||||
</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
|
@ -0,0 +1,646 @@
|
||||||
|
{% from "_emailhelpers.html" import render_text, text, render_button, raw_url, grey_section, section %}
|
||||||
|
<!doctype html>
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml"
|
||||||
|
xmlns:v="urn:schemas-microsoft-com:vml"
|
||||||
|
xmlns:o="urn:schemas-microsoft-com:office:office">
|
||||||
|
<head>
|
||||||
|
<!-- NAME: 1 COLUMN -->
|
||||||
|
<!--[if gte mso 15]>
|
||||||
|
<xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:AllowPNG/>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml>
|
||||||
|
<![endif]-->
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="x-apple-disable-message-reformatting">
|
||||||
|
<meta name="format-detection"
|
||||||
|
content="telephone=no, date=no, address=no, email=no, url=no">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<meta name="author" content="Proton">
|
||||||
|
<style type="text/css">
|
||||||
|
p {
|
||||||
|
margin: 12px 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
border-collapse: collapse;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1,
|
||||||
|
h2,
|
||||||
|
h3,
|
||||||
|
h4,
|
||||||
|
h5,
|
||||||
|
h6 {
|
||||||
|
display: block;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
img,
|
||||||
|
a img {
|
||||||
|
border: 0;
|
||||||
|
height: auto;
|
||||||
|
outline: none;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
body,
|
||||||
|
#bodyTable,
|
||||||
|
#bodyCell {
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnPreviewText {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#outlook a {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
-ms-interpolation-mode: bicubic;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ReadMsgBody {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ExternalClass {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
p,
|
||||||
|
a,
|
||||||
|
li,
|
||||||
|
td,
|
||||||
|
blockquote {
|
||||||
|
mso-line-height-rule: exactly;
|
||||||
|
}
|
||||||
|
|
||||||
|
a[href^=tel],
|
||||||
|
a[href^=sms] {
|
||||||
|
color: inherit;
|
||||||
|
cursor: default;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
p,
|
||||||
|
a,
|
||||||
|
li,
|
||||||
|
td,
|
||||||
|
body,
|
||||||
|
table,
|
||||||
|
blockquote {
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ExternalClass,
|
||||||
|
.ExternalClass p,
|
||||||
|
.ExternalClass td,
|
||||||
|
.ExternalClass div,
|
||||||
|
.ExternalClass span,
|
||||||
|
.ExternalClass font {
|
||||||
|
line-height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.no-link a,
|
||||||
|
a[x-apple-data-detectors],
|
||||||
|
a[href^="x-apple-data-detectors:"] {
|
||||||
|
color: inherit !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
font-size: inherit !important;
|
||||||
|
font-family: inherit !important;
|
||||||
|
font-weight: inherit !important;
|
||||||
|
line-height: inherit !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#bodyCell {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templateContainer {
|
||||||
|
max-width: 600px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
a.mcnButton {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImage,
|
||||||
|
.mcnRetinaImage {
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnTextContent {
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnTextContent img {
|
||||||
|
height: auto !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnDividerBlock {
|
||||||
|
table-layout: fixed !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnHalfTextRight {
|
||||||
|
border: 1px solid red;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (min-width:768px) {
|
||||||
|
.templateContainer {
|
||||||
|
width: 600px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 480px) {
|
||||||
|
|
||||||
|
body,
|
||||||
|
table,
|
||||||
|
td,
|
||||||
|
p,
|
||||||
|
a,
|
||||||
|
li,
|
||||||
|
blockquote {
|
||||||
|
-webkit-text-size-adjust: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
width: 100% !important;
|
||||||
|
min-width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnRetinaImage {
|
||||||
|
max-width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImage {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnCaptionLeftImageContent .mcnImage,
|
||||||
|
.mcnCaptionRightImageContent .mcnImage {
|
||||||
|
width: 176px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnHalfCaptionLeftImageContent .mcnImage,
|
||||||
|
.mcnHalfCaptionRightImageContent .mcnImage {
|
||||||
|
width: 268px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnBoxContentColumnBoxed {
|
||||||
|
padding: 8px !important;
|
||||||
|
margin: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnButtonContentContainer,
|
||||||
|
.mcnCartContainer,
|
||||||
|
.mcnCaptionTopContent,
|
||||||
|
.mcnRecContentContainer,
|
||||||
|
.mcnCaptionBottomContent,
|
||||||
|
.mcnTextContentContainer,
|
||||||
|
.mcnBoxedTextContentContainer,
|
||||||
|
.mcnImageGroupContentContainer,
|
||||||
|
.mcnCaptionLeftTextContentContainer,
|
||||||
|
.mcnCaptionRightTextContentContainer,
|
||||||
|
.mcnCaptionLeftImageContentContainer,
|
||||||
|
.mcnCaptionRightImageContentContainer,
|
||||||
|
.mcnImageCardLeftTextContentContainer,
|
||||||
|
.mcnImageCardRightTextContentContainer,
|
||||||
|
.mcnImageCardLeftImageContentContainer,
|
||||||
|
.mcnImageCardRightImageContentContainer {
|
||||||
|
max-width: 100% !important;
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnBoxedTextContentContainer {
|
||||||
|
min-width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImageGroupContent {
|
||||||
|
padding: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnCaptionLeftContentOuter .mcnTextContent,
|
||||||
|
.mcnCaptionRightContentOuter .mcnTextContent {
|
||||||
|
padding-top: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImageCardTopImageContent,
|
||||||
|
.mcnCaptionBottomContent:last-child .mcnCaptionBottomImageContent,
|
||||||
|
.mcnCaptionBlockInner .mcnCaptionTopContent:last-child .mcnTextContent {
|
||||||
|
padding-top: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnHalfCaptionLeftImageContent,
|
||||||
|
.mcnHalfCaptionRightImageContent {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImageCardBottomImageContent {
|
||||||
|
padding-bottom: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImageGroupBlockInner {
|
||||||
|
padding-top: 0 !important;
|
||||||
|
padding-bottom: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImageGroupBlockOuter {
|
||||||
|
padding-top: 16px !important;
|
||||||
|
padding-bottom: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnTextContent,
|
||||||
|
.mcnBoxedTextContentColumn {
|
||||||
|
padding-right: 32px !important;
|
||||||
|
padding-left: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnCaptionBottomContent .mcnTextContent {
|
||||||
|
padding-left: 16px !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnCaptionLeftTextContentContainer .mcnTextContent,
|
||||||
|
.mcnCaptionRightTextContentContainer .mcnTextContent {
|
||||||
|
padding-right: 0 !important;
|
||||||
|
padding-left: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnImageCardLeftImageContent,
|
||||||
|
.mcnImageCardRightImageContent {
|
||||||
|
padding-right: 32px !important;
|
||||||
|
padding-bottom: 0 !important;
|
||||||
|
padding-left: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnTextContent ul,
|
||||||
|
.mcnTextContent ol {
|
||||||
|
padding-inline-start: 24px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnButtonContent {
|
||||||
|
padding-left: 24px !important;
|
||||||
|
padding-right: 24px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnButtonHint {
|
||||||
|
padding-left: 16px !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcnButtonHint,
|
||||||
|
.mcnButtonHint * {
|
||||||
|
text-align: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mcpreview-image-uploader {
|
||||||
|
display: none !important;
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hide-on-mobile {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.flex-stack-on-mobile {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.flex-stack-on-mobile .mcnCaptionBottomContent,
|
||||||
|
.flex-stack-on-mobile .mcnBoxContentContainer {
|
||||||
|
height: auto !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Heading 1
|
||||||
|
@tip Make the first-level headings larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
h1 {
|
||||||
|
font-size: 22px !important;
|
||||||
|
line-height: 1.25em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Heading 2
|
||||||
|
@tip Make the second-level headings larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
h2 {
|
||||||
|
font-size: 20px !important;
|
||||||
|
line-height: 1.25em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Heading 3
|
||||||
|
@tip Make the third-level headings larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
h3 {
|
||||||
|
font-size: 18px !important;
|
||||||
|
line-height: 1.25em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Heading 4
|
||||||
|
@tip Make the fourth-level headings larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
h4 {
|
||||||
|
font-size: 16px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Boxed Text
|
||||||
|
@tip Make the boxed text larger in size for better readability on small screens. We recommend a font size of at least 16px.
|
||||||
|
*/
|
||||||
|
.mcnBoxedTextContentContainer .mcnTextContent,
|
||||||
|
.mcnBoxedTextContentContainer .mcnTextContent p {
|
||||||
|
font-size: 14px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Preheader Visibility
|
||||||
|
@tip Set the visibility of the email's preheader on small screens. You can hide it to save space.
|
||||||
|
*/
|
||||||
|
#templatePreheader {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Preheader Text
|
||||||
|
@tip Make the preheader text larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
#templatePreheader .mcnTextContent,
|
||||||
|
#templatePreheader .mcnTextContent p,
|
||||||
|
#templateBody .templatePreheader .mcnTextContent,
|
||||||
|
#templateBody .templatePreheader .mcnTextContent p {
|
||||||
|
font-size: 13px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Header Text
|
||||||
|
@tip Make the header text larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
#templateHeader .mcnTextContent,
|
||||||
|
#templateHeader .mcnTextContent p {
|
||||||
|
font-size: 16px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Body Text
|
||||||
|
@tip Make the body text larger in size for better readability on small screens. We recommend a font size of at least 16px.
|
||||||
|
*/
|
||||||
|
#templateBody .mcnTextContent,
|
||||||
|
#templateBody .mcnTextContent p {
|
||||||
|
font-size: 16px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Body Caption Text
|
||||||
|
@tip Make the body text larger in size for better readability on small screens. We recommend a font size of at least 16px.
|
||||||
|
*/
|
||||||
|
#templateBody .templateBodyCaption,
|
||||||
|
#templateBody .templateBodyCaption p {
|
||||||
|
font-size: 14px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Footer Text
|
||||||
|
@tip Make the footer content text larger in size for better readability on small screens.
|
||||||
|
*/
|
||||||
|
#templateFooter .mcnTextContent,
|
||||||
|
#templateFooter .mcnTextContent p {
|
||||||
|
font-size: 14px !important;
|
||||||
|
line-height: 1.5em !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Footer Follow icons
|
||||||
|
@tip Reduce the spacing between the footer icons to avoid a line-break them on small screens.
|
||||||
|
*/
|
||||||
|
#templateFooter .mcnFollowContentItemContainer {
|
||||||
|
padding-left: 2px !important;
|
||||||
|
padding-right: 2px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Footer Follow icons
|
||||||
|
@tip Reduce the spacing between the footer icons to avoid a line-break them on small screens.
|
||||||
|
*/
|
||||||
|
#templateFooter .mcnFollowContentItemContainerSmall {
|
||||||
|
padding-left: 8px !important;
|
||||||
|
padding-right: 8px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@text Mobile Style
|
||||||
|
*/
|
||||||
|
.mcnCaptionRightImageContent,
|
||||||
|
.mcnCaptionLeftImageContent {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 352px) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Footer Follow icons
|
||||||
|
@tip Reduce the icon size on very small screens.
|
||||||
|
*/
|
||||||
|
.mcnFollowIconContent,
|
||||||
|
.mcnFollowIconContent img.social-icon {
|
||||||
|
width: 38px !important;
|
||||||
|
height: 38px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@tab Mobile Styles
|
||||||
|
@section Footer Follow icons
|
||||||
|
@tip Remove the spacing between the footer icons to avoid a line-break them on very small screens.
|
||||||
|
*/
|
||||||
|
#templateFooter .mcnFollowContentItemContainer {
|
||||||
|
padding-left: 0 !important;
|
||||||
|
padding-right: 0 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body style="height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: 100%;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;">
|
||||||
|
<!--[if !gte mso 9]><!----><span class="mcnPreviewText"
|
||||||
|
style="display:none;
|
||||||
|
font-size:0px;
|
||||||
|
line-height:0px;
|
||||||
|
max-height:0px;
|
||||||
|
max-width:0px;
|
||||||
|
opacity:0;
|
||||||
|
overflow:hidden;
|
||||||
|
visibility:hidden;
|
||||||
|
mso-hide:all;"></span><!--<![endif]-->
|
||||||
|
<center>
|
||||||
|
<table align="center"
|
||||||
|
border="0"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
height="100%"
|
||||||
|
width="100%"
|
||||||
|
id="bodyTable"
|
||||||
|
style="border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: 100%;">
|
||||||
|
<tr>
|
||||||
|
<td align="center"
|
||||||
|
valign="top"
|
||||||
|
id="bodyCell"
|
||||||
|
style="mso-line-height-rule: exactly;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 8px;
|
||||||
|
width: 100%;">
|
||||||
|
<!-- BEGIN TEMPLATE // -->
|
||||||
|
<!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;"><tr><td align="center" valign="top" width="600" style="width:600px;">
|
||||||
|
<![endif]-->
|
||||||
|
<table border="0"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
width="100%"
|
||||||
|
class="templateContainer"
|
||||||
|
style="border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;
|
||||||
|
max-width: 600px !important;">
|
||||||
|
<tr>
|
||||||
|
<td valign="top"
|
||||||
|
id="templateHeader"
|
||||||
|
style="mso-line-height-rule: exactly;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;">
|
||||||
|
<table border="0"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
width="100%"
|
||||||
|
class="mcnImageBlock"
|
||||||
|
style="min-width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;">
|
||||||
|
<tbody class="mcnImageBlockOuter">
|
||||||
|
<tr>
|
||||||
|
<td valign="top"
|
||||||
|
style="padding: 16px;
|
||||||
|
mso-line-height-rule: exactly;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;"
|
||||||
|
class="mcnImageBlockInner">
|
||||||
|
<table align="left"
|
||||||
|
width="100%"
|
||||||
|
border="0"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
class="mcnImageContentContainer"
|
||||||
|
style="min-width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="mcnImageContent"
|
||||||
|
valign="top"
|
||||||
|
style="padding: 16px;
|
||||||
|
text-align: center;
|
||||||
|
mso-line-height-rule: exactly;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
-webkit-text-size-adjust: 100%;">
|
||||||
|
<a href="https://proton.me/" target="_blank" style="">
|
||||||
|
<img align="center"
|
||||||
|
alt="Proton"
|
||||||
|
src="{{ URL }}/static/logo-proton.png"
|
||||||
|
width="190"
|
||||||
|
style="width:35.4477%; max-width: 380px; padding-bottom: 0; display: inline !important; vertical-align: bottom; border: 0; height: auto; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; ">
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td valign="top"
|
||||||
|
id="templateBody"
|
||||||
|
style="mso-line-height-rule: exactly; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; ">
|
||||||
|
{% block greeting %}{% endblock %}
|
||||||
|
{% block content %}{% endblock %}
|
||||||
|
<!-- Sub copy -->
|
||||||
|
{% block sub_copy %}{% endblock %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<![endif]-->
|
||||||
|
<!-- // END TEMPLATE -->
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</center>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -0,0 +1,623 @@
|
||||||
|
{% from "_emailhelpers.html" import render_text, text, render_button, raw_url, grey_section, section %}
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
|
||||||
|
<head>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<meta name="x-apple-disable-message-reformatting" />
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
|
<style type="text/css" rel="stylesheet" media="all">
|
||||||
|
/* Base ------------------------------ */
|
||||||
|
body {
|
||||||
|
width: 100% !important;
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
-webkit-text-size-adjust: none;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #3869D4;
|
||||||
|
}
|
||||||
|
|
||||||
|
a img {
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preheader {
|
||||||
|
display: none !important;
|
||||||
|
visibility: hidden;
|
||||||
|
mso-hide: all;
|
||||||
|
font-size: 1px;
|
||||||
|
line-height: 1px;
|
||||||
|
max-height: 0;
|
||||||
|
max-width: 0;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
/* Type ------------------------------ */
|
||||||
|
|
||||||
|
body,
|
||||||
|
td,
|
||||||
|
th {
|
||||||
|
font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin-top: 0;
|
||||||
|
color: #333333;
|
||||||
|
font-size: 22px;
|
||||||
|
font-weight: bold;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
margin-top: 0;
|
||||||
|
color: #333333;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: bold;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
margin-top: 0;
|
||||||
|
color: #333333;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: bold;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
td,
|
||||||
|
th {
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
p,
|
||||||
|
ul,
|
||||||
|
ol,
|
||||||
|
blockquote {
|
||||||
|
margin: .4em 0 1.1875em;
|
||||||
|
font-size: 16px;
|
||||||
|
line-height: 1.625;
|
||||||
|
}
|
||||||
|
|
||||||
|
p.sub {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
/* Utilities ------------------------------ */
|
||||||
|
|
||||||
|
.align-right {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-left {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-center {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
/* Buttons ------------------------------ */
|
||||||
|
|
||||||
|
.button {
|
||||||
|
background-color: #3869D4;
|
||||||
|
border-top: 10px solid #3869D4;
|
||||||
|
border-right: 18px solid #3869D4;
|
||||||
|
border-bottom: 10px solid #3869D4;
|
||||||
|
border-left: 18px solid #3869D4;
|
||||||
|
display: inline-block;
|
||||||
|
color: #FFF;
|
||||||
|
text-decoration: none;
|
||||||
|
border-radius: 3px;
|
||||||
|
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
|
||||||
|
-webkit-text-size-adjust: none;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button--green {
|
||||||
|
background-color: #22BC66;
|
||||||
|
border-top: 10px solid #22BC66;
|
||||||
|
border-right: 18px solid #22BC66;
|
||||||
|
border-bottom: 10px solid #22BC66;
|
||||||
|
border-left: 18px solid #22BC66;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button--red {
|
||||||
|
background-color: #FF6136;
|
||||||
|
border-top: 10px solid #FF6136;
|
||||||
|
border-right: 18px solid #FF6136;
|
||||||
|
border-bottom: 10px solid #FF6136;
|
||||||
|
border-left: 18px solid #FF6136;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 500px) {
|
||||||
|
.button {
|
||||||
|
width: 100% !important;
|
||||||
|
text-align: center !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Attribute list ------------------------------ */
|
||||||
|
|
||||||
|
.attributes {
|
||||||
|
margin: 0 0 21px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.attributes_content {
|
||||||
|
background-color: #F4F4F7;
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.attributes_item {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
/* Related Items ------------------------------ */
|
||||||
|
|
||||||
|
.related {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 25px 0 0 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.related_item {
|
||||||
|
padding: 10px 0;
|
||||||
|
color: #CBCCCF;
|
||||||
|
font-size: 15px;
|
||||||
|
line-height: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.related_item-title {
|
||||||
|
display: block;
|
||||||
|
margin: .5em 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.related_item-thumb {
|
||||||
|
display: block;
|
||||||
|
padding-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.related_heading {
|
||||||
|
border-top: 1px solid #CBCCCF;
|
||||||
|
text-align: center;
|
||||||
|
padding: 25px 0 10px;
|
||||||
|
}
|
||||||
|
/* Discount Code ------------------------------ */
|
||||||
|
|
||||||
|
.discount {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 24px;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
background-color: #F4F4F7;
|
||||||
|
border: 2px dashed #CBCCCF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.discount_heading {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.discount_body {
|
||||||
|
text-align: center;
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
/* Social Icons ------------------------------ */
|
||||||
|
|
||||||
|
.social {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social td {
|
||||||
|
padding: 0;
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social_icon {
|
||||||
|
height: 20px;
|
||||||
|
margin: 0 8px 10px 8px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
/* Data table ------------------------------ */
|
||||||
|
|
||||||
|
.purchase {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 35px 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_content {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 25px 0 0 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_item {
|
||||||
|
padding: 10px 0;
|
||||||
|
color: #51545E;
|
||||||
|
font-size: 15px;
|
||||||
|
line-height: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_heading {
|
||||||
|
padding-bottom: 8px;
|
||||||
|
border-bottom: 1px solid #EAEAEC;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_heading p {
|
||||||
|
margin: 0;
|
||||||
|
color: #85878E;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_footer {
|
||||||
|
padding-top: 15px;
|
||||||
|
border-top: 1px solid #EAEAEC;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_total {
|
||||||
|
margin: 0;
|
||||||
|
text-align: right;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #333333;
|
||||||
|
}
|
||||||
|
|
||||||
|
.purchase_total--label {
|
||||||
|
padding: 0 15px 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
background-color: #F2F4F6;
|
||||||
|
color: #51545E;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
color: #51545E;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-wrapper {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
background-color: #F2F4F6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-content {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
}
|
||||||
|
/* Masthead ----------------------- */
|
||||||
|
|
||||||
|
.email-masthead {
|
||||||
|
padding: 25px 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-masthead_logo {
|
||||||
|
width: 94px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-masthead_name {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #A8AAAF;
|
||||||
|
text-decoration: none;
|
||||||
|
text-shadow: 0 1px 0 white;
|
||||||
|
}
|
||||||
|
/* Body ------------------------------ */
|
||||||
|
|
||||||
|
.email-body {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-body_inner {
|
||||||
|
width: 750px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;
|
||||||
|
-premailer-width: 750px;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-footer {
|
||||||
|
width: 750px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;
|
||||||
|
-premailer-width: 750px;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.email-footer p {
|
||||||
|
color: #A8AAAF;
|
||||||
|
}
|
||||||
|
|
||||||
|
.body-action {
|
||||||
|
width: 100%;
|
||||||
|
margin: 30px auto;
|
||||||
|
padding: 0;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.body-sub {
|
||||||
|
margin-top: 25px;
|
||||||
|
padding-top: 25px;
|
||||||
|
border-top: 1px solid #EAEAEC;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content-cell {
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
/*Media Queries ------------------------------ */
|
||||||
|
|
||||||
|
@media only screen and (max-width: 600px) {
|
||||||
|
.email-body_inner,
|
||||||
|
.email-footer {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
body,
|
||||||
|
.email-body,
|
||||||
|
.email-body_inner,
|
||||||
|
.email-content,
|
||||||
|
.email-wrapper,
|
||||||
|
.email-masthead,
|
||||||
|
.email-footer {
|
||||||
|
background-color: #333333 !important;
|
||||||
|
color: #FFF !important;
|
||||||
|
}
|
||||||
|
p,
|
||||||
|
ul,
|
||||||
|
ol,
|
||||||
|
blockquote,
|
||||||
|
h1,
|
||||||
|
h2,
|
||||||
|
h3 {
|
||||||
|
color: #FFF !important;
|
||||||
|
}
|
||||||
|
.attributes_content,
|
||||||
|
.discount {
|
||||||
|
background-color: #222 !important;
|
||||||
|
}
|
||||||
|
.email-masthead_name {
|
||||||
|
text-shadow: none !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--[if mso]>
|
||||||
|
<style type="text/css">
|
||||||
|
.f-fallback {
|
||||||
|
font-family: Arial, sans-serif;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<![endif]-->
|
||||||
|
<style type="text/css" rel="stylesheet" media="all">
|
||||||
|
body {
|
||||||
|
width: 100% !important;
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
-webkit-text-size-adjust: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
background-color: #F2F4F6;
|
||||||
|
color: #51545E;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body style="width: 100% !important;
|
||||||
|
height: 100%;
|
||||||
|
-webkit-text-size-adjust: none;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
background-color: #F2F4F6;
|
||||||
|
color: #51545E;
|
||||||
|
margin: 0;"
|
||||||
|
bgcolor="#F2F4F6">
|
||||||
|
<span class="preheader"
|
||||||
|
style="display: none !important;
|
||||||
|
visibility: hidden;
|
||||||
|
mso-hide: all;
|
||||||
|
font-size: 1px;
|
||||||
|
line-height: 1px;
|
||||||
|
max-height: 0;
|
||||||
|
max-width: 0;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;">{{ pre_header }}</span>
|
||||||
|
<table class="email-wrapper"
|
||||||
|
width="100%"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 100%;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
background-color: #F2F4F6;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;"
|
||||||
|
bgcolor="#F2F4F6">
|
||||||
|
<tr>
|
||||||
|
<td align="center"
|
||||||
|
style="word-break: break-word;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 16px;">
|
||||||
|
<table class="email-content"
|
||||||
|
width="100%"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 100%;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;">
|
||||||
|
<tr>
|
||||||
|
<td class="email-masthead"
|
||||||
|
style="word-break: break-word;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 16px;
|
||||||
|
text-align: center;
|
||||||
|
padding: 25px 0;"
|
||||||
|
align="center">
|
||||||
|
<a href="{{ LANDING_PAGE_URL }}"
|
||||||
|
class="f-fallback email-masthead_name"
|
||||||
|
style="color: #A8AAAF;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: bold;
|
||||||
|
text-decoration: none;
|
||||||
|
text-shadow: 0 1px 0 white;">
|
||||||
|
{% block logo %}<img src="{{ URL }}/static/logo.png" style="width: 150px; margin: auto">{% endblock %}
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<!-- Email Body -->
|
||||||
|
<tr>
|
||||||
|
<td class="email-body"
|
||||||
|
width="750"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
style="word-break: break-word;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 16px;
|
||||||
|
width: 100%;
|
||||||
|
-premailer-width: 100%;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;">
|
||||||
|
<table class="email-body_inner"
|
||||||
|
align="center"
|
||||||
|
width="750"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 750px;
|
||||||
|
-premailer-width: 750px;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;"
|
||||||
|
bgcolor="#FFFFFF">
|
||||||
|
<!-- Body content -->
|
||||||
|
<tr>
|
||||||
|
<td class="content-cell"
|
||||||
|
style="word-break: break-word;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 16px;
|
||||||
|
padding: 30px;">
|
||||||
|
<div class="f-fallback">
|
||||||
|
{% block greeting %}{% endblock %}
|
||||||
|
{% block content %}{% endblock %}
|
||||||
|
<!-- Sub copy -->
|
||||||
|
{% block sub_copy %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="word-break: break-word;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 16px;">
|
||||||
|
<table class="email-footer"
|
||||||
|
align="center"
|
||||||
|
width="750"
|
||||||
|
cellpadding="0"
|
||||||
|
cellspacing="0"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 750px;
|
||||||
|
-premailer-width: 750px;
|
||||||
|
-premailer-cellpadding: 0;
|
||||||
|
-premailer-cellspacing: 0;
|
||||||
|
text-align: center;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 0;">
|
||||||
|
<tr>
|
||||||
|
<td class="content-cell"
|
||||||
|
align="center"
|
||||||
|
style="word-break: break-word;
|
||||||
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 16px;
|
||||||
|
padding: 30px;">
|
||||||
|
<p class="f-fallback sub align-center"
|
||||||
|
style="font-size: 13px;
|
||||||
|
line-height: 1.625;
|
||||||
|
text-align: center;
|
||||||
|
color: #A8AAAF;
|
||||||
|
margin: .4em 0 1.1875em;"
|
||||||
|
align="center">
|
||||||
|
© {{ YEAR }} SimpleLogin - a Proton product. All rights reserved.
|
||||||
|
<br />
|
||||||
|
{% block footer %}{% endblock %}
|
||||||
|
</p>
|
||||||
|
{% if unsubscribe_oneclick is defined %}
|
||||||
|
|
||||||
|
<p class="f-fallback sub align-center"
|
||||||
|
style="font-size: 13px;
|
||||||
|
line-height: 1.625;
|
||||||
|
text-align: center;
|
||||||
|
margin: .4em 0 1.1875em;">
|
||||||
|
<a href="{{ unsubscribe_oneclick }}">Unsubscribe from our newsletter</a>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
<p class="f-fallback sub align-center"
|
||||||
|
style="font-size: 13px;
|
||||||
|
line-height: 1.625;
|
||||||
|
text-align: center;
|
||||||
|
color: #A8AAAF;
|
||||||
|
margin: .4em 0 1.1875em;"
|
||||||
|
align="center">
|
||||||
|
<a href="https://app.simplelogin.io/dashboard/support">Do you have a question?</a>
|
||||||
|
</p>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -28,7 +28,7 @@
|
||||||
{{ render_text("Hi") }}
|
{{ render_text("Hi") }}
|
||||||
{{ render_text("If you use Safari on a MacBook or iMac, you should check out our new Safari extension.") }}
|
{{ render_text("If you use Safari on a MacBook or iMac, you should check out our new Safari extension.") }}
|
||||||
{{ render_text('It can be installed on
|
{{ render_text('It can be installed on
|
||||||
<a href="https://apps.apple.com/app/id1494051017">App Store</a>
|
<a href="https://apps.apple.com/app/id6475835429">App Store</a>
|
||||||
. Its code is available on
|
. Its code is available on
|
||||||
<a href="https://github.com/simple-login/mac-app">GitHub</a>
|
<a href="https://github.com/simple-login/mac-app">GitHub</a>
|
||||||
.') }}
|
.') }}
|
||||||
|
|
|
@ -8,7 +8,7 @@ If you use Safari on a MacBook or iMac, you should check out our new Safari exte
|
||||||
|
|
||||||
It can be installed on:
|
It can be installed on:
|
||||||
|
|
||||||
https://apps.apple.com/app/id1494051017
|
https://apps.apple.com/app/id6475835429
|
||||||
|
|
||||||
As usual, let me know if you have any question by replying to this email.
|
As usual, let me know if you have any question by replying to this email.
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ If you want to quickly create aliases <b>without</b> going to SimpleLogin websit
|
||||||
(or other Chromium-based browsers like Brave or Vivaldi),
|
(or other Chromium-based browsers like Brave or Vivaldi),
|
||||||
<a href="https://addons.mozilla.org/firefox/addon/simplelogin/">Firefox</a>
|
<a href="https://addons.mozilla.org/firefox/addon/simplelogin/">Firefox</a>
|
||||||
and
|
and
|
||||||
<a href="https://apps.apple.com/app/id1494051017 ">Safari</a>
|
<a href="https://apps.apple.com/app/id6475835429 ">Safari</a>
|
||||||
extension.
|
extension.
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ Chrome: https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmg
|
||||||
|
|
||||||
Firefox: https://addons.mozilla.org/firefox/addon/simplelogin/
|
Firefox: https://addons.mozilla.org/firefox/addon/simplelogin/
|
||||||
|
|
||||||
Safari: https://apps.apple.com/app/id1494051017
|
Safari: https://apps.apple.com/app/id6475835429
|
||||||
|
|
||||||
You can also manage your aliases using SimpleLogin mobile apps, available at
|
You can also manage your aliases using SimpleLogin mobile apps, available at
|
||||||
- Play Store https://play.google.com/store/apps/details?id=io.simplelogin.android
|
- Play Store https://play.google.com/store/apps/details?id=io.simplelogin.android
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
{{ render_text("Your subscription will end on " + next_bill_date + ".") }}
|
{{ render_text("Your subscription will end on " + next_bill_date + ".") }}
|
||||||
{{ render_text("When the subscription ends:") }}
|
{{ render_text("When the subscription ends:") }}
|
||||||
{{ render_text("- All aliases/domains/directories you have created are <b>kept</b> and continue working normally.") }}
|
{{ render_text("- All aliases/domains/directories you have created are <b>kept</b> and continue working normally.") }}
|
||||||
|
{{ render_text("- You cannot create new reverse aliases.") }}
|
||||||
{% call text() %}
|
{% call text() %}
|
||||||
- You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases.
|
- You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases.
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
|
|
|
@ -9,6 +9,7 @@ When the subscription ends:
|
||||||
|
|
||||||
- All aliases/domains/directories you have created are kept and continue working.
|
- All aliases/domains/directories you have created are kept and continue working.
|
||||||
- You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{MAX_NB_EMAIL_FREE_PLAN}} aliases.
|
- You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{MAX_NB_EMAIL_FREE_PLAN}} aliases.
|
||||||
|
- You cannot create new reverse aliases.
|
||||||
- As features like "catch-all" or "directory" allow you to create aliases on-the-fly,
|
- As features like "catch-all" or "directory" allow you to create aliases on-the-fly,
|
||||||
those aliases cannot be automatically created if you have more than {{MAX_NB_EMAIL_FREE_PLAN}} aliases.
|
those aliases cannot be automatically created if you have more than {{MAX_NB_EMAIL_FREE_PLAN}} aliases.
|
||||||
- You cannot add new domain or directory.
|
- You cannot add new domain or directory.
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
|
|
||||||
{{ render_text("- You cannot add new domain or directory.") }}
|
{{ render_text("- You cannot add new domain or directory.") }}
|
||||||
{{ render_text("- You cannot add new mailbox.") }}
|
{{ render_text("- You cannot add new mailbox.") }}
|
||||||
|
{{ render_text("- You cannot create new reverse aliases.") }}
|
||||||
{{ render_text("- If you enable PGP Encryption, forwarded emails are not encrypted anymore.") }}
|
{{ render_text("- If you enable PGP Encryption, forwarded emails are not encrypted anymore.") }}
|
||||||
{{ render_text('You can upgrade today to continue using all these Premium features (and much more coming).') }}
|
{{ render_text('You can upgrade today to continue using all these Premium features (and much more coming).') }}
|
||||||
{{ render_button("Upgrade your account", URL ~ "/dashboard/pricing") }}
|
{{ render_button("Upgrade your account", URL ~ "/dashboard/pricing") }}
|
||||||
|
|
|
@ -8,6 +8,7 @@ When the trial ends:
|
||||||
- All aliases/domains/directories you have created are kept and continue working.
|
- All aliases/domains/directories you have created are kept and continue working.
|
||||||
- You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{MAX_NB_EMAIL_FREE_PLAN}} aliases.
|
- You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{MAX_NB_EMAIL_FREE_PLAN}} aliases.
|
||||||
- You cannot add new domain or directory.
|
- You cannot add new domain or directory.
|
||||||
|
- You cannot create new reverse aliases.
|
||||||
- You cannot add new mailbox.
|
- You cannot add new mailbox.
|
||||||
- If you enable PGP Encryption, forwarded emails are not encrypted anymore.
|
- If you enable PGP Encryption, forwarded emails are not encrypted anymore.
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
<li>
|
<li>
|
||||||
<a class="list-group-item text-white footer-item "
|
<a class="list-group-item text-white footer-item "
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
href="https://apps.apple.com/app/id1494051017">
|
href="https://apps.apple.com/app/id6475835429">
|
||||||
Safari
|
Safari
|
||||||
Extension
|
Extension
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -148,6 +148,10 @@
|
||||||
<a class="dropdown-item mb-3" href="{{ url_for('dashboard.api_key') }}">
|
<a class="dropdown-item mb-3" href="{{ url_for('dashboard.api_key') }}">
|
||||||
<i class="dropdown-icon fa fa-key"></i> API Keys
|
<i class="dropdown-icon fa fa-key"></i> API Keys
|
||||||
</a>
|
</a>
|
||||||
|
<a class="dropdown-item mb-3"
|
||||||
|
href="{{ url_for('dashboard.account_setting') }}">
|
||||||
|
<i class="dropdown-icon fa fa-user"></i> Account settings
|
||||||
|
</a>
|
||||||
<a class="dropdown-item" href="{{ url_for('auth.logout') }}">
|
<a class="dropdown-item" href="{{ url_for('auth.logout') }}">
|
||||||
<i class="dropdown-icon fe fe-log-out"></i> Sign out
|
<i class="dropdown-icon fe fe-log-out"></i> Sign out
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -48,15 +48,16 @@
|
||||||
{# SIWSL#}
|
{# SIWSL#}
|
||||||
{# </a>#}
|
{# </a>#}
|
||||||
{# </li>#}
|
{# </li>#}
|
||||||
{# {% if current_user.should_show_app_page() %}#}
|
{% if current_user.should_show_app_page() %}
|
||||||
{# <li class="nav-item">#}
|
|
||||||
{# <a href="{{ url_for('dashboard.app_route') }}"#}
|
<li class="nav-item">
|
||||||
{# class="nav-link {{ 'active' if active_page == 'app' }}">#}
|
<a href="{{ url_for('dashboard.app_route') }}"
|
||||||
{# <i class="fe fe-grid"></i>#}
|
class="nav-link {{ 'active' if active_page == 'app' }}">
|
||||||
{# Apps#}
|
<i class="fe fe-grid"></i>
|
||||||
{# </a>#}
|
Apps
|
||||||
{# </li>#}
|
</a>
|
||||||
{# {% endif %}#}
|
</li>
|
||||||
|
{% endif %}
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a href="{{ url_for('dashboard.setting') }}"
|
<a href="{{ url_for('dashboard.setting') }}"
|
||||||
class="nav-link {{ 'active' if active_page == 'setting' }}">
|
class="nav-link {{ 'active' if active_page == 'setting' }}">
|
||||||
|
|
|
@ -40,14 +40,16 @@ def test_get_notifications(flask_client):
|
||||||
def test_mark_notification_as_read(flask_client):
|
def test_mark_notification_as_read(flask_client):
|
||||||
user, api_key = get_new_user_and_api_key()
|
user, api_key = get_new_user_and_api_key()
|
||||||
|
|
||||||
Notification.create(id=1, user_id=user.id, message="Test message 1")
|
notif_id = Notification.create(
|
||||||
|
user_id=user.id, message="Test message 1", flush=True
|
||||||
|
).id
|
||||||
Session.commit()
|
Session.commit()
|
||||||
|
|
||||||
r = flask_client.post(
|
r = flask_client.post(
|
||||||
url_for("api.mark_as_read", notification_id=1),
|
url_for("api.mark_as_read", notification_id=notif_id),
|
||||||
headers={"Authentication": api_key.code},
|
headers={"Authentication": api_key.code},
|
||||||
)
|
)
|
||||||
|
|
||||||
assert r.status_code == 200
|
assert r.status_code == 200
|
||||||
notification = Notification.first()
|
notification = Notification.filter_by(id=notif_id).first()
|
||||||
assert notification.read
|
assert notification.read
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from app.api.serializer import get_alias_infos_with_pagination_v3
|
from app.api.serializer import get_alias_infos_with_pagination_v3
|
||||||
from app.config import PAGE_LIMIT
|
from app.config import PAGE_LIMIT
|
||||||
from app.db import Session
|
from app.db import Session
|
||||||
from app.models import Alias, Mailbox, Contact
|
from app.models import Alias, Mailbox, Contact, EmailLog
|
||||||
from tests.utils import create_new_user
|
from tests.utils import create_new_user, random_email
|
||||||
|
|
||||||
|
|
||||||
def test_get_alias_infos_with_pagination_v3(flask_client):
|
def test_get_alias_infos_with_pagination_v3(flask_client):
|
||||||
|
@ -155,3 +155,46 @@ def test_get_alias_infos_pinned_alias(flask_client):
|
||||||
# pinned alias isn't included in the search
|
# pinned alias isn't included in the search
|
||||||
alias_infos = get_alias_infos_with_pagination_v3(user, query="no match")
|
alias_infos = get_alias_infos_with_pagination_v3(user, query="no match")
|
||||||
assert len(alias_infos) == 0
|
assert len(alias_infos) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_alias_infos_with_no_last_email_log(flask_client):
|
||||||
|
user = create_new_user()
|
||||||
|
alias_infos = get_alias_infos_with_pagination_v3(user)
|
||||||
|
assert len(alias_infos) == 1
|
||||||
|
row = alias_infos[0]
|
||||||
|
assert row.alias.id == user.newsletter_alias_id
|
||||||
|
assert row.latest_contact is None
|
||||||
|
assert row.latest_email_log is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_alias_infos_with_email_log_no_contact():
|
||||||
|
user = create_new_user()
|
||||||
|
contact = Contact.create(
|
||||||
|
user_id=user.id,
|
||||||
|
alias_id=user.newsletter_alias_id,
|
||||||
|
website_email="a@a.com",
|
||||||
|
reply_email=random_email(),
|
||||||
|
flush=True,
|
||||||
|
)
|
||||||
|
Contact.create(
|
||||||
|
user_id=user.id,
|
||||||
|
alias_id=user.newsletter_alias_id,
|
||||||
|
website_email="unused@a.com",
|
||||||
|
reply_email=random_email(),
|
||||||
|
flush=True,
|
||||||
|
)
|
||||||
|
EmailLog.create(
|
||||||
|
user_id=user.id,
|
||||||
|
alias_id=user.newsletter_alias_id,
|
||||||
|
contact_id=contact.id,
|
||||||
|
commit=True,
|
||||||
|
)
|
||||||
|
alias_infos = get_alias_infos_with_pagination_v3(user)
|
||||||
|
assert len(alias_infos) == 1
|
||||||
|
row = alias_infos[0]
|
||||||
|
assert row.alias.id == user.newsletter_alias_id
|
||||||
|
assert row.latest_contact is not None
|
||||||
|
assert row.latest_contact.id == contact.id
|
||||||
|
assert row.latest_email_log is not None
|
||||||
|
alias = Alias.get(id=user.newsletter_alias_id)
|
||||||
|
assert row.latest_email_log.id == alias.last_email_log_id
|
||||||
|
|
|
@ -6,16 +6,27 @@ from tests.utils import create_new_user
|
||||||
|
|
||||||
|
|
||||||
def test_unactivated_user_login(flask_client):
|
def test_unactivated_user_login(flask_client):
|
||||||
user = create_new_user()
|
"""
|
||||||
user.activated = False
|
Test function for logging in with an unactivated user.
|
||||||
Session.commit()
|
|
||||||
|
|
||||||
|
Steps:
|
||||||
|
1. Creates a new user.
|
||||||
|
2. Sets the user's activated status to False.
|
||||||
|
3. Sends a POST request to the login route with user credentials.
|
||||||
|
4. Checks the response status code and content for expected messages.
|
||||||
|
"""
|
||||||
|
user = create_new_user() # Creating a new user
|
||||||
|
user.activated = False # Setting the user's activated status to False
|
||||||
|
Session.commit() # Committing the session changes
|
||||||
|
|
||||||
|
# Sending a POST request to the login route with user credentials and following redirects
|
||||||
r = flask_client.post(
|
r = flask_client.post(
|
||||||
url_for("auth.login"),
|
url_for("auth.login"),
|
||||||
data={"email": user.email, "password": "password"},
|
data={"email": user.email, "password": "password"},
|
||||||
follow_redirects=True,
|
follow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Asserting the response status code and content for expected messages
|
||||||
assert r.status_code == 200
|
assert r.status_code == 200
|
||||||
assert (
|
assert (
|
||||||
b"Please check your inbox for the activation email. You can also have this email re-sent"
|
b"Please check your inbox for the activation email. You can also have this email re-sent"
|
||||||
|
@ -24,59 +35,98 @@ def test_unactivated_user_login(flask_client):
|
||||||
|
|
||||||
|
|
||||||
def test_non_canonical_login(flask_client):
|
def test_non_canonical_login(flask_client):
|
||||||
email = f"pre.{random_string(10)}@gmail.com"
|
"""
|
||||||
name = f"NAME-{random_string(10)}"
|
Test function for logging in with a non-canonical email.
|
||||||
user = create_new_user(email, name)
|
|
||||||
Session.commit()
|
|
||||||
|
|
||||||
|
Steps:
|
||||||
|
1. Creates a new user with a non-canonical email.
|
||||||
|
2. Sends a POST request to the login route with user credentials.
|
||||||
|
3. Checks the response status code and content for expected messages.
|
||||||
|
4. Checks the canonicalization of the email.
|
||||||
|
5. Logs out the user.
|
||||||
|
6. Sends a POST request to the login route with the canonicalized email.
|
||||||
|
7. Checks the response status code and content for expected messages.
|
||||||
|
"""
|
||||||
|
email = f"pre.{random_string(10)}@gmail.com" # Generating a non-canonical email
|
||||||
|
name = f"NAME-{random_string(10)}" # Generating a random name
|
||||||
|
user = create_new_user(
|
||||||
|
email, name
|
||||||
|
) # Creating a new user with the generated email and name
|
||||||
|
Session.commit() # Committing the session changes
|
||||||
|
|
||||||
|
# Sending a POST request to the login route with user credentials and following redirects
|
||||||
r = flask_client.post(
|
r = flask_client.post(
|
||||||
url_for("auth.login"),
|
url_for("auth.login"),
|
||||||
data={"email": user.email, "password": "password"},
|
data={"email": user.email, "password": "password"},
|
||||||
follow_redirects=True,
|
follow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Asserting the response status code and content for expected messages
|
||||||
assert r.status_code == 200
|
assert r.status_code == 200
|
||||||
assert name.encode("utf-8") in r.data
|
assert name.encode("utf-8") in r.data
|
||||||
|
|
||||||
|
# Canonicalizing the email
|
||||||
canonical_email = canonicalize_email(email)
|
canonical_email = canonicalize_email(email)
|
||||||
assert canonical_email != email
|
assert (
|
||||||
|
canonical_email != email
|
||||||
|
) # Checking if the canonical email is different from the original email
|
||||||
|
|
||||||
flask_client.get(url_for("auth.logout"))
|
flask_client.get(url_for("auth.logout")) # Logging out the user
|
||||||
|
|
||||||
|
# Sending a POST request to the login route with the canonicalized email and following redirects
|
||||||
r = flask_client.post(
|
r = flask_client.post(
|
||||||
url_for("auth.login"),
|
url_for("auth.login"),
|
||||||
data={"email": canonical_email, "password": "password"},
|
data={"email": canonical_email, "password": "password"},
|
||||||
follow_redirects=True,
|
follow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Asserting the response status code and content for expected messages
|
||||||
assert r.status_code == 200
|
assert r.status_code == 200
|
||||||
assert name.encode("utf-8") not in r.data
|
assert name.encode("utf-8") not in r.data
|
||||||
|
|
||||||
|
|
||||||
def test_canonical_login_with_non_canonical_email(flask_client):
|
def test_canonical_login_with_non_canonical_email(flask_client):
|
||||||
suffix = f"{random_string(10)}@gmail.com"
|
"""
|
||||||
canonical_email = f"pre{suffix}"
|
Test function for logging in with a canonical email and a non-canonical email.
|
||||||
non_canonical_email = f"pre.{suffix}"
|
|
||||||
name = f"NAME-{random_string(10)}"
|
|
||||||
create_new_user(canonical_email, name)
|
|
||||||
Session.commit()
|
|
||||||
|
|
||||||
|
Steps:
|
||||||
|
1. Generates canonical and non-canonical email addresses.
|
||||||
|
2. Creates a new user with the canonical email.
|
||||||
|
3. Sends a POST request to the login route with the non-canonical email.
|
||||||
|
4. Checks the response status code and content for expected messages.
|
||||||
|
5. Logs out the user.
|
||||||
|
6. Sends a POST request to the login route with the canonical email.
|
||||||
|
7. Checks the response status code and content for expected messages.
|
||||||
|
"""
|
||||||
|
suffix = f"{random_string(10)}@gmail.com" # Generating a random suffix for emails
|
||||||
|
canonical_email = f"pre{suffix}" # Generating a canonical email
|
||||||
|
non_canonical_email = f"pre.{suffix}" # Generating a non-canonical email
|
||||||
|
name = f"NAME-{random_string(10)}" # Generating a random name
|
||||||
|
create_new_user(
|
||||||
|
canonical_email, name
|
||||||
|
) # Creating a new user with the canonical email
|
||||||
|
Session.commit() # Committing the session changes
|
||||||
|
|
||||||
|
# Sending a POST request to the login route with the non-canonical email and following redirects
|
||||||
r = flask_client.post(
|
r = flask_client.post(
|
||||||
url_for("auth.login"),
|
url_for("auth.login"),
|
||||||
data={"email": non_canonical_email, "password": "password"},
|
data={"email": non_canonical_email, "password": "password"},
|
||||||
follow_redirects=True,
|
follow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Asserting the response status code and content for expected messages
|
||||||
assert r.status_code == 200
|
assert r.status_code == 200
|
||||||
assert name.encode("utf-8") in r.data
|
assert name.encode("utf-8") in r.data
|
||||||
|
|
||||||
flask_client.get(url_for("auth.logout"))
|
flask_client.get(url_for("auth.logout")) # Logging out the user
|
||||||
|
|
||||||
|
# Sending a POST request to the login route with the canonical email and following redirects
|
||||||
r = flask_client.post(
|
r = flask_client.post(
|
||||||
url_for("auth.login"),
|
url_for("auth.login"),
|
||||||
data={"email": canonical_email, "password": "password"},
|
data={"email": canonical_email, "password": "password"},
|
||||||
follow_redirects=True,
|
follow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Asserting the response status code and content for expected messages
|
||||||
assert r.status_code == 200
|
assert r.status_code == 200
|
||||||
assert name.encode("utf-8") in r.data
|
assert name.encode("utf-8") in r.data
|
||||||
|
|
|
@ -0,0 +1,452 @@
|
||||||
|
from app import config
|
||||||
|
from flask import url_for, session
|
||||||
|
from urllib.parse import parse_qs
|
||||||
|
from urllib3.util import parse_url
|
||||||
|
from app.auth.views.oidc import create_user
|
||||||
|
from app.utils import random_string
|
||||||
|
from unittest.mock import patch
|
||||||
|
from app.models import User
|
||||||
|
|
||||||
|
from app.config import URL, OIDC_CLIENT_ID
|
||||||
|
|
||||||
|
|
||||||
|
mock_well_known_response = {
|
||||||
|
"authorization_endpoint": "http://localhost:7777/authorization-endpoint",
|
||||||
|
"userinfo_endpoint": "http://localhost:7777/userinfo-endpoint",
|
||||||
|
"token_endpoint": "http://localhost:7777/token-endpoint",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_login(mock_get, flask_client):
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_login"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
query = parse_qs(parsed.query)
|
||||||
|
|
||||||
|
expected_redirect_url = f"{URL}/auth/oidc/callback"
|
||||||
|
|
||||||
|
assert "code" == query["response_type"][0]
|
||||||
|
assert OIDC_CLIENT_ID == query["client_id"][0]
|
||||||
|
assert expected_redirect_url == query["redirect_uri"][0]
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_login_next_url(mock_get, flask_client):
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
with flask_client:
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_login", next="/dashboard/settings/"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
query = parse_qs(parsed.query)
|
||||||
|
|
||||||
|
expected_redirect_url = f"{URL}/auth/oidc/callback"
|
||||||
|
|
||||||
|
assert "code" == query["response_type"][0]
|
||||||
|
assert OIDC_CLIENT_ID == query["client_id"][0]
|
||||||
|
assert expected_redirect_url == query["redirect_uri"][0]
|
||||||
|
assert session["oauth_redirect_next"] == "/dashboard/settings/"
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_login_no_client_id(mock_get, flask_client):
|
||||||
|
config.OIDC_CLIENT_ID = None
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_login"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/login"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
|
||||||
|
config.OIDC_CLIENT_ID = "to_fill"
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_login_no_client_secret(mock_get, flask_client):
|
||||||
|
config.OIDC_CLIENT_SECRET = None
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_login"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/login"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
|
||||||
|
config.OIDC_CLIENT_SECRET = "to_fill"
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_callback_no_oauth_state(mock_get, flask_client):
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_callback_no_client_id(mock_get, flask_client):
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
config.OIDC_CLIENT_ID = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/login"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
|
||||||
|
config.OIDC_CLIENT_ID = "to_fill"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
def test_oidc_callback_no_client_secret(mock_get, flask_client):
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
config.OIDC_CLIENT_SECRET = None
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/login"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
|
||||||
|
config.OIDC_CLIENT_SECRET = "to_fill"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.fetch_token")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.get")
|
||||||
|
def test_oidc_callback_invalid_user(
|
||||||
|
mock_oauth_get, mock_fetch_token, mock_get, flask_client
|
||||||
|
):
|
||||||
|
mock_oauth_get.return_value = MockResponse(400, {})
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/login"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
assert mock_oauth_get.called
|
||||||
|
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.fetch_token")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.get")
|
||||||
|
def test_oidc_callback_no_email(
|
||||||
|
mock_oauth_get, mock_fetch_token, mock_get, flask_client
|
||||||
|
):
|
||||||
|
mock_oauth_get.return_value = MockResponse(200, {})
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/login"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
assert mock_oauth_get.called
|
||||||
|
|
||||||
|
with flask_client.session_transaction() as session:
|
||||||
|
session["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.fetch_token")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.get")
|
||||||
|
def test_oidc_callback_disabled_registration(
|
||||||
|
mock_oauth_get, mock_fetch_token, mock_get, flask_client
|
||||||
|
):
|
||||||
|
config.DISABLE_REGISTRATION = True
|
||||||
|
email = random_string()
|
||||||
|
mock_oauth_get.return_value = MockResponse(200, {"email": email})
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/auth/register"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
assert mock_oauth_get.called
|
||||||
|
|
||||||
|
config.DISABLE_REGISTRATION = False
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.fetch_token")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.get")
|
||||||
|
def test_oidc_callback_registration(
|
||||||
|
mock_oauth_get, mock_fetch_token, mock_get, flask_client
|
||||||
|
):
|
||||||
|
email = random_string()
|
||||||
|
mock_oauth_get.return_value = MockResponse(
|
||||||
|
200,
|
||||||
|
{
|
||||||
|
"email": email,
|
||||||
|
config.OIDC_NAME_FIELD: "name",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
user = User.get_by(email=email)
|
||||||
|
assert user is None
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/dashboard/"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
assert mock_oauth_get.called
|
||||||
|
|
||||||
|
user = User.get_by(email=email)
|
||||||
|
assert user is not None
|
||||||
|
assert user.email == email
|
||||||
|
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.fetch_token")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.get")
|
||||||
|
def test_oidc_callback_login(mock_oauth_get, mock_fetch_token, mock_get, flask_client):
|
||||||
|
email = random_string()
|
||||||
|
mock_oauth_get.return_value = MockResponse(
|
||||||
|
200,
|
||||||
|
{
|
||||||
|
"email": email,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = None
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
user = User.create(
|
||||||
|
email=email,
|
||||||
|
name="name",
|
||||||
|
password="",
|
||||||
|
activated=True,
|
||||||
|
)
|
||||||
|
user = User.get_by(email=email)
|
||||||
|
assert user is not None
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/dashboard/"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
assert mock_oauth_get.called
|
||||||
|
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
@patch("requests.get")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.fetch_token")
|
||||||
|
@patch("requests_oauthlib.OAuth2Session.get")
|
||||||
|
def test_oidc_callback_login_with_next_url(
|
||||||
|
mock_oauth_get, mock_fetch_token, mock_get, flask_client
|
||||||
|
):
|
||||||
|
email = random_string()
|
||||||
|
mock_oauth_get.return_value = MockResponse(
|
||||||
|
200,
|
||||||
|
{
|
||||||
|
"email": email,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
config.OIDC_WELL_KNOWN_URL = "http://localhost:7777/well-known-url"
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_redirect_next"] = "/dashboard/settings/"
|
||||||
|
sess["oauth_state"] = "state"
|
||||||
|
|
||||||
|
mock_get.return_value.json.return_value = mock_well_known_response
|
||||||
|
|
||||||
|
user = User.create(
|
||||||
|
email=email,
|
||||||
|
name="name",
|
||||||
|
password="",
|
||||||
|
activated=True,
|
||||||
|
)
|
||||||
|
user = User.get_by(email=email)
|
||||||
|
assert user is not None
|
||||||
|
|
||||||
|
r = flask_client.get(
|
||||||
|
url_for("auth.oidc_callback"),
|
||||||
|
follow_redirects=False,
|
||||||
|
)
|
||||||
|
location = r.headers.get("Location")
|
||||||
|
assert location is not None
|
||||||
|
|
||||||
|
parsed = parse_url(location)
|
||||||
|
|
||||||
|
expected_redirect_url = "/dashboard/settings/"
|
||||||
|
|
||||||
|
assert expected_redirect_url == parsed.path
|
||||||
|
assert mock_oauth_get.called
|
||||||
|
|
||||||
|
with flask_client.session_transaction() as sess:
|
||||||
|
sess["oauth_state"] = None
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_user():
|
||||||
|
email = random_string()
|
||||||
|
user = create_user(
|
||||||
|
email,
|
||||||
|
{
|
||||||
|
config.OIDC_NAME_FIELD: "name",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
assert user.email == email
|
||||||
|
assert user.name == "name"
|
||||||
|
assert user.activated
|
||||||
|
|
||||||
|
|
||||||
|
class MockResponse:
|
||||||
|
def __init__(self, status_code, json_data):
|
||||||
|
self.status_code = status_code
|
||||||
|
self.json_data = json_data
|
||||||
|
self.text = "error"
|
||||||
|
|
||||||
|
def json(self):
|
||||||
|
return self.json_data
|
|
@ -39,15 +39,17 @@ def test_cleanup_tokens(flask_client):
|
||||||
|
|
||||||
def test_cleanup_users():
|
def test_cleanup_users():
|
||||||
u_delete_none_id = create_new_user().id
|
u_delete_none_id = create_new_user().id
|
||||||
u_delete_after = create_new_user()
|
u_delete_grace_has_expired = create_new_user()
|
||||||
u_delete_after_id = u_delete_after.id
|
u_delete_grace_has_expired_id = u_delete_grace_has_expired.id
|
||||||
u_delete_before = create_new_user()
|
u_delete_grace_has_not_expired = create_new_user()
|
||||||
u_delete_before_id = u_delete_before.id
|
u_delete_grace_has_not_expired_id = u_delete_grace_has_not_expired.id
|
||||||
now = arrow.now()
|
now = arrow.now()
|
||||||
u_delete_after.delete_on = now.shift(minutes=1)
|
u_delete_grace_has_expired.delete_on = now.shift(days=-(cron.DELETE_GRACE_DAYS + 1))
|
||||||
u_delete_before.delete_on = now.shift(minutes=-1)
|
u_delete_grace_has_not_expired.delete_on = now.shift(
|
||||||
|
days=-(cron.DELETE_GRACE_DAYS - 1)
|
||||||
|
)
|
||||||
Session.flush()
|
Session.flush()
|
||||||
cron.clear_users_scheduled_to_be_deleted()
|
cron.clear_users_scheduled_to_be_deleted()
|
||||||
assert User.get(u_delete_none_id) is not None
|
assert User.get(u_delete_none_id) is not None
|
||||||
assert User.get(u_delete_after_id) is not None
|
assert User.get(u_delete_grace_has_not_expired_id) is not None
|
||||||
assert User.get(u_delete_before_id) is None
|
assert User.get(u_delete_grace_has_expired_id) is None
|
|
@ -0,0 +1,168 @@
|
||||||
|
import arrow
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
import cron
|
||||||
|
from app.db import Session
|
||||||
|
from app.models import (
|
||||||
|
Alias,
|
||||||
|
AppleSubscription,
|
||||||
|
PlanEnum,
|
||||||
|
CoinbaseSubscription,
|
||||||
|
ManualSubscription,
|
||||||
|
Subscription,
|
||||||
|
PartnerUser,
|
||||||
|
PartnerSubscription,
|
||||||
|
User,
|
||||||
|
)
|
||||||
|
from app.proton.utils import get_proton_partner
|
||||||
|
from tests.utils import create_new_user, random_token
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_alias_for_free_user_has_no_alias():
|
||||||
|
user = create_new_user()
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert len(aliases) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_alias_for_lifetime_with_null_hibp_date():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
user.enable_data_breach_check = True
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert alias_id == aliases[0].id
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_alias_for_lifetime_with_old_hibp_date():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
user.enable_data_breach_check = True
|
||||||
|
alias = Alias.create_new_random(user)
|
||||||
|
alias.hibp_last_check = arrow.now().shift(days=-1)
|
||||||
|
alias_id = alias.id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert alias_id == aliases[0].id
|
||||||
|
|
||||||
|
|
||||||
|
def create_partner_sub(user: User):
|
||||||
|
pu = PartnerUser.create(
|
||||||
|
partner_id=get_proton_partner().id,
|
||||||
|
partner_email=user.email,
|
||||||
|
external_user_id=random_token(10),
|
||||||
|
user_id=user.id,
|
||||||
|
flush=True,
|
||||||
|
)
|
||||||
|
PartnerSubscription.create(
|
||||||
|
partner_user_id=pu.id, end_at=arrow.utcnow().shift(days=15)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
sub_generator_list = [
|
||||||
|
lambda u: AppleSubscription.create(
|
||||||
|
user_id=u.id,
|
||||||
|
expires_date=arrow.now().shift(days=15),
|
||||||
|
original_transaction_id=random_token(10),
|
||||||
|
receipt_data=random_token(10),
|
||||||
|
plan=PlanEnum.monthly,
|
||||||
|
),
|
||||||
|
lambda u: CoinbaseSubscription.create(
|
||||||
|
user_id=u.id,
|
||||||
|
end_at=arrow.now().shift(days=15),
|
||||||
|
),
|
||||||
|
lambda u: ManualSubscription.create(
|
||||||
|
user_id=u.id,
|
||||||
|
end_at=arrow.now().shift(days=15),
|
||||||
|
),
|
||||||
|
lambda u: Subscription.create(
|
||||||
|
user_id=u.id,
|
||||||
|
cancel_url="",
|
||||||
|
update_url="",
|
||||||
|
subscription_id=random_token(10),
|
||||||
|
event_time=arrow.now(),
|
||||||
|
next_bill_date=arrow.now().shift(days=15).date(),
|
||||||
|
plan=PlanEnum.monthly,
|
||||||
|
),
|
||||||
|
create_partner_sub,
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("sub_generator", sub_generator_list)
|
||||||
|
def test_get_alias_for_sub(sub_generator):
|
||||||
|
user = create_new_user()
|
||||||
|
user.enable_data_breach_check = True
|
||||||
|
sub_generator(user)
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert alias_id == aliases[0].id
|
||||||
|
|
||||||
|
|
||||||
|
def test_disabled_user_is_not_checked():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
user.disabled = True
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert len(aliases) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_skipped_user_is_not_checked():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [user.id], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert len(aliases) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_already_checked_is_not_checked():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
alias = Alias.create_new_random(user)
|
||||||
|
alias.hibp_last_check = arrow.now().shift(days=1)
|
||||||
|
alias_id = alias.id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [user.id], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert len(aliases) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_outed_in_user_is_checked():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
user.enable_data_breach_check = True
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert len(aliases) == 1
|
||||||
|
|
||||||
|
|
||||||
|
def test_outed_out_user_is_not_checked():
|
||||||
|
user = create_new_user()
|
||||||
|
user.lifetime = True
|
||||||
|
alias_id = Alias.create_new_random(user).id
|
||||||
|
Session.commit()
|
||||||
|
aliases = list(
|
||||||
|
cron.get_alias_to_check_hibp(arrow.now(), [], alias_id, alias_id + 1)
|
||||||
|
)
|
||||||
|
assert len(aliases) == 0
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue