No OneTemporary
Actions

Size

91 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
	index 32c0101b8a..799a8e691e 100644
	--- a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
	@@ -1,87 +1,81 @@
	<?php

	final class PhabricatorAuthConfirmLinkController
	extends PhabricatorAuthController {

	- private $accountKey;
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $accountkey = $request->getURIData('akey');

	- public function willProcessRequest(array $data) {
	- $this->accountKey = idx($data, 'akey');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	-
	- $result = $this->loadAccountForRegistrationOrLinking($this->accountKey);
	+ $result = $this->loadAccountForRegistrationOrLinking($accountkey);
	list($account, $provider, $response) = $result;

	if ($response) {
	return $response;
	}

	if (!$provider->shouldAllowAccountLink()) {
	return $this->renderError(pht('This account is not linkable.'));
	}

	$panel_uri = '/settings/panel/external/';

	if ($request->isFormPost()) {
	$account->setUserPHID($viewer->getPHID());
	$account->save();

	$this->clearRegistrationCookies();

	// TODO: Send the user email about the new account link.

	return id(new AphrontRedirectResponse())->setURI($panel_uri);
	}

	// TODO: Provide more information about the external account. Clicking
	// through this form blindly is dangerous.

	// TODO: If the user has password authentication, require them to retype
	// their password here.

	$dialog = id(new AphrontDialogView())
	->setUser($viewer)
	->setTitle(pht('Confirm %s Account Link', $provider->getProviderName()))
	->addCancelButton($panel_uri)
	->addSubmitButton(pht('Confirm Account Link'));

	$form = id(new PHUIFormLayoutView())
	->setFullWidth(true)
	->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'aphront-form-instructions',
	),
	pht(
	'Confirm the link with this %s account. This account will be '.
	'able to log in to your Phabricator account.',
	$provider->getProviderName())))
	->appendChild(
	id(new PhabricatorAuthAccountView())
	->setUser($viewer)
	->setExternalAccount($account)
	->setAuthProvider($provider));

	$dialog->appendChild($form);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Confirm Link'), $panel_uri);
	$crumbs->addTextCrumb($provider->getProviderName());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$dialog,
	),
	array(
	'title' => pht('Confirm External Account Link'),
	));
	}


	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthDowngradeSessionController.php b/src/applications/auth/controller/PhabricatorAuthDowngradeSessionController.php
	index c4b6b2ad43..4981845876 100644
	--- a/src/applications/auth/controller/PhabricatorAuthDowngradeSessionController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthDowngradeSessionController.php
	@@ -1,49 +1,48 @@
	<?php

	final class PhabricatorAuthDowngradeSessionController
	extends PhabricatorAuthController {

	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	$panel_uri = '/settings/panel/sessions/';

	$session = $viewer->getSession();
	if ($session->getHighSecurityUntil() < time()) {
	return $this->newDialog()
	->setTitle(pht('Normal Security Restored'))
	->appendParagraph(
	pht('Your session is no longer in high security.'))
	->addCancelButton($panel_uri, pht('Continue'));
	}

	if ($request->isFormPost()) {

	id(new PhabricatorAuthSessionEngine())
	->exitHighSecurity($viewer, $session);

	return id(new AphrontRedirectResponse())
	->setURI($this->getApplicationURI('session/downgrade/'));
	}

	return $this->newDialog()
	->setTitle(pht('Leaving High Security'))
	->appendParagraph(
	pht(
	'Leave high security and return your session to normal '.
	'security levels?'))
	->appendParagraph(
	pht(
	'If you leave high security, you will need to authenticate '.
	'again the next time you try to take a high security action.'))
	->appendParagraph(
	pht(
	'On the plus side, that purple notification bubble will '.
	'disappear.'))
	->addSubmitButton(pht('Leave High Security'))
	->addCancelButton($panel_uri, pht('Stay'));
	}


	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthFinishController.php b/src/applications/auth/controller/PhabricatorAuthFinishController.php
	index 82f4d72b26..387679b44e 100644
	--- a/src/applications/auth/controller/PhabricatorAuthFinishController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthFinishController.php
	@@ -1,84 +1,83 @@
	<?php

	final class PhabricatorAuthFinishController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldAllowPartialSessions() {
	return true;
	}

	public function shouldAllowLegallyNonCompliantUsers() {
	return true;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	// If the user already has a full session, just kick them out of here.
	$has_partial_session = $viewer->hasSession() &&
	$viewer->getSession()->getIsPartial();
	if (!$has_partial_session) {
	return id(new AphrontRedirectResponse())->setURI('/');
	}

	$engine = new PhabricatorAuthSessionEngine();

	// If this cookie is set, the user is headed into a high security area
	// after login (normally because of a password reset) so if they are
	// able to pass the checkpoint we just want to put their account directly
	// into high security mode, rather than prompt them again for the same
	// set of credentials.
	$jump_into_hisec = $request->getCookie(PhabricatorCookies::COOKIE_HISEC);

	try {
	$token = $engine->requireHighSecuritySession(
	$viewer,
	$request,
	'/logout/',
	$jump_into_hisec);
	} catch (PhabricatorAuthHighSecurityRequiredException $ex) {
	$form = id(new PhabricatorAuthSessionEngine())->renderHighSecurityForm(
	$ex->getFactors(),
	$ex->getFactorValidationResults(),
	$viewer,
	$request);

	return $this->newDialog()
	->setTitle(pht('Provide Multi-Factor Credentials'))
	->setShortTitle(pht('Multi-Factor Login'))
	->setWidth(AphrontDialogView::WIDTH_FORM)
	->addHiddenInput(AphrontRequest::TYPE_HISEC, true)
	->appendParagraph(
	pht(
	'Welcome, %s. To complete the login process, provide your '.
	'multi-factor credentials.',
	phutil_tag('strong', array(), $viewer->getUsername())))
	->appendChild($form->buildLayoutView())
	->setSubmitURI($request->getPath())
	->addCancelButton($ex->getCancelURI())
	->addSubmitButton(pht('Continue'));
	}

	// Upgrade the partial session to a full session.
	$engine->upgradePartialSession($viewer);

	// TODO: It might be nice to add options like "bind this session to my IP"
	// here, even for accounts without multi-factor auth attached to them.

	$next = PhabricatorCookies::getNextURICookie($request);
	$request->clearCookie(PhabricatorCookies::COOKIE_NEXTURI);
	$request->clearCookie(PhabricatorCookies::COOKIE_HISEC);

	if (!PhabricatorEnv::isValidLocalURIForLink($next)) {
	$next = '/';
	}

	return id(new AphrontRedirectResponse())->setURI($next);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthLinkController.php b/src/applications/auth/controller/PhabricatorAuthLinkController.php
	index 75d63004b4..d50bcf1d8a 100644
	--- a/src/applications/auth/controller/PhabricatorAuthLinkController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthLinkController.php
	@@ -1,137 +1,130 @@
	<?php

	final class PhabricatorAuthLinkController
	extends PhabricatorAuthController {

	- private $action;
	- private $providerKey;
	-
	- public function willProcessRequest(array $data) {
	- $this->providerKey = $data['pkey'];
	- $this->action = $data['action'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $action = $request->getURIData('action');
	+ $provider_key = $request->getURIData('pkey');

	$provider = PhabricatorAuthProvider::getEnabledProviderByKey(
	- $this->providerKey);
	+ $provider_key);
	if (!$provider) {
	return new Aphront404Response();
	}

	- switch ($this->action) {
	+ switch ($action) {
	case 'link':
	if (!$provider->shouldAllowAccountLink()) {
	return $this->renderErrorPage(
	pht('Account Not Linkable'),
	array(
	pht('This provider is not configured to allow linking.'),
	));
	}
	break;
	case 'refresh':
	if (!$provider->shouldAllowAccountRefresh()) {
	return $this->renderErrorPage(
	pht('Account Not Refreshable'),
	array(
	pht('This provider does not allow refreshing.'),
	));
	}
	break;
	default:
	return new Aphront400Response();
	}

	$account = id(new PhabricatorExternalAccount())->loadOneWhere(
	'accountType = %s AND accountDomain = %s AND userPHID = %s',
	$provider->getProviderType(),
	$provider->getProviderDomain(),
	$viewer->getPHID());

	- switch ($this->action) {
	+ switch ($action) {
	case 'link':
	if ($account) {
	return $this->renderErrorPage(
	pht('Account Already Linked'),
	array(
	pht(
	'Your Phabricator account is already linked to an external '.
	'account for this provider.'),
	));
	}
	break;
	case 'refresh':
	if (!$account) {
	return $this->renderErrorPage(
	pht('No Account Linked'),
	array(
	pht(
	'You do not have a linked account on this provider, and thus '.
	'can not refresh it.'),
	));
	}
	break;
	default:
	return new Aphront400Response();
	}

	$panel_uri = '/settings/panel/external/';

	PhabricatorCookies::setClientIDCookie($request);

	- switch ($this->action) {
	+ switch ($action) {
	case 'link':
	id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
	$viewer,
	$request,
	$panel_uri);

	$form = $provider->buildLinkForm($this);
	break;
	case 'refresh':
	$form = $provider->buildRefreshForm($this);
	break;
	default:
	return new Aphront400Response();
	}

	if ($provider->isLoginFormAButton()) {
	require_celerity_resource('auth-css');
	$form = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-link-button pl',
	),
	$form);
	}

	- switch ($this->action) {
	+ switch ($action) {
	case 'link':
	$name = pht('Link Account');
	$title = pht('Link %s Account', $provider->getProviderName());
	break;
	case 'refresh':
	$name = pht('Refresh Account');
	$title = pht('Refresh %s Account', $provider->getProviderName());
	break;
	default:
	return new Aphront400Response();
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Link Account'), $panel_uri);
	$crumbs->addTextCrumb($provider->getProviderName($name));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$form,
	),
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthLoginController.php b/src/applications/auth/controller/PhabricatorAuthLoginController.php
	index e3cbeaa2c6..65d462cb8e 100644
	--- a/src/applications/auth/controller/PhabricatorAuthLoginController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthLoginController.php
	@@ -1,254 +1,250 @@
	<?php

	final class PhabricatorAuthLoginController
	extends PhabricatorAuthController {

	private $providerKey;
	private $extraURIData;
	private $provider;

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldAllowRestrictedParameter($parameter_name) {
	// Whitelist the OAuth 'code' parameter.

	if ($parameter_name == 'code') {
	return true;
	}
	return parent::shouldAllowRestrictedParameter($parameter_name);
	}

	- public function willProcessRequest(array $data) {
	- $this->providerKey = $data['pkey'];
	- $this->extraURIData = idx($data, 'extra');
	- }
	-
	public function getExtraURIData() {
	return $this->extraURIData;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $this->providerKey = $request->getURIData('pkey');
	+ $this->extraURIData = $request->getURIData('extra');

	$response = $this->loadProvider();
	if ($response) {
	return $response;
	}

	$provider = $this->provider;

	try {
	list($account, $response) = $provider->processLoginRequest($this);
	} catch (PhutilAuthUserAbortedException $ex) {
	if ($viewer->isLoggedIn()) {
	// If a logged-in user cancels, take them back to the external accounts
	// panel.
	$next_uri = '/settings/panel/external/';
	} else {
	// If a logged-out user cancels, take them back to the auth start page.
	$next_uri = '/';
	}

	// User explicitly hit "Cancel".
	$dialog = id(new AphrontDialogView())
	->setUser($viewer)
	->setTitle(pht('Authentication Canceled'))
	->appendChild(
	pht('You canceled authentication.'))
	->addCancelButton($next_uri, pht('Continue'));
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	if ($response) {
	return $response;
	}

	if (!$account) {
	throw new Exception(
	pht(
	'Auth provider failed to load an account from %s!',
	'processLoginRequest()'));
	}

	if ($account->getUserPHID()) {
	// The account is already attached to a Phabricator user, so this is
	// either a login or a bad account link request.
	if (!$viewer->isLoggedIn()) {
	if ($provider->shouldAllowLogin()) {
	return $this->processLoginUser($account);
	} else {
	return $this->renderError(
	pht(
	'The external account ("%s") you just authenticated with is '.
	'not configured to allow logins on this Phabricator install. '.
	'An administrator may have recently disabled it.',
	$provider->getProviderName()));
	}
	} else if ($viewer->getPHID() == $account->getUserPHID()) {
	// This is either an attempt to re-link an existing and already
	// linked account (which is silly) or a refresh of an external account
	// (e.g., an OAuth account).
	return id(new AphrontRedirectResponse())
	->setURI('/settings/panel/external/');
	} else {
	return $this->renderError(
	pht(
	'The external account ("%s") you just used to login is already '.
	'associated with another Phabricator user account. Login to the '.
	'other Phabricator account and unlink the external account before '.
	'linking it to a new Phabricator account.',
	$provider->getProviderName()));
	}
	} else {
	// The account is not yet attached to a Phabricator user, so this is
	// either a registration or an account link request.
	if (!$viewer->isLoggedIn()) {
	if ($provider->shouldAllowRegistration()) {
	return $this->processRegisterUser($account);
	} else {
	return $this->renderError(
	pht(
	'The external account ("%s") you just authenticated with is '.
	'not configured to allow registration on this Phabricator '.
	'install. An administrator may have recently disabled it.',
	$provider->getProviderName()));
	}
	} else {
	if ($provider->shouldAllowAccountLink()) {
	return $this->processLinkUser($account);
	} else {
	return $this->renderError(
	pht(
	'The external account ("%s") you just authenticated with is '.
	'not configured to allow account linking on this Phabricator '.
	'install. An administrator may have recently disabled it.',
	$provider->getProviderName()));
	}
	}
	}

	// This should be unreachable, but fail explicitly if we get here somehow.
	return new Aphront400Response();
	}

	private function processLoginUser(PhabricatorExternalAccount $account) {
	$user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$account->getUserPHID());

	if (!$user) {
	return $this->renderError(
	pht(
	'The external account you just logged in with is not associated '.
	'with a valid Phabricator user.'));
	}

	return $this->loginUser($user);
	}

	private function processRegisterUser(PhabricatorExternalAccount $account) {
	$account_secret = $account->getAccountSecret();
	$register_uri = $this->getApplicationURI('register/'.$account_secret.'/');
	return $this->setAccountKeyAndContinue($account, $register_uri);
	}

	private function processLinkUser(PhabricatorExternalAccount $account) {
	$account_secret = $account->getAccountSecret();
	$confirm_uri = $this->getApplicationURI('confirmlink/'.$account_secret.'/');
	return $this->setAccountKeyAndContinue($account, $confirm_uri);
	}

	private function setAccountKeyAndContinue(
	PhabricatorExternalAccount $account,
	$next_uri) {

	if ($account->getUserPHID()) {
	throw new Exception(pht('Account is already registered or linked.'));
	}

	// Regenerate the registration secret key, set it on the external account,
	// set a cookie on the user's machine, and redirect them to registration.
	// See PhabricatorAuthRegisterController for discussion of the registration
	// key.

	$registration_key = Filesystem::readRandomCharacters(32);
	$account->setProperty(
	'registrationKey',
	PhabricatorHash::digest($registration_key));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$account->save();
	unset($unguarded);

	$this->getRequest()->setTemporaryCookie(
	PhabricatorCookies::COOKIE_REGISTRATION,
	$registration_key);

	return id(new AphrontRedirectResponse())->setURI($next_uri);
	}

	private function loadProvider() {
	$provider = PhabricatorAuthProvider::getEnabledProviderByKey(
	$this->providerKey);

	if (!$provider) {
	return $this->renderError(
	pht(
	'The account you are attempting to login with uses a nonexistent '.
	'or disabled authentication provider (with key "%s"). An '.
	'administrator may have recently disabled this provider.',
	$this->providerKey));
	}

	$this->provider = $provider;

	return null;
	}

	protected function renderError($message) {
	return $this->renderErrorPage(
	pht('Login Failed'),
	array($message));
	}

	public function buildProviderPageResponse(
	PhabricatorAuthProvider $provider,
	$content) {

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);

	if ($this->getRequest()->getUser()->isLoggedIn()) {
	$crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI());
	} else {
	$crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/'));
	}

	$crumbs->addTextCrumb($provider->getProviderName());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$content,
	),
	array(
	'title' => pht('Login'),
	));
	}

	public function buildProviderErrorResponse(
	PhabricatorAuthProvider $provider,
	$message) {

	$message = pht(
	'Authentication provider ("%s") encountered an error during login. %s',
	$provider->getProviderName(),
	$message);

	return $this->renderError($message);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php b/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
	index 8e0bf99551..0d07470560 100644
	--- a/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
	@@ -1,39 +1,38 @@
	<?php

	final class PhabricatorAuthNeedsApprovalController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldRequireEmailVerification() {
	return false;
	}

	public function shouldRequireEnabledUser() {
	return false;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	$wait_for_approval = pht(
	"Your account has been created, but needs to be approved by an ".
	"administrator. You'll receive an email once your account is approved.");

	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('Wait for Approval'))
	->appendChild($wait_for_approval)
	->addCancelButton('/', pht('Wait Patiently'));

	return $this->buildApplicationPage(
	$dialog,
	array(
	'title' => pht('Wait For Approval'),
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
	index 975355ec97..aaf3864156 100644
	--- a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
	@@ -1,91 +1,90 @@
	<?php

	final class PhabricatorAuthNeedsMultiFactorController
	extends PhabricatorAuthController {

	public function shouldRequireMultiFactorEnrollment() {
	// Users need access to this controller in order to enroll in multi-factor
	// auth.
	return false;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	$panel = id(new PhabricatorMultiFactorSettingsPanel())
	->setUser($viewer)
	->setViewer($viewer)
	->setOverrideURI($this->getApplicationURI('/multifactor/'))
	->processRequest($request);

	if ($panel instanceof AphrontResponse) {
	return $panel;
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Add Multi-Factor Auth'));

	$viewer->updateMultiFactorEnrollment();

	if (!$viewer->getIsEnrolledInMultiFactor()) {
	$help = id(new PHUIInfoView())
	->setTitle(pht('Add Multi-Factor Authentication To Your Account'))
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(
	array(
	pht(
	'Before you can use Phabricator, you need to add multi-factor '.
	'authentication to your account.'),
	pht(
	'Multi-factor authentication helps secure your account by '.
	'making it more difficult for attackers to gain access or '.
	'take sensitive actions.'),
	pht(
	'To learn more about multi-factor authentication, click the '.
	'%s button below.',
	phutil_tag('strong', array(), pht('Help'))),
	pht(
	'To add an authentication factor, click the %s button below.',
	phutil_tag('strong', array(), pht('Add Authentication Factor'))),
	pht(
	'To continue, add at least one authentication factor to your '.
	'account.'),
	));
	} else {
	$help = id(new PHUIInfoView())
	->setTitle(pht('Multi-Factor Authentication Configured'))
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setErrors(
	array(
	pht(
	'You have successfully configured multi-factor authentication '.
	'for your account.'),
	pht(
	'You can make adjustments from the Settings panel later.'),
	pht(
	'When you are ready, %s.',
	phutil_tag(
	'strong',
	array(),
	phutil_tag(
	'a',
	array(
	'href' => '/',
	),
	pht('continue to Phabricator')))),
	));
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$help,
	$panel,
	),
	array(
	'title' => pht('Add Multi-Factor Authentication'),
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php b/src/applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php
	index cc7f362583..6b75b929ab 100644
	--- a/src/applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php
	@@ -1,45 +1,41 @@
	<?php

	final class PhabricatorAuthOldOAuthRedirectController
	extends PhabricatorAuthController {

	- private $provider;
	-
	public function shouldRequireLogin() {
	return false;
	}

	public function shouldAllowRestrictedParameter($parameter_name) {
	if ($parameter_name == 'code') {
	return true;
	}
	return parent::shouldAllowRestrictedParameter($parameter_name);
	}

	- public function willProcessRequest(array $data) {
	- $this->provider = $data['provider'];
	- }
	-
	- public function processRequest() {
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $provider = $request->getURIData('provider');
	// TODO: Most OAuth providers are OK with changing the redirect URI, but
	// Google and GitHub are strict. We need to respect the old OAuth URI until
	// we can get installs to migrate. This just keeps the old OAuth URI working
	// by redirecting to the new one.

	$provider_map = array(
	'google' => 'google:google.com',
	'github' => 'github:github.com',
	);

	- if (!isset($provider_map[$this->provider])) {
	+ if (!isset($provider_map[$provider])) {
	return new Aphront404Response();
	}

	- $provider_key = $provider_map[$this->provider];
	+ $provider_key = $provider_map[$provider];

	$uri = $this->getRequest()->getRequestURI();
	$uri->setPath($this->getApplicationURI('login/'.$provider_key.'/'));
	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
	index 312367d03a..91f3d6a984 100644
	--- a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
	@@ -1,199 +1,191 @@
	<?php

	final class PhabricatorAuthOneTimeLoginController
	extends PhabricatorAuthController {

	- private $id;
	- private $key;
	- private $emailID;
	- private $linkType;
	-
	public function shouldRequireLogin() {
	return false;
	}

	- public function willProcessRequest(array $data) {
	- $this->linkType = $data['type'];
	- $this->id = $data['id'];
	- $this->key = $data['key'];
	- $this->emailID = idx($data, 'emailID');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');
	+ $link_type = $request->getURIData('key');
	+ $key = $request->getURIData('type');
	+ $email_id = $request->getURIData('emailID');

	if ($request->getUser()->isLoggedIn()) {
	return $this->renderError(
	pht('You are already logged in.'));
	}

	$target_user = id(new PhabricatorPeopleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	- ->withIDs(array($this->id))
	+ ->withIDs(array($id))
	->executeOne();
	if (!$target_user) {
	return new Aphront404Response();
	}

	// NOTE: As a convenience to users, these one-time login URIs may also
	// be associated with an email address which will be verified when the
	// URI is used.

	// This improves the new user experience for users receiving "Welcome"
	// emails on installs that require verification: if we did not verify the
	// email, they'd immediately get roadblocked with a "Verify Your Email"
	// error and have to go back to their email account, wait for a
	// "Verification" email, and then click that link to actually get access to
	// their account. This is hugely unwieldy, and if the link was only sent
	// to the user's email in the first place we can safely verify it as a
	// side effect of login.

	// The email hashed into the URI so users can't verify some email they
	// do not own by doing this:
	//
	// - Add some address you do not own;
	// - request a password reset;
	// - change the URI in the email to the address you don't own;
	// - login via the email link; and
	// - get a "verified" address you don't control.

	$target_email = null;
	- if ($this->emailID) {
	+ if ($email_id) {
	$target_email = id(new PhabricatorUserEmail())->loadOneWhere(
	'userPHID = %s AND id = %d',
	$target_user->getPHID(),
	- $this->emailID);
	+ $email_id);
	if (!$target_email) {
	return new Aphront404Response();
	}
	}

	$engine = new PhabricatorAuthSessionEngine();
	$token = $engine->loadOneTimeLoginKey(
	$target_user,
	$target_email,
	- $this->key);
	+ $key);

	if (!$token) {
	return $this->newDialog()
	->setTitle(pht('Unable to Login'))
	->setShortTitle(pht('Login Failure'))
	->appendParagraph(
	pht(
	'The login link you clicked is invalid, out of date, or has '.
	'already been used.'))
	->appendParagraph(
	pht(
	'Make sure you are copy-and-pasting the entire link into '.
	'your browser. Login links are only valid for 24 hours, and '.
	'can only be used once.'))
	->appendParagraph(
	pht('You can try again, or request a new link via email.'))
	->addCancelButton('/login/email/', pht('Send Another Email'));
	}

	if ($request->isFormPost()) {
	// If we have an email bound into this URI, verify email so that clicking
	// the link in the "Welcome" email is good enough, without requiring users
	// to go through a second round of email verification.

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	// Nuke the token and all other outstanding password reset tokens.
	// There is no particular security benefit to destroying them all, but
	// it should reduce HackerOne reports of nebulous harm.

	PhabricatorAuthTemporaryToken::revokeTokens(
	$target_user,
	array($target_user->getPHID()),
	array(
	PhabricatorAuthSessionEngine::ONETIME_TEMPORARY_TOKEN_TYPE,
	PhabricatorAuthSessionEngine::PASSWORD_TEMPORARY_TOKEN_TYPE,
	));

	if ($target_email) {
	id(new PhabricatorUserEditor())
	->setActor($target_user)
	->verifyEmail($target_user, $target_email);
	}
	unset($unguarded);

	$next = '/';
	if (!PhabricatorPasswordAuthProvider::getPasswordProvider()) {
	$next = '/settings/panel/external/';
	} else {

	// We're going to let the user reset their password without knowing
	// the old one. Generate a one-time token for that.
	$key = Filesystem::readRandomCharacters(16);

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	id(new PhabricatorAuthTemporaryToken())
	->setObjectPHID($target_user->getPHID())
	->setTokenType(
	PhabricatorAuthSessionEngine::PASSWORD_TEMPORARY_TOKEN_TYPE)
	->setTokenExpires(time() + phutil_units('1 hour in seconds'))
	->setTokenCode(PhabricatorHash::digest($key))
	->save();
	unset($unguarded);

	$next = (string)id(new PhutilURI('/settings/panel/password/'))
	->setQueryParams(
	array(
	'key' => $key,
	));

	$request->setTemporaryCookie(PhabricatorCookies::COOKIE_HISEC, 'yes');
	}

	PhabricatorCookies::setNextURICookie($request, $next, $force = true);

	return $this->loginUser($target_user);
	}

	// NOTE: We need to CSRF here so attackers can't generate an email link,
	// then log a user in to an account they control via sneaky invisible
	// form submissions.

	- switch ($this->linkType) {
	+ switch ($link_type) {
	case PhabricatorAuthSessionEngine::ONETIME_WELCOME:
	$title = pht('Welcome to Phabricator');
	break;
	case PhabricatorAuthSessionEngine::ONETIME_RECOVER:
	$title = pht('Account Recovery');
	break;
	case PhabricatorAuthSessionEngine::ONETIME_USERNAME:
	case PhabricatorAuthSessionEngine::ONETIME_RESET:
	default:
	$title = pht('Login to Phabricator');
	break;
	}

	$body = array();
	$body[] = pht(
	'Use the button below to log in as: %s',
	phutil_tag('strong', array(), $target_user->getUsername()));

	if ($target_email && !$target_email->getIsVerified()) {
	$body[] = pht(
	'Logging in will verify %s as an email address you own.',
	phutil_tag('strong', array(), $target_email->getAddress()));

	}

	$body[] = pht(
	'After logging in you should set a password for your account, or '.
	'link your account to an external account that you can use to '.
	'authenticate in the future.');

	$dialog = $this->newDialog()
	->setTitle($title)
	->addSubmitButton(pht('Login (%s)', $target_user->getUsername()))
	->addCancelButton('/');

	foreach ($body as $paragraph) {
	$dialog->appendParagraph($paragraph);
	}

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}
	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
	index 9341345143..655f63acb9 100644
	--- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
	@@ -1,656 +1,651 @@
	<?php

	final class PhabricatorAuthRegisterController
	extends PhabricatorAuthController {

	- private $accountKey;
	-
	public function shouldRequireLogin() {
	return false;
	}

	- public function willProcessRequest(array $data) {
	- $this->accountKey = idx($data, 'akey');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $account_key = $request->getURIData('akey');

	if ($request->getUser()->isLoggedIn()) {
	return $this->renderError(pht('You are already logged in.'));
	}

	$is_setup = false;
	- if (strlen($this->accountKey)) {
	- $result = $this->loadAccountForRegistrationOrLinking($this->accountKey);
	+ if (strlen($account_key)) {
	+ $result = $this->loadAccountForRegistrationOrLinking($account_key);
	list($account, $provider, $response) = $result;
	$is_default = false;
	} else if ($this->isFirstTimeSetup()) {
	list($account, $provider, $response) = $this->loadSetupAccount();
	$is_default = true;
	$is_setup = true;
	} else {
	list($account, $provider, $response) = $this->loadDefaultAccount();
	$is_default = true;
	}

	if ($response) {
	return $response;
	}

	$invite = $this->loadInvite();

	if (!$provider->shouldAllowRegistration()) {
	if ($invite) {
	// If the user has an invite, we allow them to register with any
	// provider, even a login-only provider.
	} else {
	// TODO: This is a routine error if you click "Login" on an external
	// auth source which doesn't allow registration. The error should be
	// more tailored.

	return $this->renderError(
	pht(
	'The account you are attempting to register with uses an '.
	'authentication provider ("%s") which does not allow '.
	'registration. An administrator may have recently disabled '.
	'registration with this provider.',
	$provider->getProviderName()));
	}
	}

	$user = new PhabricatorUser();

	$default_username = $account->getUsername();
	$default_realname = $account->getRealName();

	$default_email = $account->getEmail();

	if ($invite) {
	$default_email = $invite->getEmailAddress();
	}

	if (!PhabricatorUserEmail::isValidAddress($default_email)) {
	$default_email = null;
	}

	if ($default_email !== null) {
	// We should bypass policy here becase e.g. limiting an application use
	// to a subset of users should not allow the others to overwrite
	// configured application emails
	$application_email = id(new PhabricatorMetaMTAApplicationEmailQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withAddresses(array($default_email))
	->executeOne();
	if ($application_email) {
	$default_email = null;
	}
	}

	if ($default_email !== null) {
	// If the account source provided an email, but it's not allowed by
	// the configuration, roadblock the user. Previously, we let the user
	// pick a valid email address instead, but this does not align well with
	// user expectation and it's not clear the cases it enables are valuable.
	// See discussion in T3472.
	if (!PhabricatorUserEmail::isAllowedAddress($default_email)) {
	return $this->renderError(
	array(
	pht(
	'The account you are attempting to register with has an invalid '.
	'email address (%s). This Phabricator install only allows '.
	'registration with specific email addresses:',
	$default_email),
	phutil_tag('br'),
	phutil_tag('br'),
	PhabricatorUserEmail::describeAllowedAddresses(),
	));
	}

	// If the account source provided an email, but another account already
	// has that email, just pretend we didn't get an email.

	// TODO: See T3472.

	if ($default_email !== null) {
	$same_email = id(new PhabricatorUserEmail())->loadOneWhere(
	'address = %s',
	$default_email);
	if ($same_email) {
	if ($invite) {
	// We're allowing this to continue. The fact that we loaded the
	// invite means that the address is nonprimary and unverified and
	// we're OK to steal it.
	} else {
	$default_email = null;
	}
	}
	}
	}

	$profile = id(new PhabricatorRegistrationProfile())
	->setDefaultUsername($default_username)
	->setDefaultEmail($default_email)
	->setDefaultRealName($default_realname)
	->setCanEditUsername(true)
	->setCanEditEmail(($default_email === null))
	->setCanEditRealName(true)
	->setShouldVerifyEmail(false);

	$event_type = PhabricatorEventType::TYPE_AUTH_WILLREGISTERUSER;
	$event_data = array(
	'account' => $account,
	'profile' => $profile,
	);

	$event = id(new PhabricatorEvent($event_type, $event_data))
	->setUser($user);
	PhutilEventEngine::dispatchEvent($event);

	$default_username = $profile->getDefaultUsername();
	$default_email = $profile->getDefaultEmail();
	$default_realname = $profile->getDefaultRealName();

	$can_edit_username = $profile->getCanEditUsername();
	$can_edit_email = $profile->getCanEditEmail();
	$can_edit_realname = $profile->getCanEditRealName();

	$must_set_password = $provider->shouldRequireRegistrationPassword();

	$can_edit_anything = $profile->getCanEditAnything() \|\| $must_set_password;
	$force_verify = $profile->getShouldVerifyEmail();

	// Automatically verify the administrator's email address during first-time
	// setup.
	if ($is_setup) {
	$force_verify = true;
	}

	$value_username = $default_username;
	$value_realname = $default_realname;
	$value_email = $default_email;
	$value_password = null;

	$errors = array();

	$require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');

	$e_username = strlen($value_username) ? null : true;
	$e_realname = $require_real_name ? true : null;
	$e_email = strlen($value_email) ? null : true;
	$e_password = true;
	$e_captcha = true;

	$skip_captcha = false;
	if ($invite) {
	// If the user is accepting an invite, assume they're trustworthy enough
	// that we don't need to CAPTCHA them.
	$skip_captcha = true;
	}

	$min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
	$min_len = (int)$min_len;

	$from_invite = $request->getStr('invite');
	if ($from_invite && $can_edit_username) {
	$value_username = $request->getStr('username');
	$e_username = null;
	}

	if (($request->isFormPost() \|\| !$can_edit_anything) && !$from_invite) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();

	if ($must_set_password && !$skip_captcha) {
	$e_captcha = pht('Again');

	$captcha_ok = AphrontFormRecaptchaControl::processCaptcha($request);
	if (!$captcha_ok) {
	$errors[] = pht('Captcha response is incorrect, try again.');
	$e_captcha = pht('Invalid');
	}
	}

	if ($can_edit_username) {
	$value_username = $request->getStr('username');
	if (!strlen($value_username)) {
	$e_username = pht('Required');
	$errors[] = pht('Username is required.');
	} else if (!PhabricatorUser::validateUsername($value_username)) {
	$e_username = pht('Invalid');
	$errors[] = PhabricatorUser::describeValidUsername();
	} else {
	$e_username = null;
	}
	}

	if ($must_set_password) {
	$value_password = $request->getStr('password');
	$value_confirm = $request->getStr('confirm');
	if (!strlen($value_password)) {
	$e_password = pht('Required');
	$errors[] = pht('You must choose a password.');
	} else if ($value_password !== $value_confirm) {
	$e_password = pht('No Match');
	$errors[] = pht('Password and confirmation must match.');
	} else if (strlen($value_password) < $min_len) {
	$e_password = pht('Too Short');
	$errors[] = pht(
	'Password is too short (must be at least %d characters long).',
	$min_len);
	} else if (
	PhabricatorCommonPasswords::isCommonPassword($value_password)) {

	$e_password = pht('Very Weak');
	$errors[] = pht(
	'Password is pathologically weak. This password is one of the '.
	'most common passwords in use, and is extremely easy for '.
	'attackers to guess. You must choose a stronger password.');
	} else {
	$e_password = null;
	}
	}

	if ($can_edit_email) {
	$value_email = $request->getStr('email');
	if (!strlen($value_email)) {
	$e_email = pht('Required');
	$errors[] = pht('Email is required.');
	} else if (!PhabricatorUserEmail::isValidAddress($value_email)) {
	$e_email = pht('Invalid');
	$errors[] = PhabricatorUserEmail::describeValidAddresses();
	} else if (!PhabricatorUserEmail::isAllowedAddress($value_email)) {
	$e_email = pht('Disallowed');
	$errors[] = PhabricatorUserEmail::describeAllowedAddresses();
	} else {
	$e_email = null;
	}
	}

	if ($can_edit_realname) {
	$value_realname = $request->getStr('realName');
	if (!strlen($value_realname) && $require_real_name) {
	$e_realname = pht('Required');
	$errors[] = pht('Real name is required.');
	} else {
	$e_realname = null;
	}
	}

	if (!$errors) {
	$image = $this->loadProfilePicture($account);
	if ($image) {
	$user->setProfileImagePHID($image->getPHID());
	}

	try {
	$verify_email = false;

	if ($force_verify) {
	$verify_email = true;
	}

	if ($value_email === $default_email) {
	if ($account->getEmailVerified()) {
	$verify_email = true;
	}

	if ($provider->shouldTrustEmails()) {
	$verify_email = true;
	}

	if ($invite) {
	$verify_email = true;
	}
	}

	$email_obj = null;
	if ($invite) {
	// If we have a valid invite, this email may exist but be
	// nonprimary and unverified, so we'll reassign it.
	$email_obj = id(new PhabricatorUserEmail())->loadOneWhere(
	'address = %s',
	$value_email);
	}
	if (!$email_obj) {
	$email_obj = id(new PhabricatorUserEmail())
	->setAddress($value_email);
	}

	$email_obj->setIsVerified((int)$verify_email);

	$user->setUsername($value_username);
	$user->setRealname($value_realname);

	if ($is_setup) {
	$must_approve = false;
	} else if ($invite) {
	$must_approve = false;
	} else {
	$must_approve = PhabricatorEnv::getEnvConfig(
	'auth.require-approval');
	}

	if ($must_approve) {
	$user->setIsApproved(0);
	} else {
	$user->setIsApproved(1);
	}

	if ($invite) {
	$allow_reassign_email = true;
	} else {
	$allow_reassign_email = false;
	}

	$user->openTransaction();

	$editor = id(new PhabricatorUserEditor())
	->setActor($user);

	$editor->createNewUser($user, $email_obj, $allow_reassign_email);
	if ($must_set_password) {
	$envelope = new PhutilOpaqueEnvelope($value_password);
	$editor->changePassword($user, $envelope);
	}

	if ($is_setup) {
	$editor->makeAdminUser($user, true);
	}

	$account->setUserPHID($user->getPHID());
	$provider->willRegisterAccount($account);
	$account->save();

	$user->saveTransaction();

	if (!$email_obj->getIsVerified()) {
	$email_obj->sendVerificationEmail($user);
	}

	if ($must_approve) {
	$this->sendWaitingForApprovalEmail($user);
	}

	if ($invite) {
	$invite->setAcceptedByPHID($user->getPHID())->save();
	}

	return $this->loginUser($user);
	} catch (AphrontDuplicateKeyQueryException $exception) {
	$same_username = id(new PhabricatorUser())->loadOneWhere(
	'userName = %s',
	$user->getUserName());

	$same_email = id(new PhabricatorUserEmail())->loadOneWhere(
	'address = %s',
	$value_email);

	if ($same_username) {
	$e_username = pht('Duplicate');
	$errors[] = pht('Another user already has that username.');
	}

	if ($same_email) {
	// TODO: See T3340.
	$e_email = pht('Duplicate');
	$errors[] = pht('Another user already has that email.');
	}

	if (!$same_username && !$same_email) {
	throw $exception;
	}
	}
	}

	unset($unguarded);
	}

	$form = id(new AphrontFormView())
	->setUser($request->getUser());

	if (!$is_default) {
	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('External Account'))
	->setValue(
	id(new PhabricatorAuthAccountView())
	->setUser($request->getUser())
	->setExternalAccount($account)
	->setAuthProvider($provider)));
	}


	if ($can_edit_username) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Phabricator Username'))
	->setName('username')
	->setValue($value_username)
	->setError($e_username));
	} else {
	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Phabricator Username'))
	->setValue($value_username)
	->setError($e_username));
	}

	if ($can_edit_realname) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Real Name'))
	->setName('realName')
	->setValue($value_realname)
	->setError($e_realname));
	}

	if ($must_set_password) {
	$form->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel(pht('Password'))
	->setName('password')
	->setError($e_password));
	$form->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel(pht('Confirm Password'))
	->setName('confirm')
	->setError($e_password)
	->setCaption(
	$min_len
	? pht('Minimum length of %d characters.', $min_len)
	: null));
	}

	if ($can_edit_email) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Email'))
	->setName('email')
	->setValue($value_email)
	->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
	->setError($e_email));
	}

	if ($must_set_password && !$skip_captcha) {
	$form->appendChild(
	id(new AphrontFormRecaptchaControl())
	->setLabel(pht('Captcha'))
	->setError($e_captcha));
	}

	$submit = id(new AphrontFormSubmitControl());

	if ($is_setup) {
	$submit
	->setValue(pht('Create Admin Account'));
	} else {
	$submit
	->addCancelButton($this->getApplicationURI('start/'))
	->setValue(pht('Register Phabricator Account'));
	}


	$form->appendChild($submit);

	$crumbs = $this->buildApplicationCrumbs();

	if ($is_setup) {
	$crumbs->addTextCrumb(pht('Setup Admin Account'));
	$title = pht('Welcome to Phabricator');
	} else {
	$crumbs->addTextCrumb(pht('Register'));
	$crumbs->addTextCrumb($provider->getProviderName());
	$title = pht('Phabricator Registration');
	}

	$welcome_view = null;
	if ($is_setup) {
	$welcome_view = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setTitle(pht('Welcome to Phabricator'))
	->appendChild(
	pht(
	'Installation is complete. Register your administrator account '.
	'below to log in. You will be able to configure options and add '.
	'other authentication mechanisms (like LDAP or OAuth) later on.'));
	}

	$object_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setForm($form)
	->setFormErrors($errors);

	$invite_header = null;
	if ($invite) {
	$invite_header = $this->renderInviteHeader($invite);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$welcome_view,
	$invite_header,
	$object_box,
	),
	array(
	'title' => $title,
	));
	}

	private function loadDefaultAccount() {
	$providers = PhabricatorAuthProvider::getAllEnabledProviders();
	$account = null;
	$provider = null;
	$response = null;

	foreach ($providers as $key => $candidate_provider) {
	if (!$candidate_provider->shouldAllowRegistration()) {
	unset($providers[$key]);
	continue;
	}
	if (!$candidate_provider->isDefaultRegistrationProvider()) {
	unset($providers[$key]);
	}
	}

	if (!$providers) {
	$response = $this->renderError(
	pht(
	'There are no configured default registration providers.'));
	return array($account, $provider, $response);
	} else if (count($providers) > 1) {
	$response = $this->renderError(
	pht('There are too many configured default registration providers.'));
	return array($account, $provider, $response);
	}

	$provider = head($providers);
	$account = $provider->getDefaultExternalAccount();

	return array($account, $provider, $response);
	}

	private function loadSetupAccount() {
	$provider = new PhabricatorPasswordAuthProvider();
	$provider->attachProviderConfig(
	id(new PhabricatorAuthProviderConfig())
	->setShouldAllowRegistration(1)
	->setShouldAllowLogin(1)
	->setIsEnabled(true));

	$account = $provider->getDefaultExternalAccount();
	$response = null;
	return array($account, $provider, $response);
	}

	private function loadProfilePicture(PhabricatorExternalAccount $account) {
	$phid = $account->getProfileImagePHID();
	if (!$phid) {
	return null;
	}

	// NOTE: Use of omnipotent user is okay here because the registering user
	// can not control the field value, and we can't use their user object to
	// do meaningful policy checks anyway since they have not registered yet.
	// Reaching this means the user holds the account secret key and the
	// registration secret key, and thus has permission to view the image.

	$file = id(new PhabricatorFileQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(array($phid))
	->executeOne();
	if (!$file) {
	return null;
	}

	$xform = PhabricatorFileTransform::getTransformByKey(
	PhabricatorFileThumbnailTransform::TRANSFORM_PROFILE);
	return $xform->executeTransform($file);
	}

	protected function renderError($message) {
	return $this->renderErrorPage(
	pht('Registration Failed'),
	array($message));
	}

	private function sendWaitingForApprovalEmail(PhabricatorUser $user) {
	$title = '[Phabricator] '.pht(
	'New User "%s" Awaiting Approval',
	$user->getUsername());

	$body = new PhabricatorMetaMTAMailBody();

	$body->addRawSection(
	pht(
	'Newly registered user "%s" is awaiting account approval by an '.
	'administrator.',
	$user->getUsername()));

	$body->addLinkSection(
	pht('APPROVAL QUEUE'),
	PhabricatorEnv::getProductionURI(
	'/people/query/approval/'));

	$body->addLinkSection(
	pht('DISABLE APPROVAL QUEUE'),
	PhabricatorEnv::getProductionURI(
	'/config/edit/auth.require-approval/'));

	$admins = id(new PhabricatorPeopleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withIsAdmin(true)
	->execute();

	if (!$admins) {
	return;
	}

	$mail = id(new PhabricatorMetaMTAMail())
	->addTos(mpull($admins, 'getPHID'))
	->setSubject($title)
	->setBody($body->render())
	->saveAndSend();
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthRevokeTokenController.php b/src/applications/auth/controller/PhabricatorAuthRevokeTokenController.php
	index 27981eee27..c1f0c21cb1 100644
	--- a/src/applications/auth/controller/PhabricatorAuthRevokeTokenController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthRevokeTokenController.php
	@@ -1,78 +1,72 @@
	<?php

	final class PhabricatorAuthRevokeTokenController
	extends PhabricatorAuthController {

	- private $id;
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');

	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	-
	- $is_all = ($this->id === 'all');
	+ $is_all = ($id === 'all');

	$query = id(new PhabricatorAuthTemporaryTokenQuery())
	->setViewer($viewer)
	->withObjectPHIDs(array($viewer->getPHID()));
	if (!$is_all) {
	- $query->withIDs(array($this->id));
	+ $query->withIDs(array($id));
	}

	$tokens = $query->execute();
	foreach ($tokens as $key => $token) {
	if (!$token->isRevocable()) {
	// Don't revoke unrevocable tokens.
	unset($tokens[$key]);
	}
	}

	$panel_uri = '/settings/panel/tokens/';

	if (!$tokens) {
	return $this->newDialog()
	->setTitle(pht('No Matching Tokens'))
	->appendParagraph(
	pht('There are no matching tokens to revoke.'))
	->appendParagraph(
	pht(
	'(Some types of token can not be revoked, and you can not revoke '.
	'tokens which have already expired.)'))
	->addCancelButton($panel_uri);
	}

	if ($request->isDialogFormPost()) {
	foreach ($tokens as $token) {
	$token->revokeToken();
	}
	return id(new AphrontRedirectResponse())->setURI($panel_uri);
	}

	if ($is_all) {
	$title = pht('Revoke Tokens?');
	$short = pht('Revoke Tokens');
	$body = pht(
	'Really revoke all tokens? Among other temporary authorizations, '.
	'this will disable any outstanding password reset or account '.
	'recovery links.');
	} else {
	$title = pht('Revoke Token?');
	$short = pht('Revoke Token');
	$body = pht(
	'Really revoke this token? Any temporary authorization it enables '.
	'will be disabled.');
	}

	return $this->newDialog()
	->setTitle($title)
	->setShortTitle($short)
	->appendParagraph($body)
	->addSubmitButton(pht('Revoke'))
	->addCancelButton($panel_uri);
	}


	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php b/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php
	index bb4acd0b4d..d09d52cc14 100644
	--- a/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php
	@@ -1,143 +1,143 @@
	<?php

	final class PhabricatorAuthSSHKeyEditController
	extends PhabricatorAuthSSHKeyController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	-
	$id = $request->getURIData('id');
	+
	if ($id) {
	$key = id(new PhabricatorAuthSSHKeyQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$key) {
	return new Aphront404Response();
	}

	$is_new = false;
	} else {
	$key = $this->newKeyForObjectPHID($request->getStr('objectPHID'));
	if (!$key) {
	return new Aphront404Response();
	}
	$is_new = true;
	}

	$cancel_uri = $key->getObject()->getSSHPublicKeyManagementURI($viewer);

	if ($key->getIsTrusted()) {
	$id = $key->getID();

	return $this->newDialog()
	->setTitle(pht('Can Not Edit Trusted Key'))
	->appendParagraph(
	pht(
	'This key is trusted. Trusted keys can not be edited. '.
	'Use %s to revoke trust before editing the key.',
	phutil_tag(
	'tt',
	array(),
	"bin/almanac untrust-key --id {$id}")))
	->addCancelButton($cancel_uri, pht('Okay'));
	}

	$token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
	$viewer,
	$request,
	$cancel_uri);

	$v_name = $key->getName();
	$e_name = strlen($v_name) ? null : true;

	$v_key = $key->getEntireKey();
	$e_key = strlen($v_key) ? null : true;

	$errors = array();
	if ($request->isFormPost()) {
	$v_name = $request->getStr('name');
	$v_key = $request->getStr('key');

	if (!strlen($v_name)) {
	$errors[] = pht('You must provide a name for this public key.');
	$e_name = pht('Required');
	} else {
	$key->setName($v_name);
	}

	if (!strlen($v_key)) {
	$errors[] = pht('You must provide a public key.');
	$e_key = pht('Required');
	} else {
	try {
	$public_key = PhabricatorAuthSSHPublicKey::newFromRawKey($v_key);

	$type = $public_key->getType();
	$body = $public_key->getBody();
	$comment = $public_key->getComment();

	$key->setKeyType($type);
	$key->setKeyBody($body);
	$key->setKeyComment($comment);

	$e_key = null;
	} catch (Exception $ex) {
	$e_key = pht('Invalid');
	$errors[] = $ex->getMessage();
	}
	}

	if (!$errors) {
	try {
	$key->save();
	return id(new AphrontRedirectResponse())->setURI($cancel_uri);
	} catch (Exception $ex) {
	$e_key = pht('Duplicate');
	$errors[] = pht(
	'This public key is already associated with another user or '.
	'device. Each key must unambiguously identify a single unique '.
	'owner.');
	}
	}
	}

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setError($e_name)
	->setValue($v_name))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Public Key'))
	->setName('key')
	->setValue($v_key)
	->setError($e_key));

	if ($is_new) {
	$title = pht('Upload SSH Public Key');
	$save_button = pht('Upload Public Key');
	$form->addHiddenInput('objectPHID', $key->getObject()->getPHID());
	} else {
	$title = pht('Edit SSH Public Key');
	$save_button = pht('Save Changes');
	}

	return $this->newDialog()
	->setTitle($title)
	->setWidth(AphrontDialogView::WIDTH_FORM)
	->setErrors($errors)
	->appendForm($form)
	->addSubmitButton($save_button)
	->addCancelButton($cancel_uri);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthTerminateSessionController.php b/src/applications/auth/controller/PhabricatorAuthTerminateSessionController.php
	index d2534c4a45..ae8179a798 100644
	--- a/src/applications/auth/controller/PhabricatorAuthTerminateSessionController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthTerminateSessionController.php
	@@ -1,80 +1,74 @@
	<?php

	final class PhabricatorAuthTerminateSessionController
	extends PhabricatorAuthController {

	- private $id;
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');

	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	-
	- $is_all = ($this->id === 'all');
	+ $is_all = ($id === 'all');

	$query = id(new PhabricatorAuthSessionQuery())
	->setViewer($viewer)
	->withIdentityPHIDs(array($viewer->getPHID()));
	if (!$is_all) {
	- $query->withIDs(array($this->id));
	+ $query->withIDs(array($id));
	}

	$current_key = PhabricatorHash::digest(
	$request->getCookie(PhabricatorCookies::COOKIE_SESSION));

	$sessions = $query->execute();
	foreach ($sessions as $key => $session) {
	if ($session->getSessionKey() == $current_key) {
	// Don't terminate the current login session.
	unset($sessions[$key]);
	}
	}

	$panel_uri = '/settings/panel/sessions/';

	if (!$sessions) {
	return $this->newDialog()
	->setTitle(pht('No Matching Sessions'))
	->appendParagraph(
	pht('There are no matching sessions to terminate.'))
	->appendParagraph(
	pht(
	'(You can not terminate your current login session. To '.
	'terminate it, log out.)'))
	->addCancelButton($panel_uri);
	}

	if ($request->isDialogFormPost()) {
	foreach ($sessions as $session) {
	$session->delete();
	}
	return id(new AphrontRedirectResponse())->setURI($panel_uri);
	}

	if ($is_all) {
	$title = pht('Terminate Sessions?');
	$short = pht('Terminate Sessions');
	$body = pht(
	'Really terminate all sessions? (Your current login session will '.
	'not be terminated.)');
	} else {
	$title = pht('Terminate Session?');
	$short = pht('Terminate Session');
	$body = pht(
	'Really terminate session %s?',
	phutil_tag('strong', array(), substr($session->getSessionKey(), 0, 6)));
	}

	return $this->newDialog()
	->setTitle($title)
	->setShortTitle($short)
	->appendParagraph($body)
	->addSubmitButton(pht('Terminate'))
	->addCancelButton($panel_uri);
	}


	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthUnlinkController.php b/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
	index a5bdf90b70..3f694207b9 100644
	--- a/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
	@@ -1,149 +1,145 @@
	<?php

	final class PhabricatorAuthUnlinkController
	extends PhabricatorAuthController {

	private $providerKey;

	- public function willProcessRequest(array $data) {
	- $this->providerKey = $data['pkey'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $this->providerKey = $request->getURIData('pkey');

	list($type, $domain) = explode(':', $this->providerKey, 2);

	// Check that this account link actually exists. We don't require the
	// provider to exist because we want users to be able to delete links to
	// dead accounts if they want.
	$account = id(new PhabricatorExternalAccount())->loadOneWhere(
	'accountType = %s AND accountDomain = %s AND userPHID = %s',
	$type,
	$domain,
	$viewer->getPHID());
	if (!$account) {
	return $this->renderNoAccountErrorDialog();
	}

	// Check that the provider (if it exists) allows accounts to be unlinked.
	$provider_key = $this->providerKey;
	$provider = PhabricatorAuthProvider::getEnabledProviderByKey($provider_key);
	if ($provider) {
	if (!$provider->shouldAllowAccountUnlink()) {
	return $this->renderNotUnlinkableErrorDialog($provider);
	}
	}

	// Check that this account isn't the last account which can be used to
	// login. We prevent you from removing the last account.
	if ($account->isUsableForLogin()) {
	$other_accounts = id(new PhabricatorExternalAccount())->loadAllWhere(
	'userPHID = %s',
	$viewer->getPHID());

	$valid_accounts = 0;
	foreach ($other_accounts as $other_account) {
	if ($other_account->isUsableForLogin()) {
	$valid_accounts++;
	}
	}

	if ($valid_accounts < 2) {
	return $this->renderLastUsableAccountErrorDialog();
	}
	}

	if ($request->isDialogFormPost()) {
	$account->delete();

	id(new PhabricatorAuthSessionEngine())->terminateLoginSessions(
	$viewer,
	$request->getCookie(PhabricatorCookies::COOKIE_SESSION));

	return id(new AphrontRedirectResponse())->setURI($this->getDoneURI());
	}

	return $this->renderConfirmDialog($account);
	}

	private function getDoneURI() {
	return '/settings/panel/external/';
	}

	private function renderNoAccountErrorDialog() {
	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle(pht('No Such Account'))
	->appendChild(
	pht(
	'You can not unlink this account because it is not linked.'))
	->addCancelButton($this->getDoneURI());

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function renderNotUnlinkableErrorDialog(
	PhabricatorAuthProvider $provider) {

	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle(pht('Permanent Account Link'))
	->appendChild(
	pht(
	'You can not unlink this account because the administrator has '.
	'configured Phabricator to make links to %s accounts permanent.',
	$provider->getProviderName()))
	->addCancelButton($this->getDoneURI());

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function renderLastUsableAccountErrorDialog() {
	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle(pht('Last Valid Account'))
	->appendChild(
	pht(
	'You can not unlink this account because you have no other '.
	'valid login accounts. If you removed it, you would be unable '.
	'to login. Add another authentication method before removing '.
	'this one.'))
	->addCancelButton($this->getDoneURI());

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function renderConfirmDialog() {
	$provider_key = $this->providerKey;
	$provider = PhabricatorAuthProvider::getEnabledProviderByKey($provider_key);

	if ($provider) {
	$title = pht('Unlink "%s" Account?', $provider->getProviderName());
	$body = pht(
	'You will no longer be able to use your %s account to '.
	'log in to Phabricator.',
	$provider->getProviderName());
	} else {
	$title = pht('Unlink Account?');
	$body = pht(
	'You will no longer be able to use this account to log in '.
	'to Phabricator.');
	}

	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle($title)
	->appendParagraph($body)
	->appendParagraph(
	pht(
	'Note: Unlinking an authentication provider will terminate any '.
	'other active login sessions.'))
	->addSubmitButton(pht('Unlink Account'))
	->addCancelButton($this->getDoneURI());

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthValidateController.php b/src/applications/auth/controller/PhabricatorAuthValidateController.php
	index c91f3c4504..bb45a68acf 100644
	--- a/src/applications/auth/controller/PhabricatorAuthValidateController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthValidateController.php
	@@ -1,76 +1,75 @@
	<?php

	final class PhabricatorAuthValidateController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldAllowPartialSessions() {
	return true;
	}

	public function shouldAllowLegallyNonCompliantUsers() {
	return true;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	$failures = array();

	if (!strlen($request->getStr('expect'))) {
	return $this->renderErrors(
	array(
	pht(
	'Login validation is missing expected parameter ("%s").',
	'phusr'),
	));
	}

	$expect_phusr = $request->getStr('expect');
	$actual_phusr = $request->getCookie(PhabricatorCookies::COOKIE_USERNAME);
	if ($actual_phusr != $expect_phusr) {
	if ($actual_phusr) {
	$failures[] = pht(
	"Attempted to set '%s' cookie to '%s', but your browser sent back ".
	"a cookie with the value '%s'. Clear your browser's cookies and ".
	"try again.",
	'phusr',
	$expect_phusr,
	$actual_phusr);
	} else {
	$failures[] = pht(
	"Attempted to set '%s' cookie to '%s', but your browser did not ".
	"accept the cookie. Check that cookies are enabled, clear them, ".
	"and try again.",
	'phusr',
	$expect_phusr);
	}
	}

	if (!$failures) {
	if (!$viewer->getPHID()) {
	$failures[] = pht(
	'Login cookie was set correctly, but your login session is not '.
	'valid. Try clearing cookies and logging in again.');
	}
	}

	if ($failures) {
	return $this->renderErrors($failures);
	}

	$finish_uri = $this->getApplicationURI('finish/');
	return id(new AphrontRedirectResponse())->setURI($finish_uri);
	}

	private function renderErrors(array $messages) {
	return $this->renderErrorPage(
	pht('Login Failure'),
	$messages);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorDisabledUserController.php b/src/applications/auth/controller/PhabricatorDisabledUserController.php
	index 842f2daad6..39e390d44a 100644
	--- a/src/applications/auth/controller/PhabricatorDisabledUserController.php
	+++ b/src/applications/auth/controller/PhabricatorDisabledUserController.php
	@@ -1,24 +1,25 @@
	<?php

	final class PhabricatorDisabledUserController
	extends PhabricatorAuthController {

	public function shouldRequireEnabledUser() {
	return false;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	- if (!$user->getIsDisabled()) {
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ if (!$viewer->getIsDisabled()) {
	return new Aphront404Response();
	}

	return id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('Account Disabled'))
	->addCancelButton('/logout/', pht('Okay'))
	->appendParagraph(pht('Your account has been disabled.'));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php
	index 9db360d51d..26609133ea 100644
	--- a/src/applications/auth/controller/PhabricatorEmailLoginController.php
	+++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php
	@@ -1,166 +1,165 @@
	<?php

	final class PhabricatorEmailLoginController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	+ public function handleRequest(AphrontRequest $request) {

	if (!PhabricatorPasswordAuthProvider::getPasswordProvider()) {
	return new Aphront400Response();
	}

	$e_email = true;
	$e_captcha = true;
	$errors = array();

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	if ($request->isFormPost()) {
	$e_email = null;
	$e_captcha = pht('Again');

	$captcha_ok = AphrontFormRecaptchaControl::processCaptcha($request);
	if (!$captcha_ok) {
	$errors[] = pht('Captcha response is incorrect, try again.');
	$e_captcha = pht('Invalid');
	}

	$email = $request->getStr('email');
	if (!strlen($email)) {
	$errors[] = pht('You must provide an email address.');
	$e_email = pht('Required');
	}

	if (!$errors) {
	// NOTE: Don't validate the email unless the captcha is good; this makes
	// it expensive to fish for valid email addresses while giving the user
	// a better error if they goof their email.

	$target_email = id(new PhabricatorUserEmail())->loadOneWhere(
	'address = %s',
	$email);

	$target_user = null;
	if ($target_email) {
	$target_user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$target_email->getUserPHID());
	}

	if (!$target_user) {
	$errors[] =
	pht('There is no account associated with that email address.');
	$e_email = pht('Invalid');
	}

	// If this address is unverified, only send a reset link to it if
	// the account has no verified addresses. This prevents an opportunistic
	// attacker from compromising an account if a user adds an email
	// address but mistypes it and doesn't notice.

	// (For a newly created account, all the addresses may be unverified,
	// which is why we'll send to an unverified address in that case.)

	if ($target_email && !$target_email->getIsVerified()) {
	$verified_addresses = id(new PhabricatorUserEmail())->loadAllWhere(
	'userPHID = %s AND isVerified = 1',
	$target_email->getUserPHID());
	if ($verified_addresses) {
	$errors[] = pht(
	'That email address is not verified. You can only send '.
	'password reset links to a verified address.');
	$e_email = pht('Unverified');
	}
	}

	if (!$errors) {
	$engine = new PhabricatorAuthSessionEngine();
	$uri = $engine->getOneTimeLoginURI(
	$target_user,
	null,
	PhabricatorAuthSessionEngine::ONETIME_RESET);

	if ($is_serious) {
	$body = pht(
	"You can use this link to reset your Phabricator password:".
	"\n\n %s\n",
	$uri);
	} else {
	$body = pht(
	"Condolences on forgetting your password. You can use this ".
	"link to reset it:\n\n".
	" %s\n\n".
	"After you set a new password, consider writing it down on a ".
	"sticky note and attaching it to your monitor so you don't ".
	"forget again! Choosing a very short, easy-to-remember password ".
	"like \"cat\" or \"1234\" might also help.\n\n".
	"Best Wishes,\nPhabricator\n",
	$uri);

	}

	$mail = id(new PhabricatorMetaMTAMail())
	->setSubject(pht('[Phabricator] Password Reset'))
	->setForceDelivery(true)
	->addRawTos(array($target_email->getAddress()))
	->setBody($body)
	->saveAndSend();

	return $this->newDialog()
	->setTitle(pht('Check Your Email'))
	->setShortTitle(pht('Email Sent'))
	->appendParagraph(
	pht('An email has been sent with a link you can use to login.'))
	->addCancelButton('/', pht('Done'));
	}
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = new PHUIInfoView();
	$error_view->setErrors($errors);
	}

	$email_auth = new PHUIFormLayoutView();
	$email_auth->appendChild($error_view);
	$email_auth
	->setUser($request->getUser())
	->setFullWidth(true)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Email'))
	->setName('email')
	->setValue($request->getStr('email'))
	->setError($e_email))
	->appendChild(
	id(new AphrontFormRecaptchaControl())
	->setLabel(pht('Captcha'))
	->setError($e_captcha));

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Reset Password'));

	$dialog = new AphrontDialogView();
	$dialog->setUser($request->getUser());
	$dialog->setTitle(pht('Forgot Password / Email Login'));
	$dialog->appendChild($email_auth);
	$dialog->addSubmitButton(pht('Send Email'));
	$dialog->setSubmitURI('/login/email/');

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$dialog,
	),
	array(
	'title' => pht('Forgot Password'),
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	index ea5f273d79..83a370139c 100644
	--- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	+++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	@@ -1,97 +1,91 @@
	<?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();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $code = $request->getURIData('code');

	- if ($user->getIsDisabled()) {
	+ if ($viewer->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);
	+ $viewer->getPHID(),
	+ $code);

	$submit = null;

	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()) {
	+ } else if ($email->getIsVerified() && $viewer->getIsEmailVerified()) {
	$title = pht('Address Already Verified');
	$content = pht(
	'This email address has already been verified.');
	$continue = pht('Continue to Phabricator');
	} else if ($request->isFormPost()) {

	id(new PhabricatorUserEditor())
	- ->setActor($user)
	- ->verifyEmail($user, $email);
	+ ->setActor($viewer)
	+ ->verifyEmail($viewer, $email);

	$title = pht('Address Verified');
	$content = pht(
	'The email address %s is now verified.',
	phutil_tag('strong', array(), $email->getAddress()));
	$continue = pht('Continue to Phabricator');
	} else {
	$title = pht('Verify Email Address');
	$content = pht(
	'Verify this email address (%s) and attach it to your account?',
	phutil_tag('strong', array(), $email->getAddress()));
	$continue = pht('Cancel');
	$submit = pht('Verify %s', $email->getAddress());
	}

	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle($title)
	->addCancelButton('/', $continue)
	->appendChild($content);

	if ($submit) {
	$dialog->addSubmitButton($submit);
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Verify Email'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$dialog,
	),
	array(
	'title' => pht('Verify Email'),
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorLogoutController.php b/src/applications/auth/controller/PhabricatorLogoutController.php
	index 127e5b5e1f..de3ac50e5d 100644
	--- a/src/applications/auth/controller/PhabricatorLogoutController.php
	+++ b/src/applications/auth/controller/PhabricatorLogoutController.php
	@@ -1,73 +1,72 @@
	<?php

	final class PhabricatorLogoutController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return true;
	}

	public function shouldRequireEmailVerification() {
	// Allow unverified users to logout.
	return false;
	}

	public function shouldRequireEnabledUser() {
	// Allow disabled users to logout.
	return false;
	}

	public function shouldAllowPartialSessions() {
	return true;
	}

	public function shouldAllowLegallyNonCompliantUsers() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ $viewer = $this->getViewer();

	if ($request->isFormPost()) {

	$log = PhabricatorUserLog::initializeNewLog(
	- $user,
	- $user->getPHID(),
	+ $viewer,
	+ $viewer->getPHID(),
	PhabricatorUserLog::ACTION_LOGOUT);
	$log->save();

	// Destroy the user's session in the database so logout works even if
	// their cookies have some issues. We'll detect cookie issues when they
	// try to login again and tell them to clear any junk.
	$phsid = $request->getCookie(PhabricatorCookies::COOKIE_SESSION);
	if (strlen($phsid)) {
	$session = id(new PhabricatorAuthSessionQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withSessionKeys(array($phsid))
	->executeOne();
	if ($session) {
	$session->delete();
	}
	}
	$request->clearCookie(PhabricatorCookies::COOKIE_SESSION);

	return id(new AphrontRedirectResponse())
	->setURI('/auth/loggedout/');
	}

	- if ($user->getPHID()) {
	+ if ($viewer->getPHID()) {
	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('Log out of Phabricator?'))
	->appendChild(pht('Are you sure you want to log out?'))
	->addSubmitButton(pht('Logout'))
	->addCancelButton('/');

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	return id(new AphrontRedirectResponse())->setURI('/');
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	index e64096e4be..779196382d 100644
	--- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	+++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	@@ -1,67 +1,66 @@
	<?php

	final class PhabricatorMustVerifyEmailController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldRequireEmailVerification() {
	// NOTE: We don't technically need this since PhabricatorController forces
	// us here in either case, but it's more consistent with intent.
	return false;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	- $email = $user->loadPrimaryEmail();
	+ $email = $viewer->loadPrimaryEmail();

	- if ($user->getIsEmailVerified()) {
	+ if ($viewer->getIsEmailVerified()) {
	return id(new AphrontRedirectResponse())->setURI('/');
	}

	$email_address = $email->getAddress();

	$sent = null;
	if ($request->isFormPost()) {
	- $email->sendVerificationEmail($user);
	+ $email->sendVerificationEmail($viewer);
	$sent = new PHUIInfoView();
	$sent->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$sent->setTitle(pht('Email Sent'));
	$sent->appendChild(
	pht(
	'Another verification email was sent to %s.',
	phutil_tag('strong', array(), $email_address)));
	}

	$must_verify = pht(
	'You must verify your email address to login. You should have a '.
	'new email message from Phabricator with verification instructions '.
	'in your inbox (%s).',
	phutil_tag('strong', array(), $email_address));

	$send_again = pht(
	'If you did not receive an email, you can click the button below '.
	'to try sending another one.');

	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('Check Your Email'))
	->appendParagraph($must_verify)
	->appendParagraph($send_again)
	->addSubmitButton(pht('Send Another Email'));

	return $this->buildApplicationPage(
	array(
	$sent,
	$dialog,
	),
	array(
	'title' => pht('Must Verify Email'),
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorRefreshCSRFController.php b/src/applications/auth/controller/PhabricatorRefreshCSRFController.php
	index 19d7aa7eb1..fc1d5cc02d 100644
	--- a/src/applications/auth/controller/PhabricatorRefreshCSRFController.php
	+++ b/src/applications/auth/controller/PhabricatorRefreshCSRFController.php
	@@ -1,16 +1,15 @@
	<?php

	final class PhabricatorRefreshCSRFController extends PhabricatorAuthController {

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();

	return id(new AphrontAjaxResponse())
	->setContent(
	array(
	- 'token' => $user->getCSRFToken(),
	+ 'token' => $viewer->getCSRFToken(),
	));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:17 (2 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126398
Default Alt Text: (91 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions