浏览代码

[Web] multiple tfa - domainadmin support

FreddleSpl0it 3 年之前
父节点
当前提交
21fadf6df2
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      data/web/inc/functions.inc.php
  2. 1 1
      data/web/templates/domainadmin.twig

+ 1 - 1
data/web/inc/functions.inc.php

@@ -876,7 +876,7 @@ function check_login($user, $pass, $app_passwd_data = false) {
       if (isset($authenticators['additional']) && is_array($authenticators['additional']) && count($authenticators['additional']) > 0) {
       if (isset($authenticators['additional']) && is_array($authenticators['additional']) && count($authenticators['additional']) > 0) {
         $_SESSION['pending_mailcow_cc_username'] = $user;
         $_SESSION['pending_mailcow_cc_username'] = $user;
         $_SESSION['pending_mailcow_cc_role'] = "domainadmin";
         $_SESSION['pending_mailcow_cc_role'] = "domainadmin";
-        $_SESSION['pending_tfa_method'] = $authenticators['additional'];
+        $_SESSION['pending_tfa_methods'] = $authenticators['additional'];
         unset($_SESSION['ldelay']);
         unset($_SESSION['ldelay']);
         $_SESSION['return'][] =  array(
         $_SESSION['return'][] =  array(
           'type' => 'info',
           'type' => 'info',

+ 1 - 1
data/web/templates/domainadmin.twig

@@ -28,7 +28,7 @@
       <div class="col-sm-9 col-xs-7">
       <div class="col-sm-9 col-xs-7">
         <select id="selectTFA" class="selectpicker" title="{{ lang.tfa.select }}">
         <select id="selectTFA" class="selectpicker" title="{{ lang.tfa.select }}">
           <option value="yubi_otp">{{ lang.tfa.yubi_otp }}</option>
           <option value="yubi_otp">{{ lang.tfa.yubi_otp }}</option>
-          <option value="u2f">{{ lang.tfa.u2f }}</option>
+          <option value="webauthn">{{ lang.tfa.webauthn }}</option>
           <option value="totp">{{ lang.tfa.totp }}</option>
           <option value="totp">{{ lang.tfa.totp }}</option>
           <option value="none">{{ lang.tfa.none }}</option>
           <option value="none">{{ lang.tfa.none }}</option>
         </select>
         </select>