From 2db616b586f473238706e554e809086935e0f33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 13 Oct 2015 22:43:15 +0200 Subject: 2factor authentication via email --- app/AppKernel.php | 1 + app/config/config.yml | 13 +++++++++++++ 2 files changed, 14 insertions(+) (limited to 'app') diff --git a/app/AppKernel.php b/app/AppKernel.php index 6315fcde..2475fe16 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -28,6 +28,7 @@ class AppKernel extends Kernel new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), new FOS\OAuthServerBundle\FOSOAuthServerBundle(), new Wallabag\UserBundle\WallabagUserBundle(), + new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/config/config.yml b/app/config/config.yml index 0d893ecf..b2699c83 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -171,3 +171,16 @@ fos_oauth_server: auth_code_class: Wallabag\ApiBundle\Entity\AuthCode service: user_provider: fos_user.user_manager + +scheb_two_factor: + + trusted_computer: + enabled: true + cookie_name: wllbg_trusted_computer + cookie_lifetime: 5184000 + + email: + enabled: true + sender_email: no-reply@wallabag.org + digits: 6 + template: WallabagUserBundle:Authentication:form.html.twig -- cgit v1.2.3 From 0d6a7929e17c84052cbb3e494d5e5c195c24ca04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 14 Oct 2015 17:10:12 +0200 Subject: add tests for 2factor authentication --- app/config/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index b2699c83..4a2c02bf 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -173,11 +173,10 @@ fos_oauth_server: user_provider: fos_user.user_manager scheb_two_factor: - trusted_computer: enabled: true cookie_name: wllbg_trusted_computer - cookie_lifetime: 5184000 + cookie_lifetime: 2592000 email: enabled: true -- cgit v1.2.3 From 18cf594f8ad4bb5236274cf1326c5e6ea549a570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 15 Oct 2015 13:17:21 +0200 Subject: move 2factor activation in parameters --- app/config/config.yml | 5 +++-- app/config/parameters.yml.dist | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index 4a2c02bf..956fdd07 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -45,6 +45,7 @@ twig: export_mobi: %export_mobi% export_pdf: %export_pdf% version: %app.version% + twofactor_auth: %twofactor_auth% warning_message: %warning_message% paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" flattr_url: "https://flattr.com/thing/1265480" @@ -179,7 +180,7 @@ scheb_two_factor: cookie_lifetime: 2592000 email: - enabled: true - sender_email: no-reply@wallabag.org + enabled: %twofactor_auth% + sender_email: %twofactor_sender% digits: 6 template: WallabagUserBundle:Authentication:form.html.twig diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c1f6bc1b..52f9bccb 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -29,6 +29,8 @@ parameters: # wallabag misc app.version: 2.0.0-alpha + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org # message to display at the bottom of the page warning_message: > -- cgit v1.2.3 From e9b395ec4b27bdcc4151292836ecc602f21c57a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 15 Oct 2015 13:20:44 +0200 Subject: forgot parameters for travis --- app/config/tests/parameters.yml.dist.mysql | 2 ++ app/config/tests/parameters.yml.dist.pgsql | 2 ++ app/config/tests/parameters.yml.dist.sqlite | 2 ++ 3 files changed, 6 insertions(+) (limited to 'app') diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index d8c23634..03fdf5a6 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -29,6 +29,8 @@ parameters: # wallabag misc app.version: 2.0.0-alpha + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org # message to display at the bottom of the page warning_message: > diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 7dc63880..675ba6c9 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -29,6 +29,8 @@ parameters: # wallabag misc app.version: 2.0.0-alpha + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org # message to display at the bottom of the page warning_message: > diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 3ef7cda4..258627af 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -29,6 +29,8 @@ parameters: # wallabag misc app.version: 2.0.0-alpha + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org # message to display at the bottom of the page warning_message: > -- cgit v1.2.3