mirror of
https://github.com/mastodon/mastodon
synced 2024-12-01 00:08:21 +09:00
e8d41bc2fe
* feat: add possibility of adding WebAuthn security keys to use as 2FA This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor to the Settings page for editing the 2FA methods – now it will list the methods that are available to the user (TOTP and WebAuthn) and from there they'll be able to add or remove any of them. Also, it's worth mentioning that for enabling WebAuthn it's required to have TOTP enabled, so the first time that you go to the 2FA Settings page, you'll be asked to set it up. This work was inspired by the one donde by Github in their platform, and despite it could be approached in different ways, we decided to go with this one given that we feel that this gives a great UX. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: add request for WebAuthn as second factor at login if enabled This commits adds the feature for using WebAuthn as a second factor for login when enabled. If users have WebAuthn enabled, now a page requesting for the use of a WebAuthn credential for log in will appear, although a link redirecting to the old page for logging in using a two-factor code will also be present. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: add possibility of deleting WebAuthn Credentials Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: disable WebAuthn when an Admin disables 2FA for a user Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: remove ability to disable TOTP leaving only WebAuthn as 2FA Following examples form other platforms like Github, we decided to make Webauthn 2FA secondary to 2FA with TOTP, so that we removed the possibility of removing TOTP authentication only, leaving users with just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA' in order to remove second factor auth. The reason for WebAuthn being secondary to TOPT is that in that way, users will still be able to log in using their code from their phone's application if they don't have their security keys with them – or maybe even lost them. * We had to change a little the flow for setting up TOTP, given that now it's possible to setting up again if you already had TOTP, in order to let users modify their authenticator app – given that now it's not possible for them to disable TOTP and set it up again with another authenticator app. So, basically, now instead of storing the new `otp_secret` in the user, we store it in the session until the process of set up is finished. This was because, as it was before, when users clicked on 'Edit' in the new two-factor methods lists page, but then went back without finishing the flow, their `otp_secret` had been changed therefore invalidating their previous authenticator app, making them unable to log in again using TOTP. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * refactor: fix eslint errors The PR build was failing given that linting returning some errors. This commit attempts to fix them. * refactor: normalize i18n translations The build was failing given that i18n translations files were not normalized. This commits fixes that. * refactor: avoid having the webauthn gem locked to a specific version * refactor: use symbols for routes without '/' * refactor: avoid sending webauthn disabled email when 2FA is disabled When an admins disable 2FA for users, we were sending two mails to them, one notifying that 2FA was disabled and the other to notify that WebAuthn was disabled. As the second one is redundant since the first email includes it, we can remove it and send just one email to users. * refactor: avoid creating new env variable for webauthn_origin config * refactor: improve flash error messages for webauthn pages Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
116 lines
8.6 KiB
YAML
116 lines
8.6 KiB
YAML
---
|
|
en:
|
|
devise:
|
|
confirmations:
|
|
confirmed: Your email address has been successfully confirmed.
|
|
send_instructions: You will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
|
|
send_paranoid_instructions: If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
|
|
failure:
|
|
already_authenticated: You are already signed in.
|
|
inactive: Your account is not activated yet.
|
|
invalid: Invalid %{authentication_keys} or password.
|
|
last_attempt: You have one more attempt before your account is locked.
|
|
locked: Your account is locked.
|
|
not_found_in_database: Invalid %{authentication_keys} or password.
|
|
pending: Your account is still under review.
|
|
timeout: Your session expired. Please sign in again to continue.
|
|
unauthenticated: You need to sign in or sign up before continuing.
|
|
unconfirmed: You have to confirm your email address before continuing.
|
|
mailer:
|
|
confirmation_instructions:
|
|
action: Verify email address
|
|
action_with_app: Confirm and return to %{app}
|
|
explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.
|
|
explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can login to change your details or delete your account, but you cannot access most of the functions until your account is approved. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
|
|
extra_html: Please also check out <a href="%{terms_path}">the rules of the server</a> and <a href="%{policy_path}">our terms of service</a>.
|
|
subject: 'Mastodon: Confirmation instructions for %{instance}'
|
|
title: Verify email address
|
|
email_changed:
|
|
explanation: 'The email address for your account is being changed to:'
|
|
extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
|
|
subject: 'Mastodon: Email changed'
|
|
title: New email address
|
|
password_change:
|
|
explanation: The password for your account has been changed.
|
|
extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
|
|
subject: 'Mastodon: Password changed'
|
|
title: Password changed
|
|
reconfirmation_instructions:
|
|
explanation: Confirm the new address to change your email.
|
|
extra: If this change wasn't initiated by you, please ignore this email. The email address for the Mastodon account won't change until you access the link above.
|
|
subject: 'Mastodon: Confirm email for %{instance}'
|
|
title: Verify email address
|
|
reset_password_instructions:
|
|
action: Change password
|
|
explanation: You requested a new password for your account.
|
|
extra: If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.
|
|
subject: 'Mastodon: Reset password instructions'
|
|
title: Password reset
|
|
two_factor_disabled:
|
|
explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
|
|
subject: 'Mastodon: Two-factor authentication disabled'
|
|
title: 2FA disabled
|
|
two_factor_enabled:
|
|
explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
|
|
subject: 'Mastodon: Two-factor authentication enabled'
|
|
title: 2FA enabled
|
|
two_factor_recovery_codes_changed:
|
|
explanation: The previous recovery codes have been invalidated and new ones generated.
|
|
subject: 'Mastodon: Two-factor recovery codes re-generated'
|
|
title: 2FA recovery codes changed
|
|
unlock_instructions:
|
|
subject: 'Mastodon: Unlock instructions'
|
|
webauthn_credential:
|
|
added:
|
|
explanation: The following security key has been added to your account
|
|
subject: 'Mastodon: New security key'
|
|
title: A new security key has been added
|
|
deleted:
|
|
explanation: The following security key has been deleted from your account
|
|
subject: 'Mastodon: Security key deleted'
|
|
title: One of you security keys has been deleted
|
|
webauthn_disabled:
|
|
explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
|
|
subject: 'Mastodon: Authentication with security keys disabled'
|
|
title: Security keys disabled
|
|
webauthn_enabled:
|
|
explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
|
|
subject: 'Mastodon: Security key authentication enabled'
|
|
title: Security keys enabled
|
|
omniauth_callbacks:
|
|
failure: Could not authenticate you from %{kind} because "%{reason}".
|
|
success: Successfully authenticated from %{kind} account.
|
|
passwords:
|
|
no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.
|
|
send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
|
|
send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
|
|
updated: Your password has been changed successfully. You are now signed in.
|
|
updated_not_active: Your password has been changed successfully.
|
|
registrations:
|
|
destroyed: Bye! Your account has been successfully cancelled. We hope to see you again soon.
|
|
signed_up: Welcome! You have signed up successfully.
|
|
signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
|
|
signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
|
|
signed_up_but_pending: A message with a confirmation link has been sent to your email address. After you click the link, we will review your application. You will be notified if it is approved.
|
|
signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account. Please check your spam folder if you didn't receive this email.
|
|
update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address. Please check your spam folder if you didn't receive this email.
|
|
updated: Your account has been updated successfully.
|
|
sessions:
|
|
already_signed_out: Signed out successfully.
|
|
signed_in: Signed in successfully.
|
|
signed_out: Signed out successfully.
|
|
unlocks:
|
|
send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes. Please check your spam folder if you didn't receive this email.
|
|
send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes. Please check your spam folder if you didn't receive this email.
|
|
unlocked: Your account has been unlocked successfully. Please sign in to continue.
|
|
errors:
|
|
messages:
|
|
already_confirmed: was already confirmed, please try signing in
|
|
confirmation_period_expired: needs to be confirmed within %{period}, please request a new one
|
|
expired: has expired, please request a new one
|
|
not_found: not found
|
|
not_locked: was not locked
|
|
not_saved:
|
|
one: '1 error prohibited this %{resource} from being saved:'
|
|
other: "%{count} errors prohibited this %{resource} from being saved:"
|