vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit cd8acc2e8cf6a3f416fcc8516ef5fb2fde97cc63
parent d3054d4f83a643dc826485f75c471060c6f5778c
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Wed, 16 Oct 2019 19:55:54 +0200

Merge pull request #671 from vverst/enable-2fa-email

Move 2FA email config to after SMTP config
Diffstat:
Msrc/config.rs | 24++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/config.rs b/src/config.rs @@ -328,18 +328,6 @@ make_config! { _duo_akey: Pass, false, option; }, - /// Email 2FA Settings - email_2fa: _enable_email_2fa { - /// Enabled |> Disabling will prevent users from setting up new email 2FA and using existing email 2FA configured - _enable_email_2fa: bool, true, auto, |c| c._enable_smtp && c.smtp_host.is_some(); - /// Token number length |> Length of the numbers in an email token. Minimum of 6. Maximum is 19. - email_token_size: u32, true, def, 6; - /// Token expiration time |> Maximum time in seconds a token is valid. The time the user has to open email client and copy token. - email_expiration_time: u64, true, def, 600; - /// Maximum attempts |> Maximum attempts before an email token is reset and a new email will need to be sent - email_attempts_limit: u64, true, def, 3; - }, - /// SMTP Email Settings smtp: _enable_smtp { /// Enabled @@ -363,6 +351,18 @@ make_config! { /// Json form auth mechanism |> Defaults for ssl is "Plain" and "Login" and nothing for non-ssl connections. Possible values: ["Plain", "Login", "Xoauth2"] smtp_auth_mechanism: String, true, option; }, + + /// Email 2FA Settings + email_2fa: _enable_email_2fa { + /// Enabled |> Disabling will prevent users from setting up new email 2FA and using existing email 2FA configured + _enable_email_2fa: bool, true, auto, |c| c._enable_smtp && c.smtp_host.is_some(); + /// Token number length |> Length of the numbers in an email token. Minimum of 6. Maximum is 19. + email_token_size: u32, true, def, 6; + /// Token expiration time |> Maximum time in seconds a token is valid. The time the user has to open email client and copy token. + email_expiration_time: u64, true, def, 600; + /// Maximum attempts |> Maximum attempts before an email token is reset and a new email will need to be sent + email_attempts_limit: u64, true, def, 3; + }, } fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {