check command considers default backup values

at least until #138 is implement ...
This commit is contained in:
Éloi Rivard 2023-07-10 19:47:00 +02:00
parent e37aab6cbc
commit 2da4c92d9e
2 changed files with 11 additions and 5 deletions

View file

@ -8,6 +8,11 @@ Added
- Configuration option to disable the forced usage of OIDC nonce :pr:`143` - Configuration option to disable the forced usage of OIDC nonce :pr:`143`
Fixed
*****
- The `check` command uses the default configuration values.
[0.0.30] - 2023-07-06 [0.0.30] - 2023-07-06
===================== =====================

View file

@ -4,6 +4,8 @@ import socket
from collections.abc import Mapping from collections.abc import Mapping
import toml import toml
from canaille.app.mails import DEFAULT_SMTP_HOST
from canaille.app.mails import DEFAULT_SMTP_PORT
from flask import current_app from flask import current_app
ROOT = os.path.dirname(os.path.abspath(__file__)) ROOT = os.path.dirname(os.path.abspath(__file__))
@ -97,11 +99,10 @@ def validate_keypair(config):
def validate_smtp_configuration(config): def validate_smtp_configuration(config):
host = config["SMTP"].get("HOST", DEFAULT_SMTP_HOST)
port = config["SMTP"].get("PORT", DEFAULT_SMTP_PORT)
try: try:
with smtplib.SMTP( with smtplib.SMTP(host=host, port=port) as smtp:
host=config["SMTP"]["HOST"],
port=config["SMTP"]["PORT"],
) as smtp:
if config["SMTP"].get("TLS"): if config["SMTP"].get("TLS"):
smtp.starttls() smtp.starttls()
@ -112,7 +113,7 @@ def validate_smtp_configuration(config):
) )
except (socket.gaierror, ConnectionRefusedError) as exc: except (socket.gaierror, ConnectionRefusedError) as exc:
raise ConfigurationException( raise ConfigurationException(
f'Could not connect to the SMTP server \'{config["SMTP"]["HOST"]}\'' f"Could not connect to the SMTP server '{host}' on port '{port}'"
) from exc ) from exc
except smtplib.SMTPAuthenticationError as exc: except smtplib.SMTPAuthenticationError as exc: