2 fa

composer.json

@@ -6,7 +6,12 @@
   "license": "GPL-3.0-only",
   "require": {
     "php": ">=7.3",
-    "ext-json": "*"
+    "ext-json": "*",
+    "moritzdemmer/enzoic": "dev-master",
+    "divineomega/password_exposed": "v3.2.0",
+    "nikolaposa/rate-limit": "dev-master",
+    "spomky-labs/otphp": "v10.0.1",
+    "bacon/bacon-qr-code": "v2.0.3"
   },
   "require-dev": {
     "php-parallel-lint/php-parallel-lint": "^1.2",

menu.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OX>
     <OXMENU id="NAVIGATION_ESHOPADMIN">
-        <MAINMENU id="mxuadmin">
-            <SUBMENU id="oxpspasswordpolicy" cl="admin_oxpspasswordpolicy">
-                <TAB id="oxpspasswordpolicy_main" cl="admin_oxpspasswordpolicy_main" />
-                <BTN id="oxpspasswordpolicy_save" />
+        <MAINMENU id="OXPS_PASSWORDPOLICY_TWOFACTORAUTH_MYDATA">
+            <SUBMENU id="OXPS_PASSWORDPOLICY_TWOFACTORAUTH_LOGIN" cl="admin_twofactoraccount">
+
             </SUBMENU>
         </MAINMENU>
     </OXMENU>

metadata.php

@@ -25,10 +25,36 @@
  * Metadata version
  */
 
+use OxidEsales\Eshop\Application\Component\UserComponent;
+use OxidEsales\Eshop\Application\Controller\AccountPasswordController;
+use OxidEsales\Eshop\Application\Controller\Admin\LoginController;
+use OxidEsales\Eshop\Application\Controller\Admin\UserMain;
 use OxidEsales\Eshop\Core\InputValidator;
 use OxidEsales\Eshop\Core\ViewConfig;
+use OxidEsales\Eshop\Application\Model\User;
+use OxidEsales\Eshop\Application\Controller\Admin\ModuleConfiguration;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyForgotPasswordControllerAdmin;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyTwoFactorRecoveryAdmin;
+use OxidProfessionalServices\PasswordPolicy\Component\PasswordPolicyUserComponent;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyAccountTOTPAdmin;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyLoginController;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyTwoFactorBackupCodeAdmin;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyTwoFactorLoginAdmin;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyTwoFactorRegisterAdmin;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyUserMain;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyAccountTOTP;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyTwoFactorConfirmation;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyTwoFactorBackupCode;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyTwoFactorConfirmationAdmin;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyTwoFactorRecovery;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyTwoFactorRegister;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyTwoFactorLogin;
+use OxidProfessionalServices\PasswordPolicy\Core\PasswordPolicyLanguage;
 use OxidProfessionalServices\PasswordPolicy\Core\PasswordPolicyValidator;
 use OxidProfessionalServices\PasswordPolicy\Core\PasswordPolicyViewConfig;
+use OxidProfessionalServices\PasswordPolicy\Controller\PasswordPolicyAccountPasswordController;
+use OxidProfessionalServices\PasswordPolicy\Model\PasswordPolicyUser;
+use OxidProfessionalServices\PasswordPolicy\Controller\Admin\PasswordPolicyModuleConfiguration;
 
 $sMetadataVersion = '2.1';
 
@@ -52,10 +78,56 @@
     'email' => '[email protected]',
     'extend' => [
         ViewConfig::class => PasswordPolicyViewConfig::class,
-        InputValidator::class => PasswordPolicyValidator::class
+        InputValidator::class => PasswordPolicyValidator::class,
+        AccountPasswordController::class => PasswordPolicyAccountPasswordController::class,
+        User::class => PasswordPolicyUser::class,
+        ModuleConfiguration::class => PasswordPolicyModuleConfiguration::class,
+        UserComponent::class => PasswordPolicyUserComponent::class,
+        LoginController::class => PasswordPolicyLoginController::class,
+        \OxidEsales\Eshop\Core\Language::class => PasswordPolicyLanguage::class,
+        UserMain::class => PasswordPolicyUserMain::class
         ],
-    'controllers' => [],
+    'controllers' => [
+        'twofactorregister' => PasswordPolicyTwoFactorRegister::class,
+        'twofactorlogin' => PasswordPolicyTwoFactorLogin::class,
+        'twofactoraccount' => PasswordPolicyAccountTOTP::class,
+        'twofactorconfirmation' => PasswordPolicyTwoFactorConfirmation::class,
+        'twofactorbackup' => PasswordPolicyTwoFactorBackupCode::class,
+        'twofactorrecovery' => PasswordPolicyTwoFactorRecovery::class,
+        'admin_twofactoraccount' => PasswordPolicyAccountTOTPAdmin::class,
+        'admin_twofactorregister' => PasswordPolicyTwoFactorRegisterAdmin::class,
+        'admin_twofactorconfirmation' => PasswordPolicyTwoFactorConfirmationAdmin::class,
+        'admin_twofactorbackup' => PasswordPolicyTwoFactorBackupCodeAdmin::class,
+        'admin_twofactorlogin' => PasswordPolicyTwoFactorLoginAdmin::class,
+        'admin_twofactorrecovery' => PasswordPolicyTwoFactorRecoveryAdmin::class,
+        'admin_forgotpwd' => PasswordPolicyForgotPasswordControllerAdmin::class,
+
+
+    ],
     'templates' => [
+        'twofactorregister.tpl'   => 'oxps/passwordpolicy/views/tpl/twofactorregister.tpl',
+        'twofactorlogin.tpl' => 'oxps/passwordpolicy/views/tpl/twofactorlogin.tpl',
+        'twofactoraccount.tpl' => 'oxps/passwordpolicy/views/tpl/twofactoraccount.tpl',
+        'twofactorconfirmation.tpl' => 'oxps/passwordpolicy/views/tpl/twofactorconfirmation.tpl',
+        'twofactorbackupcode.tpl' => 'oxps/passwordpolicy/views/tpl/twofactorbackupcode.tpl',
+        'twofactorrecovery.tpl' => 'oxps/passwordpolicy/views/tpl/twofactorrecovery.tpl',
+        'admin_twofactoraccount.tpl' => 'oxps/passwordpolicy/views/admin/tpl/admin_twofactoraccount.tpl',
+        'admin_twofactorregister.tpl' => 'oxps/passwordpolicy/views/admin/tpl/admin_twofactorregister.tpl',
+        'admin_twofactorconfirmation.tpl' => 'oxps/passwordpolicy/views/admin/tpl/admin_twofactorconfirmation.tpl',
+        'admin_twofactorbackupcode.tpl' => 'oxps/passwordpolicy/views/admin/tpl/admin_twofactorbackupcode.tpl',
+        'admin_twofactorlogin.tpl' => 'oxps/passwordpolicy/views/admin/tpl/admin_twofactorlogin.tpl',
+        'admin_twofactorrecovery.tpl' => 'oxps/passwordpolicy/views/admin/tpl/admin_twofactorrecovery.tpl',
+        'message/errors.tpl' => 'oxps/passwordpolicy/views/admin/tpl/message/errors.tpl',
+        'message/error.tpl' => 'oxps/passwordpolicy/views/admin/tpl/message/error.tpl',
+        'email/html/forgotpwd.tpl' => 'oxps/passwordpolicy/views/admin/tpl/email/html/forgotpwd.tpl',
+        'email/html/header.tpl' => 'oxps/passwordpolicy/views/admin/tpl/email/html/header.tpl',
+        'email/html/footer.tpl' => 'oxps/passwordpolicy/views/admin/tpl/email/html/footer.tpl',
+        'email/plain/forgotpwd.tpl' => 'oxps/passwordpolicy/views/admin/tpl/email/plain/forgotpwd.tpl',
+        'forgotpwd.tpl' => 'oxps/passwordpolicy/views/admin/tpl/page/account/forgotpwd.tpl',
+        'layout/page.tpl' => 'oxps/passwordpolicy/views/admin/tpl/layout/page.tpl',
+        'form/forgotpwd_change_pwd.tpl' => 'oxps/passwordpolicy/views/admin/tpl/form/forgotpwd_change_pwd.tpl'
+
+
     ],
     'blocks' => [
         [
@@ -72,7 +144,32 @@
             'template' => 'form/user_password.tpl',
             'block' => 'user_account_password',
             'file' => 'views/blocks/passwordpolicystrengthindicator.tpl',
-        ]
+        ],
+        [
+            'template' => 'form/fieldset/user_account.tpl',
+            'block' => 'user_account_newsletter',
+            'file' => 'views/blocks/user_account.tpl',
+        ],
+        [
+            'template' => 'page/account/inc/account_menu.tpl',
+            'block' => 'account_menu',
+            'file' => 'views/blocks/account_menu.tpl',
+        ],
+        [
+            'template' => 'widget/header/servicebox.tpl',
+            'block' => 'widget_header_servicebox_items',
+            'file' => 'views/blocks/servicebox.tpl',
+        ],
+        [
+            'template' => 'user_main.tpl',
+            'block' => 'admin_user_main_form',
+            'file' => 'views/admin/blocks/user_main.tpl',
+        ],
+        [
+            'template' => 'login.tpl',
+            'block' => 'admin_login_form',
+            'file' => 'views/admin/blocks/login.tpl',
+        ],
     ],
     'settings' => [
         ['group' => 'passwordpolicy', 'name' => 'oxpspasswordpolicyGoodPasswordLength', 'type' => 'num', 'value' => 12],
@@ -81,6 +178,20 @@
         ['group' => 'passwordpolicy_requirements', 'name' => 'oxpspasswordpolicyLowerCase', 'type' => 'bool', 'value' => true],
         ['group' => 'passwordpolicy_requirements', 'name' => 'oxpspasswordpolicySpecial', 'type' => 'bool', 'value' => true],
         ['group' => 'passwordpolicy_requirements', 'name' => 'oxpspasswordpolicyDigits', 'type' => 'bool', 'value' => true],
+        ['group' => 'passwordpolicy_api', 'name' => 'oxpspasswordpolicyAPI', 'type' => 'bool', 'value' => true],
+        ['group' => 'passwordpolicy_api', 'name' => 'oxpspasswordpolicyHaveIBeenPwned', 'type' => 'bool', 'value' => true],
+        ['group' => 'passwordpolicy_api', 'name' => 'oxpspasswordpolicyEnzoic', 'type' => 'bool', 'value' => false],
+        ['group' => 'passwordpolicy_api', 'name' => 'oxpspasswordpolicyEnzoicAPIKey', 'type' => 'str', 'value'=>''],
+        ['group' => 'passwordpolicy_api', 'name' => 'oxpspasswordpolicyEnzoicSecretKey', 'type' => 'str', 'value'=>''],
+        ['group' => 'passwordpolicy_ratelimiting', 'name' => 'oxpspasswordpolicyRateLimiting', 'type' => 'bool', 'value' => true],
+        ['group' => 'passwordpolicy_ratelimiting', 'name' => 'oxpspasswordpolicyRateLimitingDrivers', 'type' => 'select', 'value' => 'APCu', 'constraints' => 'Memcached|APCu'],
+        ['group' => 'passwordpolicy_ratelimiting', 'name' => 'oxpspasswordpolicyRateLimitingLimit', 'type' => 'num', 'value' => 60],
+        ['group' => 'passwordpolicy_ratelimiting', 'name' => 'oxpspasswordpolicyMemcachedHost', 'type' => 'str', 'value' => 'memcached'],
+        ['group' => 'passwordpolicy_ratelimiting', 'name' => 'oxpspasswordpolicyMemcachedPort', 'type' => 'num', 'value' => 11211],
+        ['group' => 'passwordpolicy_twofactor', 'name' => 'oxpspasswordpolicyTOTP', 'type' => 'bool', 'value' => false],
+        ['group' => 'passwordpolicy_admin', 'name' => 'oxpspasswordpolicyadmin', 'type' => 'bool', 'value' => false]
     ],
-    'events' => [],
+    'events'       => array(
+        'onActivate'   => 'OxidProfessionalServices\PasswordPolicy\Core\PasswordPolicyEvents::onActivate',
+    ),
 ];

out/src/css/style.css

@@ -0,0 +1,80 @@
+div.admin-login-box {
+    border: 0;
+    padding: 0;
+    border-radius: 0;
+    background: #fff;
+    box-shadow: 0 20px 40px rgba(0,0,0,0.1);
+    width: 340px;
+    top: 50%;
+    -ms-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    margin: auto;
+    height: unset;
+    right: unset;
+    bottom: unset;
+    left: 50%;
+}
+
+input.w-12 {
+    width: 3rem;
+}
+
+
+input.h-12 {
+    height: 3rem;
+}
+
+
+.flex {
+    display: flex;
+}
+
+.flex-col {
+    flex-direction: column;
+}
+
+.justify-center {
+    justify-content: center;
+}
+
+.sm\:justify-center {
+    justify-content: center;
+}
+
+.md\:justify-center {
+    justify-content: center;
+}
+
+.lg\:justify-center {
+    justify-content: center;
+}
+
+.xl\:justify-center {
+    justify-content: center;
+}
+
+.min-h-screen {
+    min-height: 100vh;
+}
+
+.sm\:min-h-screen {
+    min-height: 100vh;
+}
+
+.md\:min-h-screen {
+    min-height: 100vh;
+}
+
+.lg\:min-h-screen {
+    min-height: 100vh;
+}
+
+.xl\:min-h-screen {
+    min-height: 100vh;
+}
+
+
+.form-control:focus {
+    border-color: #74abb9 !important;
+    box-shadow: 0 0 5px rgb(102, 173, 217) !important;
+}

out/src/js/otpField.js

@@ -0,0 +1,46 @@
+const $otp_length = 6;
+
+const element = document.getElementById('OTPInput');
+for (let i = 0; i < $otp_length; i++) {
+    let inputField = document.createElement('input'); // Creates a new input element
+    inputField.className = "w-12 h-12 bg-light outline-none form-control m-2 text-center rounded";
+    inputField.style.cssText = "color: transparent; text-shadow: 0 0 0 gray;";
+    inputField.id = 'otp-field' + i;
+    inputField.maxLength = 1;
+    element.appendChild(inputField);
+}
+
+const inputs = document.querySelectorAll('#OTPInput > *[id]');
+inputs[0].focus();
+for (let i = 0; i < inputs.length; i++) {
+    inputs[i].addEventListener('keydown', function (event) {
+        if (event.key === "Backspace") {
+            inputs[i].value = '';
+            if (i !== 0) {
+                inputs[i - 1].focus();
+            }
+        } else if (event.key === "ArrowLeft" && i !== 0) {
+            inputs[i - 1].focus();
+        } else if (event.key === "ArrowRight" && i !== inputs.length - 1) {
+            inputs[i + 1].focus();
+        }
+    });
+    inputs[i].addEventListener('input', function () {
+        this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');
+        if (i === inputs.length - 1 && inputs[i].value !== '') {
+            return true;
+        } else if (inputs[i].value !== '') {
+            inputs[i + 1].focus();
+        }
+    });
+
+}
+
+document.getElementById('accUserSaveTop').addEventListener("click", function () {
+    let compiledOtp = '';
+    for (let input of inputs) {
+        compiledOtp += input.value;
+    }
+    document.getElementById('otp').value = compiledOtp;
+    return true;
+});

services.yaml

@@ -0,0 +1,43 @@
+services:
+  OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyValidatorsCollector:
+    class: OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyValidatorsCollector
+    arguments:
+      $validators:
+        - '@OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyPasswordLength'
+        - '@OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyUpperLowerCase'
+        - '@OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyDigits'
+        - '@OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicySpecialCharacter'
+        - '@OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyDataBreach'
+    autowire: true
+  OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyPasswordLength:
+    class: OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyPasswordLength
+    autowire: true;
+  OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyUpperLowerCase:
+    class: OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyUpperLowerCase
+    autowire: true;
+  OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyDigits:
+    class: OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyDigits
+    autowire: true;
+  OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicySpecialCharacter:
+    class: OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicySpecialCharacter
+    autowire: true;
+  OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyDataBreach:
+    class: OxidProfessionalServices\PasswordPolicy\Validators\PasswordPolicyDataBreach
+    autowire: true;
+  OxidProfessionalServices\PasswordPolicy\Core\PasswordPolicyConfig:
+    class: OxidProfessionalServices\PasswordPolicy\Core\PasswordPolicyConfig
+    autowire: true;
+  OxidProfessionalServices\PasswordPolicy\Api\PasswordCheck:
+    class: OxidProfessionalServices\PasswordPolicy\Api\PasswordCheck
+    autowire: true;
+  PasswordPolicyAPCu:
+    class: OxidProfessionalServices\PasswordPolicy\Factory\RateLimiter\PasswordPolicyAPCu
+  PasswordPolicyMemcached:
+    class: OxidProfessionalServices\PasswordPolicy\Factory\RateLimiter\PasswordPolicyMemcached
+    autowire: true;
+  DivineOmega\PasswordExposed\PasswordExposedChecker:
+    class: DivineOmega\PasswordExposed\PasswordExposedChecker
+  OxidProfessionalServices\PasswordPolicy\TwoFactorAuth\PasswordPolicyQrCodeRenderer:
+    class: OxidProfessionalServices\PasswordPolicy\TwoFactorAuth\PasswordPolicyQrCodeRenderer
+  OxidProfessionalServices\PasswordPolicy\TwoFactorAuth\PasswordPolicyTOTP:
+    class: OxidProfessionalServices\PasswordPolicy\TwoFactorAuth\PasswordPolicyTOTP