Change default password scheme to PBKDF2 (#1194)

5 years ago · d3dd4802f4
parent 20e00ac0c4
commit d3dd4802f4
9 changed files with 17 additions and 16 deletions
--- 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',
--- 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 }}
--- 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=
--- 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=
--- 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=
--- 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=
--- 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=
--- 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=
--- a/towncrier/newsfragments/1194.feature
+++ b/towncrier/newsfragments/1194.feature
@ -0,0 +1 @@
+Change default password scheme to PBKDF2