revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 14:00:56 +01:00
Code Issues Releases Wiki Activity

Fix an issue where Duo validation could incorrectly apply to other factor types

Browse source 
See <https://discourse.phabricator-community.org/t/configuring-mfa-provider-totp-fails-for-missing-duo-only-options/2355>.

Test Plan: Created a TOTP provider; created a Duo provider (with missing and supplied values).
This commit is contained in:
epriestley 2019-02-03 06:36:49 -08:00
parent 7c795ab757
commit db1e123706
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/auth/xaction/PhabricatorAuthFactorProviderDuoCredentialTransaction.php
View file

@ -27,6 +27,10 @@ final class PhabricatorAuthFactorProviderDuoCredentialTransaction
$actor = $this->getActor();
$errors = array();
if (!$this->isDuoProvider($object)) {
return $errors;
}
$old_value = $this->generateOldValue($object);
if ($this->isEmptyTextTransaction($old_value, $xactions)) {
$errors[] = $this->newRequiredError(

4
src/applications/auth/xaction/PhabricatorAuthFactorProviderDuoHostnameTransaction.php
View file

@ -26,6 +26,10 @@ final class PhabricatorAuthFactorProviderDuoHostnameTransaction
public function validateTransactions($object, array $xactions) {
$errors = array();
if (!$this->isDuoProvider($object)) {
return $errors;
}
$old_value = $this->generateOldValue($object);
if ($this->isEmptyTextTransaction($old_value, $xactions)) {
$errors[] = $this->newRequiredError(

10
src/applications/auth/xaction/PhabricatorAuthFactorProviderTransactionType.php
View file

@ -1,4 +1,12 @@
<?php
abstract class PhabricatorAuthFactorProviderTransactionType
extends PhabricatorModularTransactionType {}
extends PhabricatorModularTransactionType {
final protected function isDuoProvider(
PhabricatorAuthFactorProvider $provider) {
$duo_key = id(new PhabricatorDuoAuthFactor())->getFactorKey();
return ($provider->getProviderFactorKey() === $duo_key);
}
}