Commit 12c33709 authored by epriestley's avatar epriestley
Browse files

When issuing a "no-op" MFA token because no MFA is configured, don't give the...

When issuing a "no-op" MFA token because no MFA is configured, don't give the timeline story a badge

Fixes T13475. Sometimes, we issue a "no op" / "default permit" / "unchallenged" MFA token, when a user with no MFA configured does something which is configured to attempt (but not strictly require) MFA.

An example of this kind of action is changing a username: usernames may be changed even if MFA is not set up.

(Some other operations, notably "Sign With MFA", strictly require that MFA actually be set up.)

When a user with no MFA configured takes a "try MFA" action, we see that they have no factors configured and issue a token so they can continue. This is correct. However, this token causes the assocaited timeline story to get an MFA badge.

This badge is incorrect or at least wildly misleading, since the technical assertion it currently makes ("the user answered any configured MFA challenge to do this, if one exists") isn't explained properly and isn't useful anyway.

Instead, only badge the story if the user actually has MFA and actually responded to some kind of MFA challege. The badge now asserts "this user responded to an MFA challenge", which is expected/desired.

Test Plan:
  - As a user with no MFA, renamed a user. Before patch: badged story. After patch: no badge.
  - As a user with MFA, renamed a user. Got badged stories in both cases.

Maniphest Tasks: T13475

Differential Revision:
parent c99485e8
final class PhabricatorAuthHighSecurityToken extends Phobject {}
final class PhabricatorAuthHighSecurityToken
extends Phobject {
private $isUnchallengedToken = false;
public function setIsUnchallengedToken($is_unchallenged_token) {
$this->isUnchallengedToken = $is_unchallenged_token;
return $this;
public function getIsUnchallengedToken() {
return $this->isUnchallengedToken;
......@@ -493,7 +493,8 @@ final class PhabricatorAuthSessionEngine extends Phobject {
// adds an auth factor, existing sessions won't get a free pass into hisec,
// since they never actually got marked as hisec.
if (!$factors) {
return $this->issueHighSecurityToken($session, true);
return $this->issueHighSecurityToken($session, true)
$this->request = $request;
......@@ -5152,12 +5152,14 @@ abstract class PhabricatorApplicationTransactionEditor
'an MFA check.'));
id(new PhabricatorAuthSessionEngine())
$token = id(new PhabricatorAuthSessionEngine())
->requireHighSecurityToken($actor, $request, $cancel_uri);
foreach ($xactions as $xaction) {
if (!$token->getIsUnchallengedToken()) {
foreach ($xactions as $xaction) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment