--- /dev/null
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+
+/**
+ * Add 2fa OTP (named google authenticator).
+ */
+final class Version20181202073750 extends WallabagMigration
+{
+ public function up(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD googleAuthenticatorSecret VARCHAR(191) DEFAULT NULL, CHANGE twoFactorAuthentication emailTwoFactor BOOLEAN NOT NULL, DROP trusted');
+ }
+
+ public function down(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` DROP googleAuthenticatorSecret, CHANGE emailtwofactor twoFactorAuthentication BOOLEAN NOT NULL, ADD trusted TEXT DEFAULT NULL');
+ }
+}
}
};
});
+
+ // mimic radio button because emailTwoFactor is a boolean
+ $('#update_user_googleTwoFactor').on('change', () => {
+ $('#update_user_emailTwoFactor').prop('checked', false);
+ });
+
+ $('#update_user_emailTwoFactor').on('change', () => {
+ $('#update_user_googleTwoFactor').prop('checked', false);
+ });
+
+ // same mimic for super admin
+ $('#user_googleTwoFactor').on('change', () => {
+ $('#user_emailTwoFactor').prop('checked', false);
+ });
+
+ $('#user_emailTwoFactor').on('change', () => {
+ $('#user_googleTwoFactor').prop('checked', false);
+ });
});
$('#tag_label').focus();
return false;
});
+
$('#nav-btn-add').on('click', () => {
toggleNav('.nav-panel-add', '#entry_url');
return false;
});
+
const materialAddForm = $('.nav-panel-add');
materialAddForm.on('submit', () => {
materialAddForm.addClass('disabled');
$('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur');
});
+
$('#nav-btn-search').on('click', () => {
toggleNav('.nav-panel-search', '#search_entry_term');
return false;
});
+
$('.close').on('click', (e) => {
$(e.target).parent('.nav-panel-item').hide(100);
$('.nav-panel-actions').show(100);
$('.nav-panels').css('background', 'transparent');
return false;
});
+
$(window).scroll(() => {
const s = $(window).scrollTop();
const d = $(document).height();
refresh_token_lifetime: 1209600
scheb_two_factor:
- trusted_computer:
+ trusted_device:
enabled: true
cookie_name: wllbg_trusted_computer
- cookie_lifetime: 2592000
+ lifetime: 2592000
+
+ google:
+ enabled: "%twofactor_auth%"
+ template: WallabagUserBundle:Authentication:form.html.twig
email:
enabled: "%twofactor_auth%"
fos_js_routing:
resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
+
+2fa_login:
+ path: /2fa
+ defaults:
+ _controller: "scheb_two_factor.form_controller:form"
+
+2fa_login_check:
+ path: /2fa_check
path: /logout
target: /
+ two_factor:
+ provider: fos_userbundle
+ auth_form_path: 2fa_login
+ check_path: 2fa_login_check
+
access_control:
- { path: ^/api/(doc|version|info|user), roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+ # force role for logout otherwise when 2fa enable, you won't be able to logout
+ # https://github.com/scheb/two-factor-bundle/issues/168#issuecomment-430822478
+ - { path: ^/logout, roles: [IS_AUTHENTICATED_ANONYMOUSLY, IS_AUTHENTICATED_2FA_IN_PROGRESS] }
- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: /(unread|starred|archive|all).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/settings, roles: ROLE_SUPER_ADMIN }
- { path: ^/annotations, roles: ROLE_USER }
+ - { path: ^/2fa, role: IS_AUTHENTICATED_2FA_IN_PROGRESS }
- { path: ^/users, roles: ROLE_SUPER_ADMIN }
- { path: ^/, roles: ROLE_USER }
"issues": "https://github.com/wallabag/wallabag/issues"
},
"require": {
- "php": ">=7.1.0",
+ "php": ">=7.1.3",
"ext-pcre": "*",
"ext-dom": "*",
"ext-curl": "*",
"friendsofsymfony/user-bundle": "2.0.*",
"friendsofsymfony/oauth-server-bundle": "^1.5",
"stof/doctrine-extensions-bundle": "^1.2",
- "scheb/two-factor-bundle": "^2.14",
+ "scheb/two-factor-bundle": "^3.0",
"grandt/phpepub": "dev-master",
"wallabag/php-mobi": "~1.0",
"kphoen/rulerz-bundle": "~0.13",
"config": {
"bin-dir": "bin",
"platform": {
- "php": "7.1"
+ "php": "7.1.3"
}
},
"minimum-stability": "dev",
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'),
]);
}
$activeTheme = $this->get('liip_theme.active_theme');
$activeTheme->setName($config->getTheme());
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.config_saved'
);
$userManager->updateUser($user, true);
}
- $this->get('session')->getFlashBag()->add('notice', $message);
+ $this->addFlash('notice', $message);
return $this->redirect($this->generateUrl('config') . '#set4');
}
]);
$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'
);
$em->persist($config);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.rss_updated'
);
$em->persist($taggingRule);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_updated'
);
return new JsonResponse(['token' => $config->getRssToken()]);
}
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.rss_token_updated'
);
$em->remove($rule);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_deleted'
);
break;
}
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.' . $type . '_reset'
);
->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',
# 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.
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?
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.'
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?'
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.
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?
# 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.
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?
# 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.
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?
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é."
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 ?"
# 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.
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?
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.
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 ?'
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.
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?
# 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.
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?'
# 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.
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?
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: "Если Вы удалите ваш аккаунт, ВСЕ ваши записи, теги и другие данные, будут БЕЗВОЗВРАТНО удалены (операция не может быть отменена после). Затем Вы выйдете из системы."
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: "Вы уверены?"
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 , รายการทั้งหมดของคุณ, แท็กทั้งหมดของคุณ, หมายเหตุทั้งหมดของคุณและบัญชีของคุณจะถูกลบอย่างถาวร (มันไม่สามารถยกเลิกได้) คุณจะต้องลงชื่อออก
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: ตุณแน่ใจหรือไม่?
# 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.
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?
<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>
{% endfor %}
</ul>
- {{ form_start(form.new_tagging_rule) }}
+ {{ form_start(form.new_tagging_rule) }}
{{ form_errors(form.new_tagging_rule) }}
<fieldset class="w500p inline">
</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 %}
<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>
</div>
{% if twofactor_auth %}
- <div class="row">
- <div class="input-field col s11">
+ <div class="row">
{{ 'config.form_user.two_factor_description'|trans }}
- <br />
-
- {{ 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 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>
- </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'}}) }}
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Pagerfanta\Pagerfanta;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\UserBundle\Entity\User;
// enable created user by default
$user->setEnabled(true);
- $form = $this->createForm('Wallabag\UserBundle\Form\NewUserType', $user);
- $form->handleRequest($request);
+ $form = $this->createEditForm('NewUserType', $user, $request);
if ($form->isSubmitted() && $form->isValid()) {
+ $user = $this->handleOtp($form, $user);
$userManager->updateUser($user);
// dispatch a created event so the associated config will be created
*/
public function editAction(Request $request, User $user)
{
+ $userManager = $this->container->get('fos_user.user_manager');
+
$deleteForm = $this->createDeleteForm($user);
- $editForm = $this->createForm('Wallabag\UserBundle\Form\UserType', $user);
- $editForm->handleRequest($request);
+ $form = $this->createEditForm('UserType', $user, $request);
- if ($editForm->isSubmitted() && $editForm->isValid()) {
- $em = $this->getDoctrine()->getManager();
- $em->persist($user);
- $em->flush();
+ if ($form->isSubmitted() && $form->isValid()) {
+ $user = $this->handleOtp($form, $user);
+ $userManager->updateUser($user);
$this->get('session')->getFlashBag()->add(
'notice',
return $this->render('WallabagUserBundle:Manage:edit.html.twig', [
'user' => $user,
- 'edit_form' => $editForm->createView(),
+ 'edit_form' => $form->createView(),
'delete_form' => $deleteForm->createView(),
'twofactor_auth' => $this->getParameter('twofactor_auth'),
]);
}
/**
- * Creates a form to delete a User entity.
+ * Create a form to delete a User entity.
*
* @param User $user The User entity
*
->getForm()
;
}
+
+ /**
+ * Create a form to create or edit a User entity.
+ *
+ * @param string $type Might be NewUserType or UserType
+ * @param User $user The new / edit user
+ * @param Request $request The request
+ *
+ * @return FormInterface
+ */
+ private function createEditForm($type, User $user, Request $request)
+ {
+ $form = $this->createForm('Wallabag\UserBundle\Form\\' . $type, $user);
+ $form->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 === $form->isSubmitted()) {
+ $form->get('googleTwoFactor')->setData(true);
+ }
+
+ return $form;
+ }
+
+ /**
+ * Handle OTP update, taking care to only have one 2fa enable at a time.
+ *
+ * @see ConfigController
+ *
+ * @param FormInterface $form
+ * @param User $user
+ *
+ * @return User
+ */
+ private function handleOtp(FormInterface $form, User $user)
+ {
+ if (true === $form->get('googleTwoFactor')->getData() && false === $user->isGoogleAuthenticatorEnabled()) {
+ $user->setGoogleAuthenticatorSecret($this->get('scheb_two_factor.security.google_authenticator')->generateSecret());
+ $user->setEmailTwoFactor(false);
+
+ return $user;
+ }
+
+ $user->setGoogleAuthenticatorSecret(null);
+
+ return $user;
+ }
}
use JMS\Serializer\Annotation\Accessor;
use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\XmlRoot;
-use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
-use Scheb\TwoFactorBundle\Model\TrustedComputerInterface;
+use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface as EmailTwoFactorInterface;
+use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface as GoogleTwoFactorInterface;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Symfony\Component\Security\Core\User\UserInterface;
use Wallabag\ApiBundle\Entity\Client;
* @UniqueEntity("email")
* @UniqueEntity("username")
*/
-class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface
+class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorInterface
{
use EntityTimestampsTrait;
private $authCode;
/**
- * @var bool
- *
- * @ORM\Column(type="boolean")
+ * @ORM\Column(name="googleAuthenticatorSecret", type="string", nullable=true)
*/
- private $twoFactorAuthentication = false;
+ private $googleAuthenticatorSecret;
/**
- * @ORM\Column(type="json_array", nullable=true)
+ * @var bool
+ *
+ * @ORM\Column(type="boolean")
*/
- private $trusted;
+ private $emailTwoFactor = false;
public function __construct()
{
/**
* @return bool
*/
- public function isTwoFactorAuthentication()
+ public function isEmailTwoFactor()
+ {
+ return $this->emailTwoFactor;
+ }
+
+ /**
+ * @param bool $emailTwoFactor
+ */
+ public function setEmailTwoFactor($emailTwoFactor)
{
- return $this->twoFactorAuthentication;
+ $this->emailTwoFactor = $emailTwoFactor;
}
/**
- * @param bool $twoFactorAuthentication
+ * Used in the user config form to be "like" the email option.
*/
- public function setTwoFactorAuthentication($twoFactorAuthentication)
+ public function isGoogleTwoFactor()
{
- $this->twoFactorAuthentication = $twoFactorAuthentication;
+ return $this->isGoogleAuthenticatorEnabled();
}
- public function isEmailAuthEnabled()
+ /**
+ * {@inheritdoc}
+ */
+ public function isEmailAuthEnabled(): bool
{
- return $this->twoFactorAuthentication;
+ return $this->emailTwoFactor;
}
- public function getEmailAuthCode()
+ /**
+ * {@inheritdoc}
+ */
+ public function getEmailAuthCode(): string
{
return $this->authCode;
}
- public function setEmailAuthCode($authCode)
+ /**
+ * {@inheritdoc}
+ */
+ public function setEmailAuthCode(string $authCode): void
{
$this->authCode = $authCode;
}
- public function addTrustedComputer($token, \DateTime $validUntil)
+ /**
+ * {@inheritdoc}
+ */
+ public function getEmailAuthRecipient(): string
{
- $this->trusted[$token] = $validUntil->format('r');
+ return $this->email;
}
- public function isTrustedComputer($token)
+ /**
+ * {@inheritdoc}
+ */
+ public function isGoogleAuthenticatorEnabled(): bool
{
- if (isset($this->trusted[$token])) {
- $now = new \DateTime();
- $validUntil = new \DateTime($this->trusted[$token]);
+ return $this->googleAuthenticatorSecret ? true : false;
+ }
- return $now < $validUntil;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function getGoogleAuthenticatorUsername(): string
+ {
+ return $this->username;
+ }
- return false;
+ /**
+ * {@inheritdoc}
+ */
+ public function getGoogleAuthenticatorSecret(): string
+ {
+ return $this->googleAuthenticatorSecret;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setGoogleAuthenticatorSecret(?string $googleAuthenticatorSecret): void
+ {
+ $this->googleAuthenticatorSecret = $googleAuthenticatorSecret;
}
/**
'required' => false,
'label' => 'user.form.enabled_label',
])
- ->add('twoFactorAuthentication', CheckboxType::class, [
+ ->add('emailTwoFactor', CheckboxType::class, [
'required' => false,
- 'label' => 'user.form.twofactor_label',
+ 'label' => 'user.form.twofactor_email_label',
+ ])
+ ->add('googleTwoFactor', CheckboxType::class, [
+ 'required' => false,
+ 'label' => 'user.form.twofactor_google_label',
+ 'mapped' => false,
])
->add('save', SubmitType::class, [
'label' => 'user.form.save',
*
* @param TwoFactorInterface $user
*/
- public function sendAuthCode(TwoFactorInterface $user)
+ public function sendAuthCode(TwoFactorInterface $user): void
{
$template = $this->twig->loadTemplate('WallabagUserBundle:TwoFactor:email_auth_code.html.twig');
+{# Override `vendor/scheb/two-factor-bundle/Resources/views/Authentication/form.html.twig` #}
{% extends "WallabagUserBundle::layout.html.twig" %}
{% block fos_user_content %}
-<form class="form" action="" method="post">
+<form class="form" action="{{ path("2fa_login_check") }}" method="post">
<div class="card-content">
<div class="row">
<p class="error">{{ flashMessage|trans }}</p>
{% endfor %}
+ {# Authentication errors #}
+ {% if authenticationError %}
+ <p class="error">{{ authenticationError|trans(authenticationErrorData) }}</p>
+ {% endif %}
+
<div class="input-field col s12">
<label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label>
- <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" />
+ <input id="_auth_code" type="text" autocomplete="off" name="{{ authCodeParameterName }}" />
</div>
- {% if useTrustedOption %}
+ {% if displayTrustedOption %}
<div class="input-field col s12">
- <input id="_trusted" type="checkbox" name="_trusted" />
+ <input id="_trusted" type="checkbox" name="{{ trustedParameterName }}" />
<label for="_trusted">{{ "scheb_two_factor.trusted"|trans }}</label>
</div>
{% endif %}
{% if twofactor_auth %}
<div class="row">
<div class="input-field col s12">
- {{ form_widget(edit_form.twoFactorAuthentication) }}
- {{ form_label(edit_form.twoFactorAuthentication) }}
- {{ form_errors(edit_form.twoFactorAuthentication) }}
+ {{ form_widget(edit_form.emailTwoFactor) }}
+ {{ form_label(edit_form.emailTwoFactor) }}
+ {{ form_errors(edit_form.emailTwoFactor) }}
</div>
+ <div class="input-field col s12">
+ {{ form_widget(edit_form.googleTwoFactor) }}
+ {{ form_label(edit_form.googleTwoFactor) }}
+ {{ form_errors(edit_form.googleTwoFactor) }}
+ </div>
+
+ {% if user.isGoogleAuthenticatorEnabled %}
+ <div class="input-field col s12">
+ <p><strong>OTP Secret</strong>: {{ user.googleAuthenticatorSecret }}</p>
+ </div>
+ {% endif %}
</div>
{% endif %}
$this->assertContains('Username: admin', $tester->getDisplay());
$this->assertContains('Email: bigboss@wallabag.org', $tester->getDisplay());
$this->assertContains('Display name: Big boss', $tester->getDisplay());
- $this->assertContains('2FA activated: no', $tester->getDisplay());
+ $this->assertContains('2FA (email) activated', $tester->getDisplay());
+ $this->assertContains('2FA (OTP) activated', $tester->getDisplay());
}
public function testShowUser()
$this->assertContains('flashes.config.notice.user_updated', $alert[0]);
}
+ public function testUserEnable2faEmail()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/config');
+
+ $this->assertSame(200, $client->getResponse()->getStatusCode());
+
+ $form = $crawler->filter('button[id=update_user_save]')->form();
+
+ $data = [
+ 'update_user[emailTwoFactor]' => '1',
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertSame(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
+ $this->assertContains('flashes.config.notice.user_updated', $alert[0]);
+
+ // restore user
+ $em = $this->getEntityManager();
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->findOneByUsername('admin');
+
+ $this->assertTrue($user->isEmailTwoFactor());
+
+ $user->setEmailTwoFactor(false);
+ $em->persist($user);
+ $em->flush();
+ }
+
+ public function testUserEnable2faGoogle()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/config');
+
+ $this->assertSame(200, $client->getResponse()->getStatusCode());
+
+ $form = $crawler->filter('button[id=update_user_save]')->form();
+
+ $data = [
+ 'update_user[googleTwoFactor]' => '1',
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertSame(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
+ $this->assertContains('flashes.config.notice.user_updated', $alert[0]);
+
+ // restore user
+ $em = $this->getEntityManager();
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->findOneByUsername('admin');
+
+ $this->assertTrue($user->isGoogleAuthenticatorEnabled());
+
+ $user->setGoogleAuthenticatorSecret(null);
+ $em->persist($user);
+ $em->flush();
+ }
+
+ public function testUserEnable2faBoth()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/config');
+
+ $this->assertSame(200, $client->getResponse()->getStatusCode());
+
+ $form = $crawler->filter('button[id=update_user_save]')->form();
+
+ $data = [
+ 'update_user[googleTwoFactor]' => '1',
+ 'update_user[emailTwoFactor]' => '1',
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertSame(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
+ $this->assertContains('flashes.config.notice.user_updated', $alert[0]);
+
+ // restore user
+ $em = $this->getEntityManager();
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->findOneByUsername('admin');
+
+ $this->assertTrue($user->isGoogleAuthenticatorEnabled());
+ $this->assertFalse($user->isEmailTwoFactor());
+
+ $user->setGoogleAuthenticatorSecret(null);
+ $em->persist($user);
+ $em->flush();
+ }
+
public function testRssUpdateResetToken()
{
$this->logInAs('admin');
$this->assertContains('config.form_rss.description', $crawler->filter('body')->extract(['_text'])[0]);
}
- public function testLoginWith2Factor()
+ public function testLoginWith2FactorEmail()
{
$client = $this->getClient();
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
- $user->setTwoFactorAuthentication(true);
+ $user->setEmailTwoFactor(true);
$em->persist($user);
$em->flush();
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
- $user->setTwoFactorAuthentication(false);
+ $user->setEmailTwoFactor(false);
$em->persist($user);
$em->flush();
}
- public function testTrustedComputer()
+ public function testLoginWith2FactorGoogle()
{
$client = $this->getClient();
return;
}
+ $client->followRedirects();
+
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
+ $user->setGoogleAuthenticatorSecret('26LDIHYGHNELOQEM');
+ $em->persist($user);
+ $em->flush();
+
+ $this->logInAsUsingHttp('admin');
+ $crawler = $client->request('GET', '/config');
+ $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]);
- $date = new \DateTime();
- $user->addTrustedComputer('ABCDEF', $date->add(new \DateInterval('P1M')));
- $this->assertTrue($user->isTrustedComputer('ABCDEF'));
- $this->assertFalse($user->isTrustedComputer('FEDCBA'));
+ // restore user
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->findOneByUsername('admin');
+ $user->setGoogleAuthenticatorSecret(null);
+ $em->persist($user);
+ $em->flush();
}
public function testEnabledRegistration()
public function testSendEmail()
{
$user = new User();
- $user->setTwoFactorAuthentication(true);
+ $user->setEmailTwoFactor(true);
$user->setEmailAuthCode(666666);
$user->setEmail('test@wallabag.io');
$user->setName('Bob');
projects / github / wallabag / wallabag.git / commitdiff
