3a035c02e7
Summary: Ref T4140. We could hit a redirect loop for a user with a verified primary email address but no "is verified" flag on their account. This shouldn't be possible since the migration should have set the flag, but we can deal with it more gracefully when it does happen (maybe because users forgot to run `storage/upgrade`, or because of ghosts). In the controller, check the same flag we check before forcing the user to the controller. When verifying, allow the verification if either the email or user flag isn't set. Test Plan: Hit `/login/mustverify/`; verified an address. Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T4140 Differential Revision: https://secure.phabricator.com/D7621
101 lines
3.0 KiB
PHP
101 lines
3.0 KiB
PHP
<?php
|
|
|
|
final class PhabricatorEmailVerificationController
|
|
extends PhabricatorAuthController {
|
|
|
|
private $code;
|
|
|
|
public function willProcessRequest(array $data) {
|
|
$this->code = $data['code'];
|
|
}
|
|
|
|
public function shouldRequireEmailVerification() {
|
|
// Since users need to be able to hit this endpoint in order to verify
|
|
// email, we can't ever require email verification here.
|
|
return false;
|
|
}
|
|
|
|
public function shouldRequireEnabledUser() {
|
|
// Unapproved users are allowed to verify their email addresses. We'll kick
|
|
// disabled users out later.
|
|
return false;
|
|
}
|
|
|
|
public function processRequest() {
|
|
$request = $this->getRequest();
|
|
$user = $request->getUser();
|
|
|
|
if ($user->getIsDisabled()) {
|
|
// We allowed unapproved and disabled users to hit this controller, but
|
|
// want to kick out disabled users now.
|
|
return new Aphront400Response();
|
|
}
|
|
|
|
$email = id(new PhabricatorUserEmail())->loadOneWhere(
|
|
'userPHID = %s AND verificationCode = %s',
|
|
$user->getPHID(),
|
|
$this->code);
|
|
|
|
if (!$email) {
|
|
$title = pht('Unable to Verify Email');
|
|
$content = pht(
|
|
'The verification code you provided is incorrect, or the email '.
|
|
'address has been removed, or the email address is owned by another '.
|
|
'user. Make sure you followed the link in the email correctly and are '.
|
|
'logged in with the user account associated with the email address.');
|
|
$continue = pht('Rats!');
|
|
} else if ($email->getIsVerified() && $user->getIsEmailVerified()) {
|
|
$title = pht('Address Already Verified');
|
|
$content = pht(
|
|
'This email address has already been verified.');
|
|
$continue = pht('Continue to Phabricator');
|
|
} else {
|
|
$guard = AphrontWriteGuard::beginScopedUnguardedWrites();
|
|
$email->openTransaction();
|
|
|
|
$email->setIsVerified(1);
|
|
$email->save();
|
|
|
|
// If the user just verified their primary email address, mark their
|
|
// account as email verified.
|
|
$user_primary = $user->loadPrimaryEmail();
|
|
if ($user_primary->getID() == $email->getID()) {
|
|
$user->setIsEmailVerified(1);
|
|
$user->save();
|
|
}
|
|
|
|
$email->saveTransaction();
|
|
unset($guard);
|
|
|
|
$title = pht('Address Verified');
|
|
$content = pht(
|
|
'The email address %s is now verified.',
|
|
phutil_tag('strong', array(), $email->getAddress()));
|
|
$continue = pht('Continue to Phabricator');
|
|
}
|
|
|
|
$dialog = id(new AphrontDialogView())
|
|
->setUser($user)
|
|
->setTitle($title)
|
|
->setMethod('GET')
|
|
->addCancelButton('/', $continue)
|
|
->appendChild($content);
|
|
|
|
$crumbs = $this->buildApplicationCrumbs();
|
|
$crumbs->addCrumb(
|
|
id(new PhabricatorCrumbView())
|
|
->setName(pht('Verify Email')));
|
|
|
|
return $this->buildApplicationPage(
|
|
array(
|
|
$crumbs,
|
|
$dialog,
|
|
),
|
|
array(
|
|
'title' => pht('Verify Email'),
|
|
'device' => true,
|
|
));
|
|
}
|
|
|
|
}
|