From: Jérémy Benoist Date: Fri, 26 Jul 2019 12:10:17 +0000 (+0200) Subject: Merge pull request #4068 from wallabag/dependabot/composer/scheb/two-factor-bundle... X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=13fddc353ef71db56d478d6f969d2984e247739d;hp=02a7eb84354cce56c73b4e8fb8294dc67909513f;p=github%2Fwallabag%2Fwallabag.git Merge pull request #4068 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.4.0 Bump scheb/two-factor-bundle from 3.21.0 to 4.4.0 --- diff --git a/composer.json b/composer.json index 46dc409b..af9a9e62 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "friendsofsymfony/user-bundle": "2.0.*", "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2", - "scheb/two-factor-bundle": "^3.0", + "scheb/two-factor-bundle": "^4.4", "grandt/phpepub": "dev-master", "wallabag/php-mobi": "~1.0", "kphoen/rulerz-bundle": "~0.13", diff --git a/composer.lock b/composer.lock index e9173838..32d6e898 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7b43c6d21bc5016660c4e95aa0fdbc12", + "content-hash": "2dfef02524d5e64b49dfca4dc54353c0", "packages": [ { "name": "bdunogier/guzzle-site-authenticator", @@ -56,6 +56,61 @@ "description": "A guzzle plugin that adds, if necessary, authentication data to requests. Uses credentials and cookies, with login requests to the sites.", "time": "2018-12-13T21:06:29+00:00" }, + { + "name": "beberlei/assert", + "version": "v3.2.1", + "source": { + "type": "git", + "url": "https://github.com/beberlei/assert.git", + "reference": "ce139b6bf8f07fb8389d2c8e15b98dc24fdd93c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/beberlei/assert/zipball/ce139b6bf8f07fb8389d2c8e15b98dc24fdd93c7", + "reference": "ce139b6bf8f07fb8389d2c8e15b98dc24fdd93c7", + "shasum": "" + }, + "require": { + "php": "^7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "*", + "phpstan/phpstan-shim": "*", + "phpunit/phpunit": ">=6.0.0 <8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Assert\\": "lib/Assert" + }, + "files": [ + "lib/Assert/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Benjamin Eberlei", + "role": "Lead Developer", + "email": "kontakt@beberlei.de" + }, + { + "name": "Richard Quadling", + "role": "Collaborator", + "email": "rquadling@gmail.com" + } + ], + "description": "Thin assertion library for input validation in business models.", + "keywords": [ + "assert", + "assertion", + "validation" + ], + "time": "2019-05-28T15:18:28+00:00" + }, { "name": "behat/transliterator", "version": "v1.2.0", @@ -5230,6 +5285,68 @@ ], "time": "2019-07-17T20:56:16+00:00" }, + { + "name": "paragonie/constant_time_encoding", + "version": "v2.2.3", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/55af0dc01992b4d0da7f6372e2eac097bbbaffdb", + "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb", + "shasum": "" + }, + "require": { + "php": "^7" + }, + "require-dev": { + "phpunit/phpunit": "^6|^7", + "vimeo/psalm": "^1|^2" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "time": "2019-01-03T20:26:31+00:00" + }, { "name": "paragonie/random_compat", "version": "v2.0.18", @@ -7017,22 +7134,23 @@ }, { "name": "scheb/two-factor-bundle", - "version": "v3.21.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/scheb/two-factor-bundle.git", - "reference": "94cc6f2e0fd8a7b683246d95fcad9b15ca828fc6" + "reference": "5a53ad7fe20e2ca2491fed28a58211509c2e74bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/94cc6f2e0fd8a7b683246d95fcad9b15ca828fc6", - "reference": "94cc6f2e0fd8a7b683246d95fcad9b15ca828fc6", + "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/5a53ad7fe20e2ca2491fed28a58211509c2e74bd", + "reference": "5a53ad7fe20e2ca2491fed28a58211509c2e74bd", "shasum": "" }, "require": { "lcobucci/jwt": "^3.2", + "paragonie/constant_time_encoding": "^2.2", "php": "^7.1.3", - "sonata-project/google-authenticator": "^2.2", + "spomky-labs/otphp": "^9.1", "symfony/config": "^3.4|^4.0", "symfony/dependency-injection": "^3.4|^4.0", "symfony/event-dispatcher": "^3.4|^4.0", @@ -7075,7 +7193,7 @@ "two-factor", "two-step" ], - "time": "2019-07-12T16:11:05+00:00" + "time": "2019-07-12T16:10:17+00:00" }, { "name": "sensio/distribution-bundle", @@ -7552,35 +7670,37 @@ "time": "2019-01-23T09:14:37+00:00" }, { - "name": "sonata-project/google-authenticator", - "version": "2.2.0", + "name": "spomky-labs/otphp", + "version": "v9.1.4", "source": { "type": "git", - "url": "https://github.com/sonata-project/GoogleAuthenticator.git", - "reference": "feda53899b26af24e3db2fe7a3e5f053ca483762" + "url": "https://github.com/Spomky-Labs/otphp.git", + "reference": "48d463cf909320399fe08eab2e1cd18d899d5068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/GoogleAuthenticator/zipball/feda53899b26af24e3db2fe7a3e5f053ca483762", - "reference": "feda53899b26af24e3db2fe7a3e5f053ca483762", + "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/48d463cf909320399fe08eab2e1cd18d899d5068", + "reference": "48d463cf909320399fe08eab2e1cd18d899d5068", "shasum": "" }, "require": { + "beberlei/assert": "^2.4|^3.0", + "paragonie/constant_time_encoding": "^2.0", "php": "^7.1" }, "require-dev": { - "symfony/phpunit-bridge": "^4.0" + "phpunit/phpunit": "^6.0", + "satooshi/php-coveralls": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "9.0.x-dev" } }, "autoload": { "psr-4": { - "Google\\Authenticator\\": "src/", - "Sonata\\GoogleAuthenticator\\": "src/" + "OTPHP\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -7589,24 +7709,26 @@ ], "authors": [ { - "name": "Christian Stocker", - "email": "me@chregu.tv" - }, - { - "name": "Andre DeMarre", - "homepage": "http://www.devnetwork.net/viewtopic.php?f=50&t=94989" + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" }, { - "name": "Thomas Rabaix", - "email": "thomas.rabaix@gmail.com" + "name": "All contributors", + "homepage": "https://github.com/Spomky-Labs/otphp/contributors" } ], - "description": "Library to integrate Google Authenticator into a PHP project", - "homepage": "https://github.com/sonata-project/GoogleAuthenticator", + "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator", + "homepage": "https://github.com/Spomky-Labs/otphp", "keywords": [ - "google authenticator" + "FreeOTP", + "RFC 4226", + "RFC 6238", + "google authenticator", + "hotp", + "otp", + "totp" ], - "time": "2018-07-18T22:08:02+00:00" + "time": "2019-03-18T10:08:51+00:00" }, { "name": "stof/doctrine-extensions-bundle", diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig index 0919646e..1d3685ae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig @@ -35,7 +35,7 @@
- +
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig index 7875d787..6f405d7f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig @@ -39,7 +39,7 @@
- +
diff --git a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig index 47a5cb78..c16a6eaf 100644 --- a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig @@ -16,14 +16,14 @@ {% endif %}
- +
{% if displayTrustedOption %}
- +
{% endif %}
@@ -31,7 +31,7 @@
{{ 'security.login.cancel'|trans }}
diff --git a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php index 93019b1f..6b51f403 100644 --- a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php @@ -48,7 +48,7 @@ class SecurityControllerTest extends WallabagCoreTestCase $this->logInAsUsingHttp('admin'); $crawler = $client->request('GET', '/config'); - $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]); + $this->assertContains('trusted', $crawler->filter('body')->extract(['_text'])[0]); // restore user $user = $em @@ -81,7 +81,7 @@ class SecurityControllerTest extends WallabagCoreTestCase $this->logInAsUsingHttp('admin'); $crawler = $client->request('GET', '/config'); - $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]); + $this->assertContains('trusted', $crawler->filter('body')->extract(['_text'])[0]); // restore user $user = $em