pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Enable OTP 2FA

Browse Source 
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
This commit is contained in:
Jeremy Benoist
2018-12-02 12:43:05 +01:00
parent acd4412080
commit a6b242a1fd
36 changed files with 554 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Command/ShowUserCommand.php
View File

@ -57,7 +57,8 @@ class ShowUserCommand extends ContainerAwareCommand
sprintf('Display name: %s', $user->getName()),
sprintf('Creation date: %s', $user->getCreatedAt()->format('Y-m-d H:i:s')),
sprintf('Last login: %s', null !== $user->getLastLogin() ? $user->getLastLogin()->format('Y-m-d H:i:s') : 'never'),
sprintf('2FA activated: %s', $user->isTwoFactorAuthentication() ? 'yes' : 'no'),
sprintf('2FA (email) activated: %s', $user->isEmailTwoFactor() ? 'yes' : 'no'),
sprintf('2FA (OTP) activated: %s', $user->isGoogleAuthenticatorEnabled() ? 'yes' : 'no'),
]);
}

35
src/Wallabag/CoreBundle/Controller/ConfigController.php
View File

@ -46,7 +46,7 @@ class ConfigController extends Controller
$activeTheme = $this->get('liip_theme.active_theme');
$activeTheme->setName($config->getTheme());
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.config_saved'
);
@ -68,7 +68,7 @@ class ConfigController extends Controller
$userManager->updateUser($user, true);
}
$this->get('session')->getFlashBag()->add('notice', $message);
$this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('config') . '#set4');
}
@ -80,10 +80,29 @@ class ConfigController extends Controller
]);
$userForm->handleRequest($request);
// `googleTwoFactor` isn't a field within the User entity, we need to define it's value in a different way
if (true === $user->isGoogleAuthenticatorEnabled() && false === $userForm->isSubmitted()) {
$userForm->get('googleTwoFactor')->setData(true);
}
if ($userForm->isSubmitted() && $userForm->isValid()) {
// handle creation / reset of the OTP secret if checkbox changed from the previous state
if (true === $userForm->get('googleTwoFactor')->getData() && false === $user->isGoogleAuthenticatorEnabled()) {
$secret = $this->get('scheb_two_factor.security.google_authenticator')->generateSecret();
$user->setGoogleAuthenticatorSecret($secret);
$user->setEmailTwoFactor(false);
$qrCode = $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user);
$this->addFlash('OTPSecret', ['code' => $secret, 'qrCode' => $qrCode]);
} elseif (false === $userForm->get('googleTwoFactor')->getData() && true === $user->isGoogleAuthenticatorEnabled()) {
$user->setGoogleAuthenticatorSecret(null);
}
$userManager->updateUser($user, true);
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.user_updated'
);
@ -99,7 +118,7 @@ class ConfigController extends Controller
$em->persist($config);
$em->flush();
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.rss_updated'
);
@ -131,7 +150,7 @@ class ConfigController extends Controller
$em->persist($taggingRule);
$em->flush();
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_updated'
);
@ -178,7 +197,7 @@ class ConfigController extends Controller
return new JsonResponse(['token' => $config->getRssToken()]);
}
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.rss_token_updated'
);
@ -203,7 +222,7 @@ class ConfigController extends Controller
$em->remove($rule);
$em->flush();
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_deleted'
);
@ -269,7 +288,7 @@ class ConfigController extends Controller
break;
}
$this->get('session')->getFlashBag()->add(
$this->addFlash(
'notice',
'flashes.config.notice.' . $type . '_reset'
);

9
src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
View File

@ -21,9 +21,14 @@ class UserInformationType extends AbstractType
->add('email', EmailType::class, [
'label' => 'config.form_user.email_label',
])
->add('twoFactorAuthentication', CheckboxType::class, [
->add('emailTwoFactor', CheckboxType::class, [
'required' => false,
'label' => 'config.form_user.twoFactorAuthentication_label',
'label' => 'config.form_user.emailTwoFactor_label',
])
->add('googleTwoFactor', CheckboxType::class, [
'required' => false,
'label' => 'config.form_user.googleTwoFactor_label',
'mapped' => false,
])
->add('save', SubmitType::class, [
'label' => 'config.form.save',

9
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
# rss_limit: 'Number of items in the feed'
form_user:
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Navn'
email_label: 'Emailadresse'
# twoFactorAuthentication_label: 'Two factor authentication'
# help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
# title: Delete my account (a.k.a danger zone)
# description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@ -533,7 +533,8 @@ user:
email_label: 'Emailadresse'
# enabled_label: 'Enabled'
# last_login_label: 'Last login'
# twofactor_label: Two factor authentication
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
# save: Save
# delete: Delete
# delete_confirm: Are you sure?

9
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
View File

@ -99,11 +99,11 @@ config:
all: 'Alle'
rss_limit: 'Anzahl der Einträge pro Feed'
form_user:
two_factor_description: "Wenn du die Zwei-Faktor-Authentifizierung aktivierst, erhältst du eine E-Mail mit einem Code bei jeder nicht vertrauenswürdigen Verbindung"
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Name'
email_label: 'E-Mail-Adresse'
twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
help_twoFactorAuthentication: "Wenn du 2FA aktivierst, wirst du bei jedem Login einen Code per E-Mail bekommen."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: 'Lösche mein Konto (a.k.a Gefahrenzone)'
description: 'Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.'
@ -533,7 +533,8 @@ user:
email_label: 'E-Mail-Adresse'
enabled_label: 'Aktiviert'
last_login_label: 'Letzter Login'
twofactor_label: 'Zwei-Faktor-Authentifizierung'
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: 'Speichern'
delete: 'Löschen'
delete_confirm: 'Bist du sicher?'

9
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
View File

@ -99,11 +99,11 @@ config:
all: 'All'
rss_limit: 'Number of items in the feed'
form_user:
two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."
two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Name'
email_label: 'Email'
twoFactorAuthentication_label: 'Two factor authentication'
help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
emailTwoFactor_label: 'Using email (receive a code by email)'
googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: Delete my account (a.k.a danger zone)
description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@ -533,7 +533,8 @@ user:
email_label: 'Email'
enabled_label: 'Enabled'
last_login_label: 'Last login'
twofactor_label: Two factor authentication
twofactor_email_label: Two factor authentication by email
twofactor_google_label: Two factor authentication by Google
save: Save
delete: Delete
delete_confirm: Are you sure?

9
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
rss_limit: 'Límite de artículos en feed RSS'
form_user:
two_factor_description: "Con la autenticación en dos pasos recibirá código por e-mail en cada nueva conexión que no sea de confianza."
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Nombre'
email_label: 'Dirección de e-mail'
twoFactorAuthentication_label: 'Autenticación en dos pasos'
help_twoFactorAuthentication: "Si activas la autenticación en dos pasos, cada vez que quieras iniciar sesión en wallabag recibirás un código por e-mail."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: Eliminar mi cuenta (Zona peligrosa)
description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede deshacer). Después serás desconectado.
@ -533,7 +533,8 @@ user:
email_label: 'E-mail'
enabled_label: 'Activado'
last_login_label: 'Último inicio de sesión'
twofactor_label: Autenticación en dos pasos
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: Guardar
delete: Eliminar
delete_confirm: ¿Estás seguro?

9
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
rss_limit: 'محدودیت آر-اس-اس'
form_user:
two_factor_description: "با فعال‌کردن تأیید ۲مرحله‌ای هر بار که اتصال تأییدنشده‌ای برقرار شد، به شما یک کد از راه ایمیل فرستاده می‌شود"
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'نام'
email_label: 'نشانی ایمیل'
twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
# help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
# title: Delete my account (a.k.a danger zone)
# description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@ -533,7 +533,8 @@ user:
email_label: 'نشانی ایمیل'
# enabled_label: 'Enabled'
# last_login_label: 'Last login'
# twofactor_label: Two factor authentication
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
# save: Save
# delete: Delete
# delete_confirm: Are you sure?

8
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
View File

@ -99,11 +99,11 @@ config:
all: "Tous"
rss_limit: "Nombre d’articles dans le flux"
form_user:
two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel à chaque nouvelle connexion non approuvée."
two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel OU que vous devriez utiliser une application de mot de passe à usage unique (comme Google Authenticator) pour obtenir un code temporaire à chaque nouvelle connexion non approuvée. Vous ne pouvez pas choisir les deux options."
name_label: "Nom"
email_label: "Adresse courriel"
twoFactorAuthentication_label: "Double authentification"
help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email."
emailTwoFactor_label: 'En utlisant l’email (recevez un code par email)'
googleTwoFactor_label: 'En utilisant une application de mot de passe à usage unique (ouvrez l’app, comme Google Authenticator, pour obtenir un mot de passe à usage unique)'
delete:
title: "Supprimer mon compte (attention danger !)"
description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté."
@ -534,6 +534,8 @@ user:
enabled_label: "Activé"
last_login_label: "Dernière connexion"
twofactor_label: "Double authentification"
twofactor_email_label: Double authentification par email
twofactor_google_label: Double authentification par Google
save: "Sauvegarder"
delete: "Supprimer"
delete_confirm: "Êtes-vous sûr ?"

9
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
rss_limit: 'Numero di elementi nel feed'
form_user:
two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata"
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Nome'
email_label: 'E-mail'
twoFactorAuthentication_label: 'Autenticazione a due fattori'
help_twoFactorAuthentication: "Se abiliti l'autenticazione a due fattori, ogni volta che vorrai connetterti a wallabag, riceverai un codice via E-mail."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: Cancella il mio account (zona pericolosa)
description: Rimuovendo il tuo account, TUTTI i tuoi articoli, TUTTE le tue etichette, TUTTE le tue annotazioni ed il tuo account verranno rimossi PERMANENTEMENTE (impossibile da ANNULLARE). Verrai poi disconnesso.
@ -533,7 +533,8 @@ user:
email_label: 'E-mail'
enabled_label: 'Abilitato'
last_login_label: 'Ultima connessione'
twofactor_label: Autenticazione a due fattori
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: Salva
delete: Cancella
delete_confirm: Sei sicuro?

9
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
View File

@ -99,11 +99,11 @@ config:
all: 'Totes'
rss_limit: "Nombre d'articles dins un flux RSS"
form_user:
two_factor_description: "Activar l'autentificacion en dos temps vòl dire que recebretz un còdi per corrièl per cada novèla connexion pas aprovada."
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Nom'
email_label: 'Adreça de corrièl'
twoFactorAuthentication_label: 'Dobla autentificacion'
help_twoFactorAuthentication: "S'avètz activat l'autentificacion en dos temps, cada còp que volètz vos connectar a wallabag, recebretz un còdi per corrièl."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: Suprimir mon compte (Mèfi zòna perilhosa)
description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat.
@ -533,7 +533,8 @@ user:
email_label: 'Adreça de corrièl'
enabled_label: 'Actiu'
last_login_label: 'Darrièra connexion'
twofactor_label: 'Autentificacion doble-factor'
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: 'Enregistrar'
delete: 'Suprimir'
delete_confirm: 'Sètz segur ?'

9
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
View File

@ -99,11 +99,11 @@ config:
all: 'Wszystkie'
rss_limit: 'Link do RSS'
form_user:
two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu"
two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Nazwa'
email_label: 'Adres email'
twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
help_twoFactorAuthentication: "Jeżeli włączysz autoryzację dwuetapową. Za każdym razem, kiedy będziesz chciał się zalogować, dostaniesz kod na swój e-mail."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: Usuń moje konto (niebezpieczna strefa !)
description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany.
@ -533,7 +533,8 @@ user:
email_label: 'Adres email'
enabled_label: 'Włączony'
last_login_label: 'Ostatnie logowanie'
twofactor_label: Autoryzacja dwuetapowa
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: Zapisz
delete: Usuń
delete_confirm: Jesteś pewien?

9
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
rss_limit: 'Número de itens no feed'
form_user:
two_factor_description: 'Habilitar autenticação de dois passos significa que você receberá um e-mail com um código a cada nova conexão desconhecida.'
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Nome'
email_label: 'E-mail'
twoFactorAuthentication_label: 'Autenticação de dois passos'
# help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
# title: Delete my account (a.k.a danger zone)
# description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@ -533,7 +533,8 @@ user:
email_label: 'E-mail'
enabled_label: 'Habilitado'
last_login_label: 'Último login'
twofactor_label: 'Autenticação de dois passos'
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: 'Salvar'
delete: 'Apagar'
delete_confirm: 'Tem certeza?'

9
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
rss_limit: 'Limită RSS'
form_user:
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Nume'
email_label: 'E-mail'
# twoFactorAuthentication_label: 'Two factor authentication'
# help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
# title: Delete my account (a.k.a danger zone)
# description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@ -533,7 +533,8 @@ user:
email_label: 'E-mail'
# enabled_label: 'Enabled'
# last_login_label: 'Last login'
# twofactor_label: Two factor authentication
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
# save: Save
# delete: Delete
# delete_confirm: Are you sure?

9
src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
View File

@ -96,11 +96,11 @@ config:
archive: 'архивные'
rss_limit: 'Количество записей в фиде'
form_user:
two_factor_description: "Включить двухфакторную аутентификацию, Вы получите сообщение на указанный email с кодом, при каждом новом непроверенном подключении."
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Имя'
email_label: 'Email'
twoFactorAuthentication_label: 'Двухфакторная аутентификация'
help_twoFactorAuthentication: "Если Вы включите двухфакторную аутентификацию, то Вы будете получать код на указанный ранее email, каждый раз при входе в wallabag."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: "Удалить мой аккаунт (или опасная зона)"
description: "Если Вы удалите ваш аккаунт, ВСЕ ваши записи, теги и другие данные, будут БЕЗВОЗВРАТНО удалены (операция не может быть отменена после). Затем Вы выйдете из системы."
@ -521,7 +521,8 @@ user:
email_label: 'Email'
enabled_label: 'Включить'
last_login_label: 'Последний вход'
twofactor_label: "Двухфакторная аутентификация"
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: "Сохранить"
delete: "Удалить"
delete_confirm: "Вы уверены?"

9
src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
View File

@ -99,11 +99,11 @@ config:
all: 'ทั้งหมด'
rss_limit: 'จำนวนไอเทมที่เก็บ'
form_user:
two_factor_description: "การเปิดใช้งาน two factor authentication คือคุณจะต้องได้รับอีเมลกับ code ที่ยังไม่ตรวจสอบในการเชื่อมต่อ"
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'ชื่อ'
email_label: 'อีเมล'
twoFactorAuthentication_label: 'Two factor authentication'
help_twoFactorAuthentication: "ถ้าคุณเปิด 2FA, ในแต่ละช่วงเวลาที่คุณต้องการลงชื่อเข้าใช wallabag, คุณจะต้องได้รับ code จากอีเมล"
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
title: ลบบัญชีของฉัน (โซนที่เป็นภัย!)
description: ถ้าคุณลบบัญชีของคุณIf , รายการทั้งหมดของคุณ, แท็กทั้งหมดของคุณ, หมายเหตุทั้งหมดของคุณและบัญชีของคุณจะถูกลบอย่างถาวร (มันไม่สามารถยกเลิกได้) คุณจะต้องลงชื่อออก
@ -531,7 +531,8 @@ user:
email_label: 'อีเมล'
enabled_label: 'เปิดใช้งาน'
last_login_label: 'ลงชื้อเข้าใช้ครั้งสุดท้าย'
twofactor_label: Two factor authentication
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
save: บันทึก
delete: ลบ
delete_confirm: ตุณแน่ใจหรือไม่?

9
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
View File

@ -99,11 +99,11 @@ config:
# all: 'All'
rss_limit: 'RSS içeriğinden talep edilecek makale limiti'
form_user:
two_factor_description: "İki adımlı doğrulamayı aktifleştirdiğinizde, her yeni güvenilmeyen bağlantılarda size e-posta ile bir kod alacaksınız."
# two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'İsim'
email_label: 'E-posta'
twoFactorAuthentication_label: 'İki adımlı doğrulama'
# help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
# emailTwoFactor_label: 'Using email (receive a code by email)'
# googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)'
delete:
# title: Delete my account (a.k.a danger zone)
# description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@ -531,7 +531,8 @@ user:
email_label: 'E-posta'
# enabled_label: 'Enabled'
# last_login_label: 'Last login'
# twofactor_label: Two factor authentication
# twofactor_email_label: Two factor authentication by email
# twofactor_google_label: Two factor authentication by Google
# save: Save
# delete: Delete
# delete_confirm: Are you sure?

88
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
View File

@ -176,43 +176,36 @@
<fieldset class="w500p inline">
<div class="row">
{{ form_label(form.user.twoFactorAuthentication) }}
{{ form_errors(form.user.twoFactorAuthentication) }}
{{ form_widget(form.user.twoFactorAuthentication) }}
{{ form_label(form.user.emailTwoFactor) }}
{{ form_errors(form.user.emailTwoFactor) }}
{{ form_widget(form.user.emailTwoFactor) }}
</div>
<a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
<i class="material-icons">live_help</i>
</a>
<br/>
<div class="row">
{{ form_label(form.user.googleTwoFactor) }}
{{ form_widget(form.user.googleTwoFactor) }}
{{ form_errors(form.user.googleTwoFactor) }}
</div>
{% for OTPSecret in app.session.flashbag.get('OTPSecret') %}
<div class="row">
You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password.
<br/>
That code will disapear after a page reload.
<br/><br/>
<strong>{{ OTPSecret.code }}</strong>
<br/><br/>
Or you can scan that QR Code with your app:
<br/>
<img id="2faQrcode" class="hide-on-med-and-down" />
<script>
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OTPSecret.qrCode }}');;
</script>
</div>
{% endfor %}
</fieldset>
{% endif %}
<h2>{{ 'config.reset.title'|trans }}</h2>
<fieldset class="w500p inline">
<p>{{ 'config.reset.description'|trans }}</p>
<ul>
<li>
<a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.annotations'|trans }}
</a>
</li>
<li>
<a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.tags'|trans }}
</a>
</li>
<li>
<a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.archived'|trans }}
</a>
</li>
<li>
<a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.entries'|trans }}
</a>
</li>
</ul>
</fieldset>
{{ form_widget(form.user._token) }}
{{ form_widget(form.user.save) }}
</form>
@ -277,7 +270,7 @@
{% endfor %}
</ul>
{{ form_start(form.new_tagging_rule) }}
{{ form_start(form.new_tagging_rule) }}
{{ form_errors(form.new_tagging_rule) }}
<fieldset class="w500p inline">
@ -382,4 +375,31 @@
</table>
</div>
</div>
<h2>{{ 'config.reset.title'|trans }}</h2>
<fieldset class="w500p inline">
<p>{{ 'config.reset.description'|trans }}</p>
<ul>
<li>
<a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.annotations'|trans }}
</a>
</li>
<li>
<a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.tags'|trans }}
</a>
</li>
<li>
<a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.archived'|trans }}
</a>
</li>
<li>
<a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
{{ 'config.reset.entries'|trans }}
</a>
</li>
</ul>
</fieldset>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View File

@ -112,8 +112,7 @@
<img id="androidQrcode" class="hide-on-med-and-down" />
</div>
<script>
const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
document.getElementById('androidQrcode').src = imgBase64;
document.getElementById('androidQrcode').src = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');;
</script>
</div>
@ -198,22 +197,38 @@
</div>
{% if twofactor_auth %}
<div class="row">
<div class="input-field col s11">
<div class="row">
{{ 'config.form_user.two_factor_description'|trans }}
<br />
<div class="input-field col s11">
{{ form_widget(form.user.emailTwoFactor) }}
{{ form_label(form.user.emailTwoFactor) }}
{{ form_errors(form.user.emailTwoFactor) }}
</div>
<div class="input-field col s11">
{{ form_widget(form.user.googleTwoFactor) }}
{{ form_label(form.user.googleTwoFactor) }}
{{ form_errors(form.user.googleTwoFactor) }}
</div>
</div>
{{ form_widget(form.user.twoFactorAuthentication) }}
{{ form_label(form.user.twoFactorAuthentication) }}
{{ form_errors(form.user.twoFactorAuthentication) }}
</div>
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
{% for OTPSecret in app.session.flashbag.get('OTPSecret') %}
<div class="card-panel yellow darken-1 black-text">
You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password.
<br/>
That code will disapear after a page reload.
<br/><br/>
<strong>{{ OTPSecret.code }}</strong>
<br/><br/>
Or you can scan that QR Code with your app:
<br/>
<img id="2faQrcode" class="hide-on-med-and-down" />
<script>
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OTPSecret.qrCode }}');;
</script>
</div>
{% endfor %}
{% endif %}
{{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}