From 66585ee3a18e032d75dd70ade9bf7e45e3d2583b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Tue, 17 May 2022 10:08:08 +0200 Subject: [PATCH 1/5] new: [2FA] added dependency robthree/twofactorauth --- composer.json | 3 ++- composer.lock | 74 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5f02465..5c92f10 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,8 @@ "laminas/laminas-permissions-rbac": "^3.0", "laminas/laminas-log": "^2.11", "laminas/laminas-i18n": "^2.9", - "laminas/laminas-dependency-plugin": "^2.0" + "laminas/laminas-dependency-plugin": "^2.0", + "robthree/twofactorauth": "^1.8" }, "require-dev": { "roave/security-advisories": "dev-master" diff --git a/composer.lock b/composer.lock index f5e7533..8570247 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": "294b3d582dc944b78c66110f80f6b81d", + "content-hash": "33e4a3ed62cfcadcb310c1ae5f756e17", "packages": [ { "name": "brick/math", @@ -5031,6 +5031,76 @@ }, "time": "2020-05-09T13:59:05+00:00" }, + { + "name": "robthree/twofactorauth", + "version": "1.8.2", + "source": { + "type": "git", + "url": "https://github.com/RobThree/TwoFactorAuth.git", + "reference": "65681de5a324eae05140ac58b08648a60212afc0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/65681de5a324eae05140ac58b08648a60212afc0", + "reference": "65681de5a324eae05140ac58b08648a60212afc0", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "require-dev": { + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpunit/phpunit": "@stable" + }, + "suggest": { + "bacon/bacon-qr-code": "Needed for BaconQrCodeProvider provider", + "endroid/qr-code": "Needed for EndroidQrCodeProvider" + }, + "type": "library", + "autoload": { + "psr-4": { + "RobThree\\Auth\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rob Janssen", + "homepage": "http://robiii.me", + "role": "Developer" + } + ], + "description": "Two Factor Authentication", + "homepage": "https://github.com/RobThree/TwoFactorAuth", + "keywords": [ + "Authentication", + "MFA", + "Multi Factor Authentication", + "Two Factor Authentication", + "authenticator", + "authy", + "php", + "tfa" + ], + "support": { + "issues": "https://github.com/RobThree/TwoFactorAuth/issues", + "source": "https://github.com/RobThree/TwoFactorAuth" + }, + "funding": [ + { + "url": "https://paypal.me/robiii", + "type": "custom" + }, + { + "url": "https://github.com/RobThree", + "type": "github" + } + ], + "time": "2022-03-22T16:11:07+00:00" + }, { "name": "symfony/config", "version": "v5.3.11", @@ -6693,5 +6763,5 @@ "ext-pdo": "*" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } From b59fa4682db4b6c8ea1548ecf98e805b7b6cb6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Tue, 17 May 2022 15:34:40 +0200 Subject: [PATCH 2/5] added .editorconfig. !minor --- .editorconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b70b9b1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +insert_final_newline = true +trim_trailing_whitespace = true +end_of_line = lf +charset = utf-8 +max_line_length = 88 + +[*.{yml,yaml,json,js,css,html}] +indent_size = 2 + +[*.{md,rst}] +trim_trailing_whitespace = false + +# tabs 2 spaces for makefiles +[Makefile] +indent_style = tab +indent_size = 2 From ef7e41a0fd05166f2e76e08165e0f88c88e116d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Tue, 17 May 2022 15:40:20 +0200 Subject: [PATCH 3/5] chg: [dependencies] Updated Grunt. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 732fbb8..dde4c5a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "ng_backoffice": "git+https://github.com/monarc-project/ng-backoffice.git#master" }, "devDependencies": { - "grunt": "~1.4.0", - "grunt-cli": "~1.4.2" + "grunt": "~1.5.3", + "grunt-cli": "~1.4.3" } } From 02efbca9186721ce1a14c4eaec16e8ec762bd493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Wed, 18 May 2022 10:19:27 +0200 Subject: [PATCH 4/5] new: [2FA] customizable label for the backoffice. --- config/autoload/local.php.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index edca3b9..d770ac5 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -51,6 +51,8 @@ return array( */ 'activeLanguages' => array('fr','en','de','nl'), + 'instanceName' => 'Development', // for example a short URL or client name from ansible + 'monarc' => array( 'ttl' => 20, // timeout 'salt' => '', // salt privé pour chiffrement pwd From e6114f213e969b909f68c8aa7b6a315088a5a344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 May 2022 11:32:58 +0200 Subject: [PATCH 5/5] updated README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8bd8180..082b24f 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,14 @@ License This software is licensed under [GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html) -- Copyright (C) 2016-2021 Jérôme Lombardi - https://github.com/jerolomb -- Copyright (C) 2016-2021 Juan Rocha - https://github.com/jfrocha -- Copyright (C) 2016-2021 SMILE gie securitymadein.lu -- Copyright (C) 2017-2021 Cédric Bonhomme - https://www.cedricbonhomme.org +- Copyright (C) 2016-2022 SECURITYMADEIN.LU +- Copyright (C) 2016-2022 Jérôme Lombardi - https://github.com/jerolomb +- Copyright (C) 2016-2022 Juan Rocha - https://github.com/jfrocha +- Copyright (C) 2017-2022 Cédric Bonhomme - https://www.cedricbonhomme.org - Copyright (C) 2016-2017 Guillaume Lesniak - Copyright (C) 2016-2017 Thomas Metois - Copyright (C) 2016-2017 Jérôme De Almeida -- Copyright (C) 2019-2021 Ruslan Baidan - https://github.com/ruslanbaydan +- Copyright (C) 2019-2022 Ruslan Baidan - https://github.com/ruslanbaydan For more information, [the list of authors and contributors](AUTHORS) is available.