simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-02-24 15:53:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add LOAD_PGP_EMAIL_HANDLER param. Load PGP keys if LOAD_PGP_EMAIL_HANDLER is set

Browse source
This commit is contained in:
Son NK 2020-04-14 12:45:47 +02:00
parent decda875db
commit 6cfd534192
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/config.py
View file

@ -226,3 +226,6 @@ if LOCAL_FILE_UPLOAD:
os.makedirs(UPLOAD_DIR) os.makedirs(UPLOAD_DIR)
LANDING_PAGE_URL = os.environ.get("LANDING_PAGE_URL") or "https://simplelogin.io" LANDING_PAGE_URL = os.environ.get("LANDING_PAGE_URL") or "https://simplelogin.io"
# Loading PGP keys when mail_handler runs. To be used locally when init_app is not called.
LOAD_PGP_EMAIL_HANDLER = "LOAD_PGP_EMAIL_HANDLER" in os.environ

8
email_handler.py
View file

@ -53,6 +53,7 @@ from app.config import (
ALIAS_DOMAINS, ALIAS_DOMAINS,
POSTFIX_SUBMISSION_TLS, POSTFIX_SUBMISSION_TLS,
UNSUBSCRIBER, UNSUBSCRIBER,
LOAD_PGP_EMAIL_HANDLER,
) )
from app.email_utils import ( from app.email_utils import (
send_email, send_email,
@ -80,6 +81,7 @@ from app.models import (
RefusedEmail, RefusedEmail,
) )
from app.utils import random_string from app.utils import random_string
from init_app import load_pgp_public_keys
from server import create_app from server import create_app
# used when an alias receives email from its own mailbox # used when an alias receives email from its own mailbox
@ -857,5 +859,11 @@ if __name__ == "__main__":
controller.start() controller.start()
LOG.d("Start mail controller %s %s", controller.hostname, controller.port) LOG.d("Start mail controller %s %s", controller.hostname, controller.port)
if LOAD_PGP_EMAIL_HANDLER:
LOG.warning("LOAD PGP keys")
app = create_app()
with app.app_context():
load_pgp_public_keys(app)
while True: while True:
time.sleep(2) time.sleep(2)