From d3dd4802f4d81d521b403dc131e4e50b08b0062b Mon Sep 17 00:00:00 2001 From: hoellen Date: Mon, 7 Oct 2019 22:26:48 +0200 Subject: [PATCH] Change default password scheme to PBKDF2 (#1194) --- core/admin/mailu/configuration.py | 2 +- setup/flavors/compose/mailu.env | 4 ++-- tests/compose/core/mailu.env | 6 +++--- tests/compose/fetchmail/mailu.env | 4 ++-- tests/compose/filters/mailu.env | 4 ++-- tests/compose/rainloop/mailu.env | 4 ++-- tests/compose/roundcube/mailu.env | 4 ++-- tests/compose/webdav/mailu.env | 4 ++-- towncrier/newsfragments/1194.feature | 1 + 9 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 towncrier/newsfragments/1194.feature diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index f01e1bb9..05fad173 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -51,7 +51,7 @@ DEFAULT_CONFIG = { 'RECAPTCHA_PUBLIC_KEY': '', 'RECAPTCHA_PRIVATE_KEY': '', # Advanced settings - 'PASSWORD_SCHEME': 'BLF-CRYPT', + 'PASSWORD_SCHEME': 'PBKDF2', 'LOG_LEVEL': 'WARNING', # Host settings 'HOST_IMAP': 'imap', diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index 3228fe41..180239c3 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -143,8 +143,8 @@ DOMAIN_REGISTRATION=true COMPOSE_PROJECT_NAME={{ compose_project_name or 'mailu' }} # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME={{ password_scheme or 'BLF-CRYPT' }} +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME={{ password_scheme or 'PBKDF2' }} # Header to take the real ip from REAL_IP_HEADER={{ real_ip_header }} diff --git a/tests/compose/core/mailu.env b/tests/compose/core/mailu.env index dd7bd25f..b13e57c5 100644 --- a/tests/compose/core/mailu.env +++ b/tests/compose/core/mailu.env @@ -129,8 +129,8 @@ WEBSITE=https://mailu.io COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME=BLF-CRYPT +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME=PBKDF2 # Header to take the real ip from REAL_IP_HEADER= @@ -144,4 +144,4 @@ REJECT_UNLISTED_RECIPIENT= # Test for initial admin create INITIAL_ADMIN_ACCOUNT=admin INITIAL_ADMIN_DOMAIN=mailu.io -INITIAL_ADMIN_PW=FooBar \ No newline at end of file +INITIAL_ADMIN_PW=FooBar diff --git a/tests/compose/fetchmail/mailu.env b/tests/compose/fetchmail/mailu.env index c91a6deb..636a09a9 100644 --- a/tests/compose/fetchmail/mailu.env +++ b/tests/compose/fetchmail/mailu.env @@ -129,8 +129,8 @@ WEBSITE=https://mailu.io COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME=BLF-CRYPT +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME=PBKDF2 # Header to take the real ip from REAL_IP_HEADER= diff --git a/tests/compose/filters/mailu.env b/tests/compose/filters/mailu.env index e165fee2..b6d5ca8f 100644 --- a/tests/compose/filters/mailu.env +++ b/tests/compose/filters/mailu.env @@ -129,8 +129,8 @@ WEBSITE=https://mailu.io COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME=BLF-CRYPT +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME=PBKDF2 # Header to take the real ip from REAL_IP_HEADER= diff --git a/tests/compose/rainloop/mailu.env b/tests/compose/rainloop/mailu.env index 65fef5c8..9c31c8bb 100644 --- a/tests/compose/rainloop/mailu.env +++ b/tests/compose/rainloop/mailu.env @@ -129,8 +129,8 @@ WEBSITE=https://mailu.io COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME=BLF-CRYPT +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME=PBKDF2 # Header to take the real ip from REAL_IP_HEADER= diff --git a/tests/compose/roundcube/mailu.env b/tests/compose/roundcube/mailu.env index cadaa84a..dc503268 100644 --- a/tests/compose/roundcube/mailu.env +++ b/tests/compose/roundcube/mailu.env @@ -129,8 +129,8 @@ WEBSITE=https://mailu.io COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME=BLF-CRYPT +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME=PBKDF2 # Header to take the real ip from REAL_IP_HEADER= diff --git a/tests/compose/webdav/mailu.env b/tests/compose/webdav/mailu.env index 7141bf1f..90fb25b1 100644 --- a/tests/compose/webdav/mailu.env +++ b/tests/compose/webdav/mailu.env @@ -129,8 +129,8 @@ WEBSITE=https://mailu.io COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords -# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -PASSWORD_SCHEME=BLF-CRYPT +# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT) +PASSWORD_SCHEME=PBKDF2 # Header to take the real ip from REAL_IP_HEADER= diff --git a/towncrier/newsfragments/1194.feature b/towncrier/newsfragments/1194.feature new file mode 100644 index 00000000..ee40311a --- /dev/null +++ b/towncrier/newsfragments/1194.feature @@ -0,0 +1 @@ +Change default password scheme to PBKDF2