浏览代码

[WebAuthn] disable webauthn rootca by mailcow.conf

FreddleSpl0it 3 年之前
父节点
当前提交
0f464658cc
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 3 2
      data/web/inc/prerequisites.inc.php
  2. 1 0
      docker-compose.yml

+ 3 - 2
data/web/inc/prerequisites.inc.php

@@ -62,8 +62,9 @@ $tfa = new RobThree\Auth\TwoFactorAuth($OTP_LABEL, 6, 30, 'sha1', $qrprovider);
 // FIDO2
 // FIDO2
 $formats = $GLOBALS['FIDO2_FORMATS'];
 $formats = $GLOBALS['FIDO2_FORMATS'];
 $WebAuthn = new lbuchs\WebAuthn\WebAuthn('WebAuthn Library', $_SERVER['HTTP_HOST'], $formats);
 $WebAuthn = new lbuchs\WebAuthn\WebAuthn('WebAuthn Library', $_SERVER['HTTP_HOST'], $formats);
-// only include root ca's when dev mode is false, to support testing with chromiums virutal authenticator
-if (!$DEV_MODE){
+// only include root ca's when needed
+$WEBAUTHN_DISABLE_ROOTCA = (getenv('WEBAUTHN_DISABLE_ROOTCA') == 'y');
+if (!$WEBAUTHN_DISABLE_ROOTCA){
     $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/solo.pem');
     $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/solo.pem');
     $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/apple.pem');
     $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/apple.pem');
     $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/nitro.pem');
     $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/nitro.pem');

+ 1 - 0
docker-compose.yml

@@ -157,6 +157,7 @@ services:
         - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
         - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
         - MASTER=${MASTER:-y}
         - MASTER=${MASTER:-y}
         - DEV_MODE=${DEV_MODE:-n}
         - DEV_MODE=${DEV_MODE:-n}
+        - WEBAUTHN_DISABLE_ROOTCA=${WEBAUTHN_DISABLE_ROOTCA:-n}
       restart: always
       restart: always
       networks:
       networks:
         mailcow-network:
         mailcow-network: