No OneTemporary
Actions

Size

61 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/auth/adapter/PhutilAuthAdapter.php b/src/applications/auth/adapter/PhutilAuthAdapter.php
	index 7d33b5a6f3..f8a980313c 100644
	--- a/src/applications/auth/adapter/PhutilAuthAdapter.php
	+++ b/src/applications/auth/adapter/PhutilAuthAdapter.php
	@@ -1,144 +1,149 @@
	<?php

	/**
	* Abstract interface to an identity provider or authentication source, like
	* Twitter, Facebook, or Google.
	*
	* Generally, adapters are handed some set of credentials particular to the
	* provider they adapt, and they turn those credentials into standard
	* information about the user's identity. For example, the LDAP adapter is given
	* a username and password (and some other configuration information), uses them
	* to talk to the LDAP server, and produces a username, email, and so forth.
	*
	* Since the credentials a provider requires are specific to each provider, the
	* base adapter does not specify how an adapter should be constructed or
	* configured -- only what information it is expected to be able to provide once
	* properly configured.
	*/
	abstract class PhutilAuthAdapter extends Phobject {

	final public function getAccountIdentifiers() {
	$result = $this->newAccountIdentifiers();
	assert_instances_of($result, 'PhabricatorExternalAccountIdentifier');
	return $result;
	}

	protected function newAccountIdentifiers() {
	$identifiers = array();

	$raw_identifier = $this->getAccountID();
	if ($raw_identifier !== null) {
	$identifiers[] = $this->newAccountIdentifier($raw_identifier);
	}

	return $identifiers;
	}

	+ final protected function newAccountIdentifier($raw_identifier) {
	+ return id(new PhabricatorExternalAccountIdentifier())
	+ ->setIdentifierRaw($raw_identifier);
	+ }
	+
	/**
	* Get a unique identifier associated with the account.
	*
	* This identifier should be permanent, immutable, and uniquely identify
	* the account. If possible, it should be nonsensitive. For providers that
	* have a GUID or PHID value for accounts, these are the best values to use.
	*
	* You can implement @{method:newAccountIdentifiers} instead if a provider
	* is unable to emit identifiers with all of these properties.
	*
	* If the adapter was unable to authenticate an identity, it should return
	* `null`.
	*
	* @return string\|null Unique account identifier, or `null` if authentication
	* failed.
	*/
	public function getAccountID() {
	throw new PhutilMethodNotImplementedException();
	}


	/**
	* Get a string identifying this adapter, like "ldap". This string should be
	* unique to the adapter class.
	*
	* @return string Unique adapter identifier.
	*/
	abstract public function getAdapterType();


	/**
	* Get a string identifying the domain this adapter is acting on. This allows
	* an adapter (like LDAP) to act against different identity domains without
	* conflating credentials. For providers like Facebook or Google, the adapters
	* just return the relevant domain name.
	*
	* @return string Domain the adapter is associated with.
	*/
	abstract public function getAdapterDomain();


	/**
	* Generate a string uniquely identifying this adapter configuration. Within
	* the scope of a given key, all account IDs must uniquely identify exactly
	* one identity.
	*
	* @return string Unique identifier for this adapter configuration.
	*/
	public function getAdapterKey() {
	return $this->getAdapterType().':'.$this->getAdapterDomain();
	}


	/**
	* Optionally, return an email address associated with this account.
	*
	* @return string\|null An email address associated with the account, or
	* `null` if data is not available.
	*/
	public function getAccountEmail() {
	return null;
	}


	/**
	* Optionally, return a human readable username associated with this account.
	*
	* @return string\|null Account username, or `null` if data isn't available.
	*/
	public function getAccountName() {
	return null;
	}


	/**
	* Optionally, return a URI corresponding to a human-viewable profile for
	* this account.
	*
	* @return string\|null A profile URI associated with this account, or
	* `null` if the data isn't available.
	*/
	public function getAccountURI() {
	return null;
	}


	/**
	* Optionally, return a profile image URI associated with this account.
	*
	* @return string\|null URI for an account profile image, or `null` if one is
	* not available.
	*/
	public function getAccountImageURI() {
	return null;
	}


	/**
	* Optionally, return a real name associated with this account.
	*
	* @return string\|null A human real name, or `null` if this data is not
	* available.
	*/
	public function getAccountRealName() {
	return null;
	}

	}
	diff --git a/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php
	index 725d2dfc49..2aa7aca168 100644
	--- a/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php
	+++ b/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php
	@@ -1,69 +1,72 @@
	<?php

	final class PhabricatorAuthManagementLDAPWorkflow
	extends PhabricatorAuthManagementWorkflow {

	protected function didConstruct() {
	$this
	->setName('ldap')
	->setExamples('ldap')
	->setSynopsis(
	pht('Analyze and diagnose issues with LDAP configuration.'));
	}

	public function execute(PhutilArgumentParser $args) {
	$console = PhutilConsole::getConsole();
	$console->getServer()->setEnableLog(true);

	PhabricatorLDAPAuthProvider::assertLDAPExtensionInstalled();

	$provider = PhabricatorLDAPAuthProvider::getLDAPProvider();
	if (!$provider) {
	$console->writeOut(
	"%s\n",
	pht('The LDAP authentication provider is not enabled.'));
	exit(1);
	}

	if (!function_exists('ldap_connect')) {
	$console->writeOut(
	"%s\n",
	pht('The LDAP extension is not enabled.'));
	exit(1);
	}

	$adapter = $provider->getAdapter();

	$console->writeOut("%s\n", pht('Enter LDAP Credentials'));
	$username = phutil_console_prompt(pht('LDAP Username: '));
	if (!strlen($username)) {
	throw new PhutilArgumentUsageException(
	pht('You must enter an LDAP username.'));
	}

	phutil_passthru('stty -echo');
	$password = phutil_console_prompt(pht('LDAP Password: '));
	phutil_passthru('stty echo');

	if (!strlen($password)) {
	throw new PhutilArgumentUsageException(
	pht('You must enter an LDAP password.'));
	}

	$adapter->setLoginUsername($username);
	$adapter->setLoginPassword(new PhutilOpaqueEnvelope($password));

	$console->writeOut("\n");
	$console->writeOut("%s\n", pht('Connecting to LDAP...'));

	- $account_id = $adapter->getAccountID();
	- if ($account_id) {
	- $console->writeOut("%s\n", pht('Found LDAP Account: %s', $account_id));
	+ $account_ids = $adapter->getAccountIdentifiers();
	+ if ($account_ids) {
	+ $value_list = mpull($account_ids, 'getIdentifierRaw');
	+ $value_list = implode(', ', $value_list);
	+
	+ $console->writeOut("%s\n", pht('Found LDAP Account: %s', $value_list));
	} else {
	$console->writeOut("%s\n", pht('Unable to find LDAP account!'));
	}

	return 0;
	}

	}
	diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
	index eaf52552ef..6ac6846148 100644
	--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
	+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
	@@ -1,534 +1,547 @@
	<?php

	abstract class PhabricatorAuthProvider extends Phobject {

	private $providerConfig;

	public function attachProviderConfig(PhabricatorAuthProviderConfig $config) {
	$this->providerConfig = $config;
	return $this;
	}

	public function hasProviderConfig() {
	return (bool)$this->providerConfig;
	}

	public function getProviderConfig() {
	if ($this->providerConfig === null) {
	throw new PhutilInvalidStateException('attachProviderConfig');
	}
	return $this->providerConfig;
	}

	public function getConfigurationHelp() {
	return null;
	}

	public function getDefaultProviderConfig() {
	return id(new PhabricatorAuthProviderConfig())
	->setProviderClass(get_class($this))
	->setIsEnabled(1)
	->setShouldAllowLogin(1)
	->setShouldAllowRegistration(1)
	->setShouldAllowLink(1)
	->setShouldAllowUnlink(1);
	}

	public function getNameForCreate() {
	return $this->getProviderName();
	}

	public function getDescriptionForCreate() {
	return null;
	}

	public function getProviderKey() {
	return $this->getAdapter()->getAdapterKey();
	}

	public function getProviderType() {
	return $this->getAdapter()->getAdapterType();
	}

	public function getProviderDomain() {
	return $this->getAdapter()->getAdapterDomain();
	}

	public static function getAllBaseProviders() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->execute();
	}

	public static function getAllProviders() {
	static $providers;

	if ($providers === null) {
	$objects = self::getAllBaseProviders();

	$configs = id(new PhabricatorAuthProviderConfigQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->execute();

	$providers = array();
	foreach ($configs as $config) {
	if (!isset($objects[$config->getProviderClass()])) {
	// This configuration is for a provider which is not installed.
	continue;
	}

	$object = clone $objects[$config->getProviderClass()];
	$object->attachProviderConfig($config);

	$key = $object->getProviderKey();
	if (isset($providers[$key])) {
	throw new Exception(
	pht(
	"Two authentication providers use the same provider key ".
	"('%s'). Each provider must be identified by a unique key.",
	$key));
	}
	$providers[$key] = $object;
	}
	}

	return $providers;
	}

	public static function getAllEnabledProviders() {
	$providers = self::getAllProviders();
	foreach ($providers as $key => $provider) {
	if (!$provider->isEnabled()) {
	unset($providers[$key]);
	}
	}
	return $providers;
	}

	public static function getEnabledProviderByKey($provider_key) {
	return idx(self::getAllEnabledProviders(), $provider_key);
	}

	abstract public function getProviderName();
	abstract public function getAdapter();

	public function isEnabled() {
	return $this->getProviderConfig()->getIsEnabled();
	}

	public function shouldAllowLogin() {
	return $this->getProviderConfig()->getShouldAllowLogin();
	}

	public function shouldAllowRegistration() {
	if (!$this->shouldAllowLogin()) {
	return false;
	}

	return $this->getProviderConfig()->getShouldAllowRegistration();
	}

	public function shouldAllowAccountLink() {
	return $this->getProviderConfig()->getShouldAllowLink();
	}

	public function shouldAllowAccountUnlink() {
	return $this->getProviderConfig()->getShouldAllowUnlink();
	}

	public function shouldTrustEmails() {
	return $this->shouldAllowEmailTrustConfiguration() &&
	$this->getProviderConfig()->getShouldTrustEmails();
	}

	/**
	* Should we allow the adapter to be marked as "trusted". This is true for
	* all adapters except those that allow the user to type in emails (see
	* @{class:PhabricatorPasswordAuthProvider}).
	*/
	public function shouldAllowEmailTrustConfiguration() {
	return true;
	}

	public function buildLoginForm(PhabricatorAuthStartController $controller) {
	return $this->renderLoginForm($controller->getRequest(), $mode = 'start');
	}

	public function buildInviteForm(PhabricatorAuthStartController $controller) {
	return $this->renderLoginForm($controller->getRequest(), $mode = 'invite');
	}

	abstract public function processLoginRequest(
	PhabricatorAuthLoginController $controller);

	public function buildLinkForm($controller) {
	return $this->renderLoginForm($controller->getRequest(), $mode = 'link');
	}

	public function shouldAllowAccountRefresh() {
	return true;
	}

	public function buildRefreshForm(
	PhabricatorAuthLinkController $controller) {
	return $this->renderLoginForm($controller->getRequest(), $mode = 'refresh');
	}

	protected function renderLoginForm(AphrontRequest $request, $mode) {
	throw new PhutilMethodNotImplementedException();
	}

	public function createProviders() {
	return array($this);
	}

	protected function willSaveAccount(PhabricatorExternalAccount $account) {
	return;
	}

	public function willRegisterAccount(PhabricatorExternalAccount $account) {
	return;
	}

	- protected function loadOrCreateAccount($account_id) {
	- if (!strlen($account_id)) {
	- throw new Exception(pht('Empty account ID!'));
	- }
	-
	- $adapter = $this->getAdapter();
	- $adapter_class = get_class($adapter);
	+ protected function loadOrCreateAccount(array $identifiers) {
	+ assert_instances_of($identifiers, 'PhabricatorExternalAccountIdentifier');

	- if (!strlen($adapter->getAdapterType())) {
	+ if (!$identifiers) {
	throw new Exception(
	pht(
	- "AuthAdapter (of class '%s') has an invalid implementation: ".
	- "no adapter type.",
	- $adapter_class));
	+ 'Authentication provider (of class "%s") is attempting to '.
	+ 'load or create an external account, but provided no account '.
	+ 'identifiers.',
	+ get_class($this)));
	}

	- if (!strlen($adapter->getAdapterDomain())) {
	+ if (count($identifiers) !== 1) {
	throw new Exception(
	pht(
	- "AuthAdapter (of class '%s') has an invalid implementation: ".
	- "no adapter domain.",
	- $adapter_class));
	+ 'Unexpected number of account identifiers returned (by class "%s").',
	+ get_class($this)));
	}

	- $account = id(new PhabricatorExternalAccount())->loadOneWhere(
	- 'accountType = %s AND accountDomain = %s AND accountID = %s',
	- $adapter->getAdapterType(),
	- $adapter->getAdapterDomain(),
	- $account_id);
	- if (!$account) {
	+ $config = $this->getProviderConfig();
	+ $viewer = PhabricatorUser::getOmnipotentUser();
	+
	+ $raw_identifiers = mpull($identifiers, 'getIdentifierRaw');
	+
	+ $accounts = id(new PhabricatorExternalAccountQuery())
	+ ->setViewer($viewer)
	+ ->withProviderConfigPHIDs(array($config->getPHID()))
	+ ->withAccountIDs($raw_identifiers)
	+ ->execute();
	+ if (!$accounts) {
	$account = $this->newExternalAccount()
	- ->setAccountID($account_id);
	+ ->setAccountID(head($raw_identifiers));
	+ } else if (count($accounts) === 1) {
	+ $account = head($accounts);
	+ } else {
	+ throw new Exception(
	+ pht(
	+ 'Authentication provider (of class "%s") is attempting to load '.
	+ 'or create an external account, but provided a list of '.
	+ 'account identifiers which map to more than one account: %s.',
	+ get_class($this),
	+ implode(', ', $raw_identifiers)));
	}

	+ $adapter = $this->getAdapter();
	+
	$account->setUsername($adapter->getAccountName());
	$account->setRealName($adapter->getAccountRealName());
	$account->setEmail($adapter->getAccountEmail());
	$account->setAccountURI($adapter->getAccountURI());

	$account->setProfileImagePHID(null);
	$image_uri = $adapter->getAccountImageURI();
	if ($image_uri) {
	try {
	$name = PhabricatorSlug::normalize($this->getProviderName());
	$name = $name.'-profile.jpg';

	// TODO: If the image has not changed, we do not need to make a new
	// file entry for it, but there's no convenient way to do this with
	// PhabricatorFile right now. The storage will get shared, so the impact
	// here is negligible.
	+
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$image_file = PhabricatorFile::newFromFileDownload(
	$image_uri,
	array(
	'name' => $name,
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));
	if ($image_file->isViewableImage()) {
	$image_file
	->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
	->setCanCDN(true)
	->save();
	$account->setProfileImagePHID($image_file->getPHID());
	} else {
	$image_file->delete();
	}
	unset($unguarded);

	} catch (Exception $ex) {
	// Log this but proceed, it's not especially important that we
	// be able to pull profile images.
	phlog($ex);
	}
	}

	$this->willSaveAccount($account);

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

	return $account;
	}

	public function getLoginURI() {
	$app = PhabricatorApplication::getByClass('PhabricatorAuthApplication');
	return $app->getApplicationURI('/login/'.$this->getProviderKey().'/');
	}

	public function getSettingsURI() {
	return '/settings/panel/external/';
	}

	public function getStartURI() {
	$app = PhabricatorApplication::getByClass('PhabricatorAuthApplication');
	$uri = $app->getApplicationURI('/start/');
	return $uri;
	}

	public function isDefaultRegistrationProvider() {
	return false;
	}

	public function shouldRequireRegistrationPassword() {
	return false;
	}

	public function newDefaultExternalAccount() {
	return $this->newExternalAccount();
	}

	protected function newExternalAccount() {
	$config = $this->getProviderConfig();
	$adapter = $this->getAdapter();

	return id(new PhabricatorExternalAccount())
	->setAccountType($adapter->getAdapterType())
	->setAccountDomain($adapter->getAdapterDomain())
	->setProviderConfigPHID($config->getPHID());
	}

	public function getLoginOrder() {
	return '500-'.$this->getProviderName();
	}

	protected function getLoginIcon() {
	return 'Generic';
	}

	public function newIconView() {
	return id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_LOGIN)
	->setSpriteIcon($this->getLoginIcon());
	}

	public function isLoginFormAButton() {
	return false;
	}

	public function renderConfigPropertyTransactionTitle(
	PhabricatorAuthProviderConfigTransaction $xaction) {

	return null;
	}

	public function readFormValuesFromProvider() {
	return array();
	}

	public function readFormValuesFromRequest(AphrontRequest $request) {
	return array();
	}

	public function processEditForm(
	AphrontRequest $request,
	array $values) {

	$errors = array();
	$issues = array();

	return array($errors, $issues, $values);
	}

	public function extendEditForm(
	AphrontRequest $request,
	AphrontFormView $form,
	array $values,
	array $issues) {

	return;
	}

	public function willRenderLinkedAccount(
	PhabricatorUser $viewer,
	PHUIObjectItemView $item,
	PhabricatorExternalAccount $account) {

	$account_view = id(new PhabricatorAuthAccountView())
	->setExternalAccount($account)
	->setAuthProvider($this);

	$item->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'mmr mml mst mmb',
	),
	$account_view));
	}

	/**
	* Return true to use a two-step configuration (setup, configure) instead of
	* the default single-step configuration. In practice, this means that
	* creating a new provider instance will redirect back to the edit page
	* instead of the provider list.
	*
	* @return bool True if this provider uses two-step configuration.
	*/
	public function hasSetupStep() {
	return false;
	}

	/**
	* Render a standard login/register button element.
	*
	* The `$attributes` parameter takes these keys:
	*
	* - `uri`: URI the button should take the user to when clicked.
	* - `method`: Optional HTTP method the button should use, defaults to GET.
	*
	* @param AphrontRequest HTTP request.
	* @param string Request mode string.
	* @param map Additional parameters, see above.
	* @return wild Log in button.
	*/
	protected function renderStandardLoginButton(
	AphrontRequest $request,
	$mode,
	array $attributes = array()) {

	PhutilTypeSpec::checkMap(
	$attributes,
	array(
	'method' => 'optional string',
	'uri' => 'string',
	'sigil' => 'optional string',
	));

	$viewer = $request->getUser();
	$adapter = $this->getAdapter();

	if ($mode == 'link') {
	$button_text = pht('Link External Account');
	} else if ($mode == 'refresh') {
	$button_text = pht('Refresh Account Link');
	} else if ($mode == 'invite') {
	$button_text = pht('Register Account');
	} else if ($this->shouldAllowRegistration()) {
	$button_text = pht('Log In or Register');
	} else {
	$button_text = pht('Log In');
	}

	$icon = id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_LOGIN)
	->setSpriteIcon($this->getLoginIcon());

	$button = id(new PHUIButtonView())
	->setSize(PHUIButtonView::BIG)
	->setColor(PHUIButtonView::GREY)
	->setIcon($icon)
	->setText($button_text)
	->setSubtext($this->getProviderName());

	$uri = $attributes['uri'];
	$uri = new PhutilURI($uri);
	$params = $uri->getQueryParamsAsPairList();
	$uri->removeAllQueryParams();

	$content = array($button);

	foreach ($params as $pair) {
	list($key, $value) = $pair;
	$content[] = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => $key,
	'value' => $value,
	));
	}

	$static_response = CelerityAPI::getStaticResourceResponse();
	$static_response->addContentSecurityPolicyURI('form-action', (string)$uri);

	foreach ($this->getContentSecurityPolicyFormActions() as $csp_uri) {
	$static_response->addContentSecurityPolicyURI('form-action', $csp_uri);
	}

	return phabricator_form(
	$viewer,
	array(
	'method' => idx($attributes, 'method', 'GET'),
	'action' => (string)$uri,
	'sigil' => idx($attributes, 'sigil'),
	),
	$content);
	}

	public function renderConfigurationFooter() {
	return null;
	}

	public function getAuthCSRFCode(AphrontRequest $request) {
	$phcid = $request->getCookie(PhabricatorCookies::COOKIE_CLIENTID);
	if (!strlen($phcid)) {
	throw new AphrontMalformedRequestException(
	pht('Missing Client ID Cookie'),
	pht(
	'Your browser did not submit a "%s" cookie with client state '.
	'information in the request. Check that cookies are enabled. '.
	'If this problem persists, you may need to clear your cookies.',
	PhabricatorCookies::COOKIE_CLIENTID),
	true);
	}

	return PhabricatorHash::weakDigest($phcid);
	}

	protected function verifyAuthCSRFCode(AphrontRequest $request, $actual) {
	$expect = $this->getAuthCSRFCode($request);

	if (!strlen($actual)) {
	throw new Exception(
	pht(
	'The authentication provider did not return a client state '.
	'parameter in its response, but one was expected. If this '.
	'problem persists, you may need to clear your cookies.'));
	}

	if (!phutil_hashes_are_identical($actual, $expect)) {
	throw new Exception(
	pht(
	'The authentication provider did not return the correct client '.
	'state parameter in its response. If this problem persists, you may '.
	'need to clear your cookies.'));
	}
	}

	public function supportsAutoLogin() {
	return false;
	}

	public function getAutoLoginURI(AphrontRequest $request) {
	throw new PhutilMethodNotImplementedException();
	}

	protected function getContentSecurityPolicyFormActions() {
	return array();
	}

	}
	diff --git a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
	index 4a4babcc12..1132f99857 100644
	--- a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
	+++ b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
	@@ -1,494 +1,494 @@
	<?php

	final class PhabricatorLDAPAuthProvider extends PhabricatorAuthProvider {

	private $adapter;

	public function getProviderName() {
	return pht('LDAP');
	}

	public function getDescriptionForCreate() {
	return pht(
	'Configure a connection to an LDAP server so that users can use their '.
	'LDAP credentials to log in to Phabricator.');
	}

	public function getDefaultProviderConfig() {
	return parent::getDefaultProviderConfig()
	->setProperty(self::KEY_PORT, 389)
	->setProperty(self::KEY_VERSION, 3);
	}

	public function getAdapter() {
	if (!$this->adapter) {
	$conf = $this->getProviderConfig();

	$realname_attributes = $conf->getProperty(self::KEY_REALNAME_ATTRIBUTES);
	if (!is_array($realname_attributes)) {
	$realname_attributes = array();
	}

	$search_attributes = $conf->getProperty(self::KEY_SEARCH_ATTRIBUTES);
	$search_attributes = phutil_split_lines($search_attributes, false);
	$search_attributes = array_filter($search_attributes);

	$adapter = id(new PhutilLDAPAuthAdapter())
	->setHostname(
	$conf->getProperty(self::KEY_HOSTNAME))
	->setPort(
	$conf->getProperty(self::KEY_PORT))
	->setBaseDistinguishedName(
	$conf->getProperty(self::KEY_DISTINGUISHED_NAME))
	->setSearchAttributes($search_attributes)
	->setUsernameAttribute(
	$conf->getProperty(self::KEY_USERNAME_ATTRIBUTE))
	->setRealNameAttributes($realname_attributes)
	->setLDAPVersion(
	$conf->getProperty(self::KEY_VERSION))
	->setLDAPReferrals(
	$conf->getProperty(self::KEY_REFERRALS))
	->setLDAPStartTLS(
	$conf->getProperty(self::KEY_START_TLS))
	->setAlwaysSearch($conf->getProperty(self::KEY_ALWAYS_SEARCH))
	->setAnonymousUsername(
	$conf->getProperty(self::KEY_ANONYMOUS_USERNAME))
	->setAnonymousPassword(
	new PhutilOpaqueEnvelope(
	$conf->getProperty(self::KEY_ANONYMOUS_PASSWORD)))
	->setActiveDirectoryDomain(
	$conf->getProperty(self::KEY_ACTIVEDIRECTORY_DOMAIN));
	$this->adapter = $adapter;
	}
	return $this->adapter;
	}

	protected function renderLoginForm(AphrontRequest $request, $mode) {
	$viewer = $request->getUser();

	$dialog = id(new AphrontDialogView())
	->setSubmitURI($this->getLoginURI())
	->setUser($viewer);

	if ($mode == 'link') {
	$dialog->setTitle(pht('Link LDAP Account'));
	$dialog->addSubmitButton(pht('Link Accounts'));
	$dialog->addCancelButton($this->getSettingsURI());
	} else if ($mode == 'refresh') {
	$dialog->setTitle(pht('Refresh LDAP Account'));
	$dialog->addSubmitButton(pht('Refresh Account'));
	$dialog->addCancelButton($this->getSettingsURI());
	} else {
	if ($this->shouldAllowRegistration()) {
	$dialog->setTitle(pht('Log In or Register with LDAP'));
	$dialog->addSubmitButton(pht('Log In or Register'));
	} else {
	$dialog->setTitle(pht('Log In with LDAP'));
	$dialog->addSubmitButton(pht('Log In'));
	}
	if ($mode == 'login') {
	$dialog->addCancelButton($this->getStartURI());
	}
	}

	$v_user = $request->getStr('ldap_username');

	$e_user = null;
	$e_pass = null;

	$errors = array();
	if ($request->isHTTPPost()) {
	// NOTE: This is intentionally vague so as not to disclose whether a
	// given username exists.
	$e_user = pht('Invalid');
	$e_pass = pht('Invalid');
	$errors[] = pht('Username or password are incorrect.');
	}

	$form = id(new PHUIFormLayoutView())
	->setUser($viewer)
	->setFullWidth(true)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('LDAP Username'))
	->setName('ldap_username')
	->setAutofocus(true)
	->setValue($v_user)
	->setError($e_user))
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel(pht('LDAP Password'))
	->setName('ldap_password')
	->setError($e_pass));

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

	$dialog->appendChild($errors);
	$dialog->appendChild($form);


	return $dialog;
	}

	public function processLoginRequest(
	PhabricatorAuthLoginController $controller) {

	$request = $controller->getRequest();
	$viewer = $request->getUser();
	$response = null;
	$account = null;

	$username = $request->getStr('ldap_username');
	$password = $request->getStr('ldap_password');
	$has_password = strlen($password);
	$password = new PhutilOpaqueEnvelope($password);

	if (!strlen($username) \|\| !$has_password) {
	$response = $controller->buildProviderPageResponse(
	$this,
	$this->renderLoginForm($request, 'login'));
	return array($account, $response);
	}

	if ($request->isFormPost()) {
	try {
	if (strlen($username) && $has_password) {
	$adapter = $this->getAdapter();
	$adapter->setLoginUsername($username);
	$adapter->setLoginPassword($password);

	// TODO: This calls ldap_bind() eventually, which dumps cleartext
	// passwords to the error log. See note in PhutilLDAPAuthAdapter.
	// See T3351.

	DarkConsoleErrorLogPluginAPI::enableDiscardMode();
	- $account_id = $adapter->getAccountID();
	+ $identifiers = $adapter->getAccountIdentifiers();
	DarkConsoleErrorLogPluginAPI::disableDiscardMode();
	} else {
	throw new Exception(pht('Username and password are required!'));
	}
	} catch (PhutilAuthCredentialException $ex) {
	$response = $controller->buildProviderPageResponse(
	$this,
	$this->renderLoginForm($request, 'login'));
	return array($account, $response);
	} catch (Exception $ex) {
	// TODO: Make this cleaner.
	throw $ex;
	}
	}

	- return array($this->loadOrCreateAccount($account_id), $response);
	+ return array($this->loadOrCreateAccount($identifiers), $response);
	}


	const KEY_HOSTNAME = 'ldap:host';
	const KEY_PORT = 'ldap:port';
	const KEY_DISTINGUISHED_NAME = 'ldap:dn';
	const KEY_SEARCH_ATTRIBUTES = 'ldap:search-attribute';
	const KEY_USERNAME_ATTRIBUTE = 'ldap:username-attribute';
	const KEY_REALNAME_ATTRIBUTES = 'ldap:realname-attributes';
	const KEY_VERSION = 'ldap:version';
	const KEY_REFERRALS = 'ldap:referrals';
	const KEY_START_TLS = 'ldap:start-tls';
	// TODO: This is misspelled! See T13005.
	const KEY_ANONYMOUS_USERNAME = 'ldap:anoynmous-username';
	const KEY_ANONYMOUS_PASSWORD = 'ldap:anonymous-password';
	const KEY_ALWAYS_SEARCH = 'ldap:always-search';
	const KEY_ACTIVEDIRECTORY_DOMAIN = 'ldap:activedirectory-domain';

	private function getPropertyKeys() {
	return array_keys($this->getPropertyLabels());
	}

	private function getPropertyLabels() {
	return array(
	self::KEY_HOSTNAME => pht('LDAP Hostname'),
	self::KEY_PORT => pht('LDAP Port'),
	self::KEY_DISTINGUISHED_NAME => pht('Base Distinguished Name'),
	self::KEY_SEARCH_ATTRIBUTES => pht('Search Attributes'),
	self::KEY_ALWAYS_SEARCH => pht('Always Search'),
	self::KEY_ANONYMOUS_USERNAME => pht('Anonymous Username'),
	self::KEY_ANONYMOUS_PASSWORD => pht('Anonymous Password'),
	self::KEY_USERNAME_ATTRIBUTE => pht('Username Attribute'),
	self::KEY_REALNAME_ATTRIBUTES => pht('Realname Attributes'),
	self::KEY_VERSION => pht('LDAP Version'),
	self::KEY_REFERRALS => pht('Enable Referrals'),
	self::KEY_START_TLS => pht('Use TLS'),
	self::KEY_ACTIVEDIRECTORY_DOMAIN => pht('ActiveDirectory Domain'),
	);
	}

	public function readFormValuesFromProvider() {
	$properties = array();
	foreach ($this->getPropertyLabels() as $key => $ignored) {
	$properties[$key] = $this->getProviderConfig()->getProperty($key);
	}
	return $properties;
	}

	public function readFormValuesFromRequest(AphrontRequest $request) {
	$values = array();
	foreach ($this->getPropertyKeys() as $key) {
	switch ($key) {
	case self::KEY_REALNAME_ATTRIBUTES:
	$values[$key] = $request->getStrList($key, array());
	break;
	default:
	$values[$key] = $request->getStr($key);
	break;
	}
	}

	return $values;
	}

	public function processEditForm(
	AphrontRequest $request,
	array $values) {
	$errors = array();
	$issues = array();
	return array($errors, $issues, $values);
	}

	public static function assertLDAPExtensionInstalled() {
	if (!function_exists('ldap_bind')) {
	throw new Exception(
	pht(
	'Before you can set up or use LDAP, you need to install the PHP '.
	'LDAP extension. It is not currently installed, so PHP can not '.
	'talk to LDAP. Usually you can install it with '.
	'`%s`, `%s`, or a similar package manager command.',
	'yum install php-ldap',
	'apt-get install php5-ldap'));
	}
	}

	public function extendEditForm(
	AphrontRequest $request,
	AphrontFormView $form,
	array $values,
	array $issues) {

	self::assertLDAPExtensionInstalled();

	$labels = $this->getPropertyLabels();

	$captions = array(
	self::KEY_HOSTNAME =>
	pht('Example: %s%sFor LDAPS, use: %s',
	phutil_tag('tt', array(), pht('ldap.example.com')),
	phutil_tag('br'),
	phutil_tag('tt', array(), pht('ldaps://ldaps.example.com/'))),
	self::KEY_DISTINGUISHED_NAME =>
	pht('Example: %s',
	phutil_tag('tt', array(), pht('ou=People, dc=example, dc=com'))),
	self::KEY_USERNAME_ATTRIBUTE =>
	pht('Example: %s',
	phutil_tag('tt', array(), pht('sn'))),
	self::KEY_REALNAME_ATTRIBUTES =>
	pht('Example: %s',
	phutil_tag('tt', array(), pht('firstname, lastname'))),
	self::KEY_REFERRALS =>
	pht('Follow referrals. Disable this for Windows AD 2003.'),
	self::KEY_START_TLS =>
	pht('Start TLS after binding to the LDAP server.'),
	self::KEY_ALWAYS_SEARCH =>
	pht('Always bind and search, even without a username and password.'),
	);

	$types = array(
	self::KEY_REFERRALS => 'checkbox',
	self::KEY_START_TLS => 'checkbox',
	self::KEY_SEARCH_ATTRIBUTES => 'textarea',
	self::KEY_REALNAME_ATTRIBUTES => 'list',
	self::KEY_ANONYMOUS_PASSWORD => 'password',
	self::KEY_ALWAYS_SEARCH => 'checkbox',
	);

	$instructions = array(
	self::KEY_SEARCH_ATTRIBUTES => pht(
	"When a user types their LDAP username and password into Phabricator, ".
	"Phabricator can either bind to LDAP with those credentials directly ".
	"(which is simpler, but not as powerful) or bind to LDAP with ".
	"anonymous credentials, then search for record matching the supplied ".
	"credentials (which is more complicated, but more powerful).\n\n".
	"For many installs, direct binding is sufficient. However, you may ".
	"want to search first if:\n\n".
	" - You want users to be able to log in with either their username ".
	" or their email address.\n".
	" - The login/username is not part of the distinguished name in ".
	" your LDAP records.\n".
	" - You want to restrict logins to a subset of users (like only ".
	" those in certain departments).\n".
	" - Your LDAP server is configured in some other way that prevents ".
	" direct binding from working correctly.\n\n".
	"To bind directly, enter the LDAP attribute corresponding to the ".
	"login name into the Search Attributes box below. Often, this is ".
	"something like `sn` or `uid`. This is the simplest configuration, ".
	"but will only work if the username is part of the distinguished ".
	"name, and won't let you apply complex restrictions to logins.\n\n".
	" lang=text,name=Simple Direct Binding\n".
	" sn\n\n".
	"To search first, provide an anonymous username and password ".
	"below (or check the Always Search checkbox), then enter one ".
	"or more search queries into this field, one per line. ".
	"After binding, these queries will be used to identify the ".
	"record associated with the login name the user typed.\n\n".
	"Searches will be tried in order until a matching record is found. ".
	"Each query can be a simple attribute name (like `sn` or `mail`), ".
	"which will search for a matching record, or it can be a complex ".
	"query that uses the string `\${login}` to represent the login ".
	"name.\n\n".
	"A common simple configuration is just an attribute name, like ".
	"`sn`, which will work the same way direct binding works:\n\n".
	" lang=text,name=Simple Example\n".
	" sn\n\n".
	"A slightly more complex configuration might let the user log in with ".
	"either their login name or email address:\n\n".
	" lang=text,name=Match Several Attributes\n".
	" mail\n".
	" sn\n\n".
	"If your LDAP directory is more complex, or you want to perform ".
	"sophisticated filtering, you can use more complex queries. Depending ".
	"on your directory structure, this example might allow users to log ".
	"in with either their email address or username, but only if they're ".
	"in specific departments:\n\n".
	" lang=text,name=Complex Example\n".
	" (&(mail=\${login})(\|(departmentNumber=1)(departmentNumber=2)))\n".
	" (&(sn=\${login})(\|(departmentNumber=1)(departmentNumber=2)))\n\n".
	"All of the attribute names used here are just examples: your LDAP ".
	"server may use different attribute names."),
	self::KEY_ALWAYS_SEARCH => pht(
	'To search for an LDAP record before authenticating, either check '.
	'the Always Search checkbox or enter an anonymous '.
	'username and password to use to perform the search.'),
	self::KEY_USERNAME_ATTRIBUTE => pht(
	'Optionally, specify a username attribute to use to prefill usernames '.
	'when registering a new account. This is purely cosmetic and does not '.
	'affect the login process, but you can configure it to make sure '.
	'users get the same default username as their LDAP username, so '.
	'usernames remain consistent across systems.'),
	self::KEY_REALNAME_ATTRIBUTES => pht(
	'Optionally, specify one or more comma-separated attributes to use to '.
	'prefill the "Real Name" field when registering a new account. This '.
	'is purely cosmetic and does not affect the login process, but can '.
	'make registration a little easier.'),
	);

	foreach ($labels as $key => $label) {
	$caption = idx($captions, $key);
	$type = idx($types, $key);
	$value = idx($values, $key);

	$control = null;
	switch ($type) {
	case 'checkbox':
	$control = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	$key,
	1,
	hsprintf('<strong>%s:</strong> %s', $label, $caption),
	$value);
	break;
	case 'list':
	$control = id(new AphrontFormTextControl())
	->setName($key)
	->setLabel($label)
	->setCaption($caption)
	->setValue($value ? implode(', ', $value) : null);
	break;
	case 'password':
	$control = id(new AphrontFormPasswordControl())
	->setName($key)
	->setLabel($label)
	->setCaption($caption)
	->setDisableAutocomplete(true)
	->setValue($value);
	break;
	case 'textarea':
	$control = id(new AphrontFormTextAreaControl())
	->setName($key)
	->setLabel($label)
	->setCaption($caption)
	->setValue($value);
	break;
	default:
	$control = id(new AphrontFormTextControl())
	->setName($key)
	->setLabel($label)
	->setCaption($caption)
	->setValue($value);
	break;
	}

	$instruction_text = idx($instructions, $key);
	if (strlen($instruction_text)) {
	$form->appendRemarkupInstructions($instruction_text);
	}

	$form->appendChild($control);
	}
	}

	public function renderConfigPropertyTransactionTitle(
	PhabricatorAuthProviderConfigTransaction $xaction) {

	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$key = $xaction->getMetadataValue(
	PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);

	$labels = $this->getPropertyLabels();
	if (isset($labels[$key])) {
	$label = $labels[$key];

	$mask = false;
	switch ($key) {
	case self::KEY_ANONYMOUS_PASSWORD:
	$mask = true;
	break;
	}

	if ($mask) {
	return pht(
	'%s updated the "%s" value.',
	$xaction->renderHandleLink($author_phid),
	$label);
	}

	if ($old === null \|\| $old === '') {
	return pht(
	'%s set the "%s" value to "%s".',
	$xaction->renderHandleLink($author_phid),
	$label,
	$new);
	} else {
	return pht(
	'%s changed the "%s" value from "%s" to "%s".',
	$xaction->renderHandleLink($author_phid),
	$label,
	$old,
	$new);
	}
	}

	return parent::renderConfigPropertyTransactionTitle($xaction);
	}

	public static function getLDAPProvider() {
	$providers = self::getAllEnabledProviders();

	foreach ($providers as $provider) {
	if ($provider instanceof PhabricatorLDAPAuthProvider) {
	return $provider;
	}
	}

	return null;
	}

	}
	diff --git a/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
	index 2fbc637460..2e603162c3 100644
	--- a/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
	+++ b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
	@@ -1,283 +1,283 @@
	<?php

	abstract class PhabricatorOAuth1AuthProvider
	extends PhabricatorOAuthAuthProvider {

	protected $adapter;

	const PROPERTY_CONSUMER_KEY = 'oauth1:consumer:key';
	const PROPERTY_CONSUMER_SECRET = 'oauth1:consumer:secret';
	const PROPERTY_PRIVATE_KEY = 'oauth1:private:key';

	protected function getIDKey() {
	return self::PROPERTY_CONSUMER_KEY;
	}

	protected function getSecretKey() {
	return self::PROPERTY_CONSUMER_SECRET;
	}

	protected function configureAdapter(PhutilOAuth1AuthAdapter $adapter) {
	$config = $this->getProviderConfig();
	$adapter->setConsumerKey($config->getProperty(self::PROPERTY_CONSUMER_KEY));
	$secret = $config->getProperty(self::PROPERTY_CONSUMER_SECRET);
	if (strlen($secret)) {
	$adapter->setConsumerSecret(new PhutilOpaqueEnvelope($secret));
	}
	$adapter->setCallbackURI(PhabricatorEnv::getURI($this->getLoginURI()));
	return $adapter;
	}

	protected function renderLoginForm(AphrontRequest $request, $mode) {
	$attributes = array(
	'method' => 'POST',
	'uri' => $this->getLoginURI(),
	);
	return $this->renderStandardLoginButton($request, $mode, $attributes);
	}

	public function processLoginRequest(
	PhabricatorAuthLoginController $controller) {

	$request = $controller->getRequest();
	$adapter = $this->getAdapter();
	$account = null;
	$response = null;

	if ($request->isHTTPPost()) {
	// Add a CSRF code to the callback URI, which we'll verify when
	// performing the login.

	$client_code = $this->getAuthCSRFCode($request);

	$callback_uri = $adapter->getCallbackURI();
	$callback_uri = $callback_uri.$client_code.'/';
	$adapter->setCallbackURI($callback_uri);

	$uri = $adapter->getClientRedirectURI();

	$this->saveHandshakeTokenSecret(
	$client_code,
	$adapter->getTokenSecret());

	$response = id(new AphrontRedirectResponse())
	->setIsExternal(true)
	->setURI($uri);
	return array($account, $response);
	}

	$denied = $request->getStr('denied');
	if (strlen($denied)) {
	// Twitter indicates that the user cancelled the login attempt by
	// returning "denied" as a parameter.
	throw new PhutilAuthUserAbortedException();
	}

	// NOTE: You can get here via GET, this should probably be a bit more
	// user friendly.

	$this->verifyAuthCSRFCode($request, $controller->getExtraURIData());

	$token = $request->getStr('oauth_token');
	$verifier = $request->getStr('oauth_verifier');

	if (!$token) {
	throw new Exception(pht("Expected '%s' in request!", 'oauth_token'));
	}

	if (!$verifier) {
	throw new Exception(pht("Expected '%s' in request!", 'oauth_verifier'));
	}

	$adapter->setToken($token);
	$adapter->setVerifier($verifier);

	$client_code = $this->getAuthCSRFCode($request);
	$token_secret = $this->loadHandshakeTokenSecret($client_code);
	$adapter->setTokenSecret($token_secret);

	// NOTE: As a side effect, this will cause the OAuth adapter to request
	// an access token.

	try {
	- $account_id = $adapter->getAccountID();
	+ $identifiers = $adapter->getAccountIdentifiers();
	} catch (Exception $ex) {
	// TODO: Handle this in a more user-friendly way.
	throw $ex;
	}

	- if (!strlen($account_id)) {
	+ if (!$identifiers) {
	$response = $controller->buildProviderErrorResponse(
	$this,
	pht(
	'The OAuth provider failed to retrieve an account ID.'));

	return array($account, $response);
	}

	- return array($this->loadOrCreateAccount($account_id), $response);
	+ return array($this->loadOrCreateAccount($identifiers), $response);
	}

	public function processEditForm(
	AphrontRequest $request,
	array $values) {

	$key_ckey = self::PROPERTY_CONSUMER_KEY;
	$key_csecret = self::PROPERTY_CONSUMER_SECRET;

	return $this->processOAuthEditForm(
	$request,
	$values,
	pht('Consumer key is required.'),
	pht('Consumer secret is required.'));
	}

	public function extendEditForm(
	AphrontRequest $request,
	AphrontFormView $form,
	array $values,
	array $issues) {

	return $this->extendOAuthEditForm(
	$request,
	$form,
	$values,
	$issues,
	pht('OAuth Consumer Key'),
	pht('OAuth Consumer Secret'));
	}

	public function renderConfigPropertyTransactionTitle(
	PhabricatorAuthProviderConfigTransaction $xaction) {

	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$key = $xaction->getMetadataValue(
	PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);

	switch ($key) {
	case self::PROPERTY_CONSUMER_KEY:
	if (strlen($old)) {
	return pht(
	'%s updated the OAuth consumer key for this provider from '.
	'"%s" to "%s".',
	$xaction->renderHandleLink($author_phid),
	$old,
	$new);
	} else {
	return pht(
	'%s set the OAuth consumer key for this provider to '.
	'"%s".',
	$xaction->renderHandleLink($author_phid),
	$new);
	}
	case self::PROPERTY_CONSUMER_SECRET:
	if (strlen($old)) {
	return pht(
	'%s updated the OAuth consumer secret for this provider.',
	$xaction->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s set the OAuth consumer secret for this provider.',
	$xaction->renderHandleLink($author_phid));
	}
	}

	return parent::renderConfigPropertyTransactionTitle($xaction);
	}

	protected function synchronizeOAuthAccount(
	PhabricatorExternalAccount $account) {
	$adapter = $this->getAdapter();

	$oauth_token = $adapter->getToken();
	$oauth_token_secret = $adapter->getTokenSecret();

	$account->setProperty('oauth1.token', $oauth_token);
	$account->setProperty('oauth1.token.secret', $oauth_token_secret);
	}

	public function willRenderLinkedAccount(
	PhabricatorUser $viewer,
	PHUIObjectItemView $item,
	PhabricatorExternalAccount $account) {

	$item->addAttribute(pht('OAuth1 Account'));

	parent::willRenderLinkedAccount($viewer, $item, $account);
	}

	protected function getContentSecurityPolicyFormActions() {
	return $this->getAdapter()->getContentSecurityPolicyFormActions();
	}

	/* -( Temporary Secrets )-------------------------------------------------- */


	private function saveHandshakeTokenSecret($client_code, $secret) {
	$secret_type = PhabricatorOAuth1SecretTemporaryTokenType::TOKENTYPE;
	$key = $this->getHandshakeTokenKeyFromClientCode($client_code);
	$type = $this->getTemporaryTokenType($secret_type);

	// Wipe out an existing token, if one exists.
	$token = id(new PhabricatorAuthTemporaryTokenQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withTokenResources(array($key))
	->withTokenTypes(array($type))
	->executeOne();
	if ($token) {
	$token->delete();
	}

	// Save the new secret.
	id(new PhabricatorAuthTemporaryToken())
	->setTokenResource($key)
	->setTokenType($type)
	->setTokenExpires(time() + phutil_units('1 hour in seconds'))
	->setTokenCode($secret)
	->save();
	}

	private function loadHandshakeTokenSecret($client_code) {
	$secret_type = PhabricatorOAuth1SecretTemporaryTokenType::TOKENTYPE;
	$key = $this->getHandshakeTokenKeyFromClientCode($client_code);
	$type = $this->getTemporaryTokenType($secret_type);

	$token = id(new PhabricatorAuthTemporaryTokenQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withTokenResources(array($key))
	->withTokenTypes(array($type))
	->withExpired(false)
	->executeOne();

	if (!$token) {
	throw new Exception(
	pht(
	'Unable to load your OAuth1 token secret from storage. It may '.
	'have expired. Try authenticating again.'));
	}

	return $token->getTokenCode();
	}

	private function getTemporaryTokenType($core_type) {
	// Namespace the type so that multiple providers don't step on each
	// others' toes if a user starts Mediawiki and Bitbucket auth at the
	// same time.

	// TODO: This isn't really a proper use of the table and should get
	// cleaned up some day: the type should be constant.

	return $core_type.':'.$this->getProviderConfig()->getID();
	}

	private function getHandshakeTokenKeyFromClientCode($client_code) {
	// NOTE: This is very slightly coercive since the TemporaryToken table
	// expects an "objectPHID" as an identifier, but nothing about the storage
	// is bound to PHIDs.

	return 'oauth1:secret/'.$client_code;
	}

	}
	diff --git a/src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php b/src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php
	index a3300126af..7d56506339 100644
	--- a/src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php
	+++ b/src/applications/auth/provider/PhabricatorOAuth2AuthProvider.php
	@@ -1,289 +1,289 @@
	<?php

	abstract class PhabricatorOAuth2AuthProvider
	extends PhabricatorOAuthAuthProvider {

	const PROPERTY_APP_ID = 'oauth:app:id';
	const PROPERTY_APP_SECRET = 'oauth:app:secret';

	protected function getIDKey() {
	return self::PROPERTY_APP_ID;
	}

	protected function getSecretKey() {
	return self::PROPERTY_APP_SECRET;
	}


	protected function configureAdapter(PhutilOAuthAuthAdapter $adapter) {
	$config = $this->getProviderConfig();
	$adapter->setClientID($config->getProperty(self::PROPERTY_APP_ID));
	$adapter->setClientSecret(
	new PhutilOpaqueEnvelope(
	$config->getProperty(self::PROPERTY_APP_SECRET)));
	$adapter->setRedirectURI(PhabricatorEnv::getURI($this->getLoginURI()));
	return $adapter;
	}

	protected function renderLoginForm(AphrontRequest $request, $mode) {
	$adapter = $this->getAdapter();
	$adapter->setState($this->getAuthCSRFCode($request));

	$scope = $request->getStr('scope');
	if ($scope) {
	$adapter->setScope($scope);
	}

	$attributes = array(
	'method' => 'GET',
	'uri' => $adapter->getAuthenticateURI(),
	);

	return $this->renderStandardLoginButton($request, $mode, $attributes);
	}

	public function processLoginRequest(
	PhabricatorAuthLoginController $controller) {

	$request = $controller->getRequest();
	$adapter = $this->getAdapter();
	$account = null;
	$response = null;

	$error = $request->getStr('error');
	if ($error) {
	$response = $controller->buildProviderErrorResponse(
	$this,
	pht(
	'The OAuth provider returned an error: %s',
	$error));

	return array($account, $response);
	}

	$this->verifyAuthCSRFCode($request, $request->getStr('state'));

	$code = $request->getStr('code');
	if (!strlen($code)) {
	$response = $controller->buildProviderErrorResponse(
	$this,
	pht(
	'The OAuth provider did not return a "code" parameter in its '.
	'response.'));

	return array($account, $response);
	}

	$adapter->setCode($code);

	// NOTE: As a side effect, this will cause the OAuth adapter to request
	// an access token.

	try {
	- $account_id = $adapter->getAccountID();
	+ $identifiers = $adapter->getAccountIdentifiers();
	} catch (Exception $ex) {
	// TODO: Handle this in a more user-friendly way.
	throw $ex;
	}

	- if (!strlen($account_id)) {
	+ if (!$identifiers) {
	$response = $controller->buildProviderErrorResponse(
	$this,
	pht(
	'The OAuth provider failed to retrieve an account ID.'));

	return array($account, $response);
	}

	- return array($this->loadOrCreateAccount($account_id), $response);
	+ return array($this->loadOrCreateAccount($identifiers), $response);
	}

	public function processEditForm(
	AphrontRequest $request,
	array $values) {

	return $this->processOAuthEditForm(
	$request,
	$values,
	pht('Application ID is required.'),
	pht('Application secret is required.'));
	}

	public function extendEditForm(
	AphrontRequest $request,
	AphrontFormView $form,
	array $values,
	array $issues) {

	return $this->extendOAuthEditForm(
	$request,
	$form,
	$values,
	$issues,
	pht('OAuth App ID'),
	pht('OAuth App Secret'));
	}

	public function renderConfigPropertyTransactionTitle(
	PhabricatorAuthProviderConfigTransaction $xaction) {

	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$key = $xaction->getMetadataValue(
	PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);

	switch ($key) {
	case self::PROPERTY_APP_ID:
	if (strlen($old)) {
	return pht(
	'%s updated the OAuth application ID for this provider from '.
	'"%s" to "%s".',
	$xaction->renderHandleLink($author_phid),
	$old,
	$new);
	} else {
	return pht(
	'%s set the OAuth application ID for this provider to '.
	'"%s".',
	$xaction->renderHandleLink($author_phid),
	$new);
	}
	case self::PROPERTY_APP_SECRET:
	if (strlen($old)) {
	return pht(
	'%s updated the OAuth application secret for this provider.',
	$xaction->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s set the OAuth application secret for this provider.',
	$xaction->renderHandleLink($author_phid));
	}
	case self::PROPERTY_NOTE:
	if (strlen($old)) {
	return pht(
	'%s updated the OAuth application notes for this provider.',
	$xaction->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s set the OAuth application notes for this provider.',
	$xaction->renderHandleLink($author_phid));
	}

	}

	return parent::renderConfigPropertyTransactionTitle($xaction);
	}

	protected function synchronizeOAuthAccount(
	PhabricatorExternalAccount $account) {
	$adapter = $this->getAdapter();

	$oauth_token = $adapter->getAccessToken();
	$account->setProperty('oauth.token.access', $oauth_token);

	if ($adapter->supportsTokenRefresh()) {
	$refresh_token = $adapter->getRefreshToken();
	$account->setProperty('oauth.token.refresh', $refresh_token);
	} else {
	$account->setProperty('oauth.token.refresh', null);
	}

	$expires = $adapter->getAccessTokenExpires();
	$account->setProperty('oauth.token.access.expires', $expires);
	}

	public function getOAuthAccessToken(
	PhabricatorExternalAccount $account,
	$force_refresh = false) {

	if ($account->getProviderKey() !== $this->getProviderKey()) {
	throw new Exception(pht('Account does not match provider!'));
	}

	if (!$force_refresh) {
	$access_expires = $account->getProperty('oauth.token.access.expires');
	$access_token = $account->getProperty('oauth.token.access');

	// Don't return a token with fewer than this many seconds remaining until
	// it expires.
	$shortest_token = 60;
	if ($access_token) {
	if ($access_expires === null \|\|
	$access_expires > (time() + $shortest_token)) {
	return $access_token;
	}
	}
	}

	$refresh_token = $account->getProperty('oauth.token.refresh');
	if ($refresh_token) {
	$adapter = $this->getAdapter();
	if ($adapter->supportsTokenRefresh()) {
	$adapter->refreshAccessToken($refresh_token);

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

	return $account->getProperty('oauth.token.access');
	}
	}

	return null;
	}

	public function willRenderLinkedAccount(
	PhabricatorUser $viewer,
	PHUIObjectItemView $item,
	PhabricatorExternalAccount $account) {

	// Get a valid token, possibly refreshing it. If we're unable to refresh
	// it, render a message to that effect. The user may be able to repair the
	// link by manually reconnecting.

	$is_invalid = false;
	try {
	$oauth_token = $this->getOAuthAccessToken($account);
	} catch (Exception $ex) {
	$oauth_token = null;
	$is_invalid = true;
	}

	$item->addAttribute(pht('OAuth2 Account'));

	if ($oauth_token) {
	$oauth_expires = $account->getProperty('oauth.token.access.expires');
	if ($oauth_expires) {
	$item->addAttribute(
	pht(
	'Active OAuth Token (Expires: %s)',
	phabricator_datetime($oauth_expires, $viewer)));
	} else {
	$item->addAttribute(
	pht('Active OAuth Token'));
	}
	} else if ($is_invalid) {
	$item->addAttribute(pht('Invalid OAuth Access Token'));
	} else {
	$item->addAttribute(pht('No OAuth Access Token'));
	}

	parent::willRenderLinkedAccount($viewer, $item, $account);
	}

	public function supportsAutoLogin() {
	return true;
	}

	public function getAutoLoginURI(AphrontRequest $request) {
	$csrf_code = $this->getAuthCSRFCode($request);

	$adapter = $this->getAdapter();
	$adapter->setState($csrf_code);

	return $adapter->getAuthenticateURI();
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Feb 20, 23:44 (3 h, 42 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1163408
Default Alt Text: (61 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions