No OneTemporary
Actions

Size

58 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
	index 0496b93bb6..c0f72ae404 100644
	--- a/src/applications/diffusion/controller/DiffusionServeController.php
	+++ b/src/applications/diffusion/controller/DiffusionServeController.php
	@@ -1,1225 +1,1239 @@
	<?php

	final class DiffusionServeController extends DiffusionController {

	private $serviceViewer;
	private $serviceRepository;

	private $isGitLFSRequest;
	private $gitLFSToken;
	private $gitLFSInput;

	public function setServiceViewer(PhabricatorUser $viewer) {
	$this->getRequest()->setUser($viewer);

	$this->serviceViewer = $viewer;
	return $this;
	}

	public function getServiceViewer() {
	return $this->serviceViewer;
	}

	public function setServiceRepository(PhabricatorRepository $repository) {
	$this->serviceRepository = $repository;
	return $this;
	}

	public function getServiceRepository() {
	return $this->serviceRepository;
	}

	public function getIsGitLFSRequest() {
	return $this->isGitLFSRequest;
	}

	public function getGitLFSToken() {
	return $this->gitLFSToken;
	}

	public function isVCSRequest(AphrontRequest $request) {
	$identifier = $this->getRepositoryIdentifierFromRequest($request);
	if ($identifier === null) {
	return null;
	}

	$content_type = $request->getHTTPHeader('Content-Type');
	$user_agent = idx($_SERVER, 'HTTP_USER_AGENT');
	$request_type = $request->getHTTPHeader('X-Phabricator-Request-Type');

	// This may have a "charset" suffix, so only match the prefix.
	$lfs_pattern = '(^application/vnd\\.git-lfs\\+json(;\|\z))';

	$vcs = null;
	if ($request->getExists('service')) {
	$service = $request->getStr('service');
	// We get this initially for `info/refs`.
	// Git also gives us a User-Agent like "git/1.8.2.3".
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	} else if (strncmp($user_agent, 'git/', 4) === 0) {
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	} else if ($content_type == 'application/x-git-upload-pack-request') {
	// We get this for `git-upload-pack`.
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	} else if ($content_type == 'application/x-git-receive-pack-request') {
	// We get this for `git-receive-pack`.
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	} else if (preg_match($lfs_pattern, $content_type)) {
	// This is a Git LFS HTTP API request.
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	$this->isGitLFSRequest = true;
	} else if ($request_type == 'git-lfs') {
	// This is a Git LFS object content request.
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	$this->isGitLFSRequest = true;
	} else if ($request->getExists('cmd')) {
	// Mercurial also sends an Accept header like
	// "application/mercurial-0.1", and a User-Agent like
	// "mercurial/proto-1.0".
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL;
	} else {
	// Subversion also sends an initial OPTIONS request (vs GET/POST), and
	// has a User-Agent like "SVN/1.8.3 (x86_64-apple-darwin11.4.2)
	// serf/1.3.2".
	$dav = $request->getHTTPHeader('DAV');
	$dav = new PhutilURI($dav);
	if ($dav->getDomain() === 'subversion.tigris.org') {
	$vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN;
	}
	}

	return $vcs;
	}

	public function handleRequest(AphrontRequest $request) {
	$service_exception = null;
	$response = null;

	try {
	$response = $this->serveRequest($request);
	} catch (Exception $ex) {
	$service_exception = $ex;
	}

	try {
	$remote_addr = $request->getRemoteAddress();

	+ if ($request->isHTTPS()) {
	+ $remote_protocol = PhabricatorRepositoryPullEvent::PROTOCOL_HTTPS;
	+ } else {
	+ $remote_protocol = PhabricatorRepositoryPullEvent::PROTOCOL_HTTP;
	+ }
	+
	$pull_event = id(new PhabricatorRepositoryPullEvent())
	->setEpoch(PhabricatorTime::getNow())
	->setRemoteAddress($remote_addr)
	- ->setRemoteProtocol('http');
	+ ->setRemoteProtocol($remote_protocol);

	if ($response) {
	- $pull_event
	- ->setResultType('wild')
	- ->setResultCode($response->getHTTPResponseCode());
	+ $response_code = $response->getHTTPResponseCode();
	+
	+ if ($response_code == 200) {
	+ $pull_event
	+ ->setResultType(PhabricatorRepositoryPullEvent::RESULT_PULL)
	+ ->setResultCode($response_code);
	+ } else {
	+ $pull_event
	+ ->setResultType(PhabricatorRepositoryPullEvent::RESULT_ERROR)
	+ ->setResultCode($response_code);
	+ }

	if ($response instanceof PhabricatorVCSResponse) {
	$pull_event->setProperties(
	array(
	'response.message' => $response->getMessage(),
	));
	}
	} else {
	$pull_event
	- ->setResultType('exception')
	+ ->setResultType(PhabricatorRepositoryPullEvent::RESULT_EXCEPTION)
	->setResultCode(500)
	->setProperties(
	array(
	'exception.class' => get_class($ex),
	'exception.message' => $ex->getMessage(),
	));
	}

	$viewer = $this->getServiceViewer();
	if ($viewer) {
	$pull_event->setPullerPHID($viewer->getPHID());
	}

	$repository = $this->getServiceRepository();
	if ($repository) {
	$pull_event->setRepositoryPHID($repository->getPHID());
	}

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

	} catch (Exception $ex) {
	if ($service_exception) {
	throw $service_exception;
	}
	throw $ex;
	}

	if ($service_exception) {
	throw $service_exception;
	}

	return $response;
	}

	private function serveRequest(AphrontRequest $request) {
	$identifier = $this->getRepositoryIdentifierFromRequest($request);

	// If authentication credentials have been provided, try to find a user
	// that actually matches those credentials.

	// We require both the username and password to be nonempty, because Git
	// won't prompt users who provide a username but no password otherwise.
	// See T10797 for discussion.

	$have_user = strlen(idx($_SERVER, 'PHP_AUTH_USER'));
	$have_pass = strlen(idx($_SERVER, 'PHP_AUTH_PW'));
	if ($have_user && $have_pass) {
	$username = $_SERVER['PHP_AUTH_USER'];
	$password = new PhutilOpaqueEnvelope($_SERVER['PHP_AUTH_PW']);

	// Try Git LFS auth first since we can usually reject it without doing
	// any queries, since the username won't match the one we expect or the
	// request won't be LFS.
	$viewer = $this->authenticateGitLFSUser($username, $password);

	// If that failed, try normal auth. Note that we can use normal auth on
	// LFS requests, so this isn't strictly an alternative to LFS auth.
	if (!$viewer) {
	$viewer = $this->authenticateHTTPRepositoryUser($username, $password);
	}

	if (!$viewer) {
	return new PhabricatorVCSResponse(
	403,
	pht('Invalid credentials.'));
	}
	} else {
	// User hasn't provided credentials, which means we count them as
	// being "not logged in".
	$viewer = new PhabricatorUser();
	}

	$this->setServiceViewer($viewer);

	$allow_public = PhabricatorEnv::getEnvConfig('policy.allow-public');
	$allow_auth = PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth');
	if (!$allow_public) {
	if (!$viewer->isLoggedIn()) {
	if ($allow_auth) {
	return new PhabricatorVCSResponse(
	401,
	pht('You must log in to access repositories.'));
	} else {
	return new PhabricatorVCSResponse(
	403,
	pht('Public and authenticated HTTP access are both forbidden.'));
	}
	}
	}

	try {
	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withIdentifiers(array($identifier))
	->needURIs(true)
	->executeOne();
	if (!$repository) {
	return new PhabricatorVCSResponse(
	404,
	pht('No such repository exists.'));
	}
	} catch (PhabricatorPolicyException $ex) {
	if ($viewer->isLoggedIn()) {
	return new PhabricatorVCSResponse(
	403,
	pht('You do not have permission to access this repository.'));
	} else {
	if ($allow_auth) {
	return new PhabricatorVCSResponse(
	401,
	pht('You must log in to access this repository.'));
	} else {
	return new PhabricatorVCSResponse(
	403,
	pht(
	'This repository requires authentication, which is forbidden '.
	'over HTTP.'));
	}
	}
	}

	$response = $this->validateGitLFSRequest($repository, $viewer);
	if ($response) {
	return $response;
	}

	$this->setServiceRepository($repository);

	if (!$repository->isTracked()) {
	return new PhabricatorVCSResponse(
	403,
	pht('This repository is inactive.'));
	}

	$is_push = !$this->isReadOnlyRequest($repository);

	if ($this->getIsGitLFSRequest() && $this->getGitLFSToken()) {
	// We allow git LFS requests over HTTP even if the repository does not
	// otherwise support HTTP reads or writes, as long as the user is using a
	// token from SSH. If they're using HTTP username + password auth, they
	// have to obey the normal HTTP rules.
	} else {
	// For now, we don't distinguish between HTTP and HTTPS-originated
	// requests that are proxied within the cluster, so the user can connect
	// with HTTPS but we may be on HTTP by the time we reach this part of
	// the code. Allow things to move forward as long as either protocol
	// can be served.
	$proto_https = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_HTTPS;
	$proto_http = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_HTTP;

	$can_read =
	$repository->canServeProtocol($proto_https, false) \|\|
	$repository->canServeProtocol($proto_http, false);
	if (!$can_read) {
	return new PhabricatorVCSResponse(
	403,
	pht('This repository is not available over HTTP.'));
	}

	if ($is_push) {
	$can_write =
	$repository->canServeProtocol($proto_https, true) \|\|
	$repository->canServeProtocol($proto_http, true);
	if (!$can_write) {
	return new PhabricatorVCSResponse(
	403,
	pht('This repository is read-only over HTTP.'));
	}
	}
	}

	if ($is_push) {
	$can_push = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	DiffusionPushCapability::CAPABILITY);
	if (!$can_push) {
	if ($viewer->isLoggedIn()) {
	$error_code = 403;
	$error_message = pht(
	'You do not have permission to push to this repository ("%s").',
	$repository->getDisplayName());

	if ($this->getIsGitLFSRequest()) {
	return DiffusionGitLFSResponse::newErrorResponse(
	$error_code,
	$error_message);
	} else {
	return new PhabricatorVCSResponse(
	$error_code,
	$error_message);
	}
	} else {
	if ($allow_auth) {
	return new PhabricatorVCSResponse(
	401,
	pht('You must log in to push to this repository.'));
	} else {
	return new PhabricatorVCSResponse(
	403,
	pht(
	'Pushing to this repository requires authentication, '.
	'which is forbidden over HTTP.'));
	}
	}
	}
	}

	$vcs_type = $repository->getVersionControlSystem();
	$req_type = $this->isVCSRequest($request);

	if ($vcs_type != $req_type) {
	switch ($req_type) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$result = new PhabricatorVCSResponse(
	500,
	pht(
	'This repository ("%s") is not a Git repository.',
	$repository->getDisplayName()));
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$result = new PhabricatorVCSResponse(
	500,
	pht(
	'This repository ("%s") is not a Mercurial repository.',
	$repository->getDisplayName()));
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$result = new PhabricatorVCSResponse(
	500,
	pht(
	'This repository ("%s") is not a Subversion repository.',
	$repository->getDisplayName()));
	break;
	default:
	$result = new PhabricatorVCSResponse(
	500,
	pht('Unknown request type.'));
	break;
	}
	} else {
	switch ($vcs_type) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$result = $this->serveVCSRequest($repository, $viewer);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$result = new PhabricatorVCSResponse(
	500,
	pht(
	'Phabricator does not support HTTP access to Subversion '.
	'repositories.'));
	break;
	default:
	$result = new PhabricatorVCSResponse(
	500,
	pht('Unknown version control system.'));
	break;
	}
	}

	$code = $result->getHTTPResponseCode();

	if ($is_push && ($code == 200)) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$repository->writeStatusMessage(
	PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE,
	PhabricatorRepositoryStatusMessage::CODE_OKAY);
	unset($unguarded);
	}

	return $result;
	}

	private function serveVCSRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer) {

	// We can serve Git LFS requests first, since we don't need to proxy them.
	// It's also important that LFS requests never fall through to standard
	// service pathways, because that would let you use LFS tokens to read
	// normal repository data.
	if ($this->getIsGitLFSRequest()) {
	return $this->serveGitLFSRequest($repository, $viewer);
	}

	// If this repository is hosted on a service, we need to proxy the request
	// to a host which can serve it.
	$is_cluster_request = $this->getRequest()->isProxiedClusterRequest();

	$uri = $repository->getAlmanacServiceURI(
	$viewer,
	$is_cluster_request,
	array(
	'http',
	'https',
	));
	if ($uri) {
	$future = $this->getRequest()->newClusterProxyFuture($uri);
	return id(new AphrontHTTPProxyResponse())
	->setHTTPFuture($future);
	}

	// Otherwise, we're going to handle the request locally.

	$vcs_type = $repository->getVersionControlSystem();
	switch ($vcs_type) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$result = $this->serveGitRequest($repository, $viewer);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$result = $this->serveMercurialRequest($repository, $viewer);
	break;
	}

	return $result;
	}

	private function isReadOnlyRequest(
	PhabricatorRepository $repository) {
	$request = $this->getRequest();
	$method = $_SERVER['REQUEST_METHOD'];

	// TODO: This implementation is safe by default, but very incomplete.

	if ($this->getIsGitLFSRequest()) {
	return $this->isGitLFSReadOnlyRequest($repository);
	}

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$service = $request->getStr('service');
	$path = $this->getRequestDirectoryPath($repository);
	// NOTE: Service names are the reverse of what you might expect, as they
	// are from the point of view of the server. The main read service is
	// "git-upload-pack", and the main write service is "git-receive-pack".

	if ($method == 'GET' &&
	$path == '/info/refs' &&
	$service == 'git-upload-pack') {
	return true;
	}

	if ($path == '/git-upload-pack') {
	return true;
	}

	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$cmd = $request->getStr('cmd');
	if ($cmd == 'batch') {
	$cmds = idx($this->getMercurialArguments(), 'cmds');
	return DiffusionMercurialWireProtocol::isReadOnlyBatchCommand($cmds);
	}
	return DiffusionMercurialWireProtocol::isReadOnlyCommand($cmd);
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	break;
	}

	return false;
	}

	/**
	* @phutil-external-symbol class PhabricatorStartup
	*/
	private function serveGitRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer) {
	$request = $this->getRequest();

	$request_path = $this->getRequestDirectoryPath($repository);
	$repository_root = $repository->getLocalPath();

	// Rebuild the query string to strip `__magic__` parameters and prevent
	// issues where we might interpret inputs like "service=read&service=write"
	// differently than the server does and pass it an unsafe command.

	// NOTE: This does not use getPassthroughRequestParameters() because
	// that code is HTTP-method agnostic and will encode POST data.

	$query_data = $_GET;
	foreach ($query_data as $key => $value) {
	if (!strncmp($key, '__', 2)) {
	unset($query_data[$key]);
	}
	}
	$query_string = http_build_query($query_data, '', '&');

	// We're about to wipe out PATH with the rest of the environment, so
	// resolve the binary first.
	$bin = Filesystem::resolveBinary('git-http-backend');
	if (!$bin) {
	throw new Exception(
	pht(
	'Unable to find `%s` in %s!',
	'git-http-backend',
	'$PATH'));
	}

	// NOTE: We do not set HTTP_CONTENT_ENCODING here, because we already
	// decompressed the request when we read the request body, so the body is
	// just plain data with no encoding.

	$env = array(
	'REQUEST_METHOD' => $_SERVER['REQUEST_METHOD'],
	'QUERY_STRING' => $query_string,
	'CONTENT_TYPE' => $request->getHTTPHeader('Content-Type'),
	'REMOTE_ADDR' => $_SERVER['REMOTE_ADDR'],
	'GIT_PROJECT_ROOT' => $repository_root,
	'GIT_HTTP_EXPORT_ALL' => '1',
	'PATH_INFO' => $request_path,

	'REMOTE_USER' => $viewer->getUsername(),

	// TODO: Set these correctly.
	// GIT_COMMITTER_NAME
	// GIT_COMMITTER_EMAIL
	) + $this->getCommonEnvironment($viewer);

	$input = PhabricatorStartup::getRawInput();

	$command = csprintf('%s', $bin);
	$command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();

	$cluster_engine = id(new DiffusionRepositoryClusterEngine())
	->setViewer($viewer)
	->setRepository($repository);

	$did_write_lock = false;
	if ($this->isReadOnlyRequest($repository)) {
	$cluster_engine->synchronizeWorkingCopyBeforeRead();
	} else {
	$did_write_lock = true;
	$cluster_engine->synchronizeWorkingCopyBeforeWrite();
	}

	$caught = null;
	try {
	list($err, $stdout, $stderr) = id(new ExecFuture('%C', $command))
	->setEnv($env, true)
	->write($input)
	->resolve();
	} catch (Exception $ex) {
	$caught = $ex;
	}

	if ($did_write_lock) {
	$cluster_engine->synchronizeWorkingCopyAfterWrite();
	}

	unset($unguarded);

	if ($caught) {
	throw $caught;
	}

	if ($err) {
	if ($this->isValidGitShallowCloneResponse($stdout, $stderr)) {
	// Ignore the error if the response passes this special check for
	// validity.
	$err = 0;
	}
	}

	if ($err) {
	return new PhabricatorVCSResponse(
	500,
	pht(
	'Error %d: %s',
	$err,
	phutil_utf8ize($stderr)));
	}

	return id(new DiffusionGitResponse())->setGitData($stdout);
	}

	private function getRequestDirectoryPath(PhabricatorRepository $repository) {
	$request = $this->getRequest();
	$request_path = $request->getRequestURI()->getPath();

	$info = PhabricatorRepository::parseRepositoryServicePath(
	$request_path,
	$repository->getVersionControlSystem());
	$base_path = $info['path'];

	// For Git repositories, strip an optional directory component if it
	// isn't the name of a known Git resource. This allows users to clone
	// repositories as "/diffusion/X/anything.git", for example.
	if ($repository->isGit()) {
	$known = array(
	'info',
	'git-upload-pack',
	'git-receive-pack',
	);

	foreach ($known as $key => $path) {
	$known[$key] = preg_quote($path, '@');
	}

	$known = implode('\|', $known);

	if (preg_match('@^/([^/]+)/('.$known.')(/\|$)@', $base_path)) {
	$base_path = preg_replace('@^/([^/]+)@', '', $base_path);
	}
	}

	return $base_path;
	}

	private function authenticateGitLFSUser(
	$username,
	PhutilOpaqueEnvelope $password) {

	// Never accept these credentials for requests which aren't LFS requests.
	if (!$this->getIsGitLFSRequest()) {
	return null;
	}

	// If we have the wrong username, don't bother checking if the token
	// is right.
	if ($username !== DiffusionGitLFSTemporaryTokenType::HTTP_USERNAME) {
	return null;
	}

	$lfs_pass = $password->openEnvelope();
	$lfs_hash = PhabricatorHash::weakDigest($lfs_pass);

	$token = id(new PhabricatorAuthTemporaryTokenQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withTokenTypes(array(DiffusionGitLFSTemporaryTokenType::TOKENTYPE))
	->withTokenCodes(array($lfs_hash))
	->withExpired(false)
	->executeOne();
	if (!$token) {
	return null;
	}

	$user = id(new PhabricatorPeopleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(array($token->getUserPHID()))
	->executeOne();

	if (!$user) {
	return null;
	}

	if (!$user->isUserActivated()) {
	return null;
	}

	$this->gitLFSToken = $token;

	return $user;
	}

	private function authenticateHTTPRepositoryUser(
	$username,
	PhutilOpaqueEnvelope $password) {

	if (!PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')) {
	// No HTTP auth permitted.
	return null;
	}

	if (!strlen($username)) {
	// No username.
	return null;
	}

	if (!strlen($password->openEnvelope())) {
	// No password.
	return null;
	}

	$user = id(new PhabricatorPeopleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withUsernames(array($username))
	->executeOne();
	if (!$user) {
	// Username doesn't match anything.
	return null;
	}

	if (!$user->isUserActivated()) {
	// User is not activated.
	return null;
	}

	$request = $this->getRequest();
	$content_source = PhabricatorContentSource::newFromRequest($request);

	$engine = id(new PhabricatorAuthPasswordEngine())
	->setViewer($user)
	->setContentSource($content_source)
	->setPasswordType(PhabricatorAuthPassword::PASSWORD_TYPE_VCS)
	->setObject($user);

	if (!$engine->isValidPassword($password)) {
	return null;
	}

	return $user;
	}

	private function serveMercurialRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer) {
	$request = $this->getRequest();

	$bin = Filesystem::resolveBinary('hg');
	if (!$bin) {
	throw new Exception(
	pht(
	'Unable to find `%s` in %s!',
	'hg',
	'$PATH'));
	}

	$env = $this->getCommonEnvironment($viewer);
	$input = PhabricatorStartup::getRawInput();

	$cmd = $request->getStr('cmd');

	$args = $this->getMercurialArguments();
	$args = $this->formatMercurialArguments($cmd, $args);

	if (strlen($input)) {
	$input = strlen($input)."\n".$input."0\n";
	}

	$command = csprintf(
	'%s -R %s serve --stdio',
	$bin,
	$repository->getLocalPath());
	$command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);

	list($err, $stdout, $stderr) = id(new ExecFuture('%C', $command))
	->setEnv($env, true)
	->setCWD($repository->getLocalPath())
	->write("{$cmd}\n{$args}{$input}")
	->resolve();

	if ($err) {
	return new PhabricatorVCSResponse(
	500,
	pht('Error %d: %s', $err, $stderr));
	}

	if ($cmd == 'getbundle' \|\|
	$cmd == 'changegroup' \|\|
	$cmd == 'changegroupsubset') {
	// We're not completely sure that "changegroup" and "changegroupsubset"
	// actually work, they're for very old Mercurial.
	$body = gzcompress($stdout);
	} else if ($cmd == 'unbundle') {
	// This includes diagnostic information and anything echoed by commit
	// hooks. We ignore `stdout` since it just has protocol garbage, and
	// substitute `stderr`.
	$body = strlen($stderr)."\n".$stderr;
	} else {
	list($length, $body) = explode("\n", $stdout, 2);
	if ($cmd == 'capabilities') {
	$body = DiffusionMercurialWireProtocol::filterBundle2Capability($body);
	}
	}

	return id(new DiffusionMercurialResponse())->setContent($body);
	}

	private function getMercurialArguments() {
	// Mercurial sends arguments in HTTP headers. "Why?", you might wonder,
	// "Why would you do this?".

	$args_raw = array();
	for ($ii = 1;; $ii++) {
	$header = 'HTTP_X_HGARG_'.$ii;
	if (!array_key_exists($header, $_SERVER)) {
	break;
	}
	$args_raw[] = $_SERVER[$header];
	}
	$args_raw = implode('', $args_raw);

	return id(new PhutilQueryStringParser())
	->parseQueryString($args_raw);
	}

	private function formatMercurialArguments($command, array $arguments) {
	$spec = DiffusionMercurialWireProtocol::getCommandArgs($command);

	$out = array();

	// Mercurial takes normal arguments like this:
	//
	// name <length(value)>
	// value

	$has_star = false;
	foreach ($spec as $arg_key) {
	if ($arg_key == '*') {
	$has_star = true;
	continue;
	}
	if (isset($arguments[$arg_key])) {
	$value = $arguments[$arg_key];
	$size = strlen($value);
	$out[] = "{$arg_key} {$size}\n{$value}";
	unset($arguments[$arg_key]);
	}
	}

	if ($has_star) {

	// Mercurial takes arguments for variable argument lists roughly like
	// this:
	//
	// * <count(args)>
	// argname1 <length(argvalue1)>
	// argvalue1
	// argname2 <length(argvalue2)>
	// argvalue2

	$count = count($arguments);

	$out[] = "* {$count}\n";

	foreach ($arguments as $key => $value) {
	if (in_array($key, $spec)) {
	// We already added this argument above, so skip it.
	continue;
	}
	$size = strlen($value);
	$out[] = "{$key} {$size}\n{$value}";
	}
	}

	return implode('', $out);
	}

	private function isValidGitShallowCloneResponse($stdout, $stderr) {
	// If you execute `git clone --depth N ...`, git sends a request which
	// `git-http-backend` responds to by emitting valid output and then exiting
	// with a failure code and an error message. If we ignore this error,
	// everything works.

	// This is a pretty funky fix: it would be nice to more precisely detect
	// that a request is a `--depth N` clone request, but we don't have any code
	// to decode protocol frames yet. Instead, look for reasonable evidence
	// in the error and output that we're looking at a `--depth` clone.

	// For evidence this isn't completely crazy, see:
	// https://github.com/schacon/grack/pull/7

	$stdout_regexp = '(^Content-Type: application/x-git-upload-pack-result)m';
	$stderr_regexp = '(The remote end hung up unexpectedly)';

	$has_pack = preg_match($stdout_regexp, $stdout);
	$is_hangup = preg_match($stderr_regexp, $stderr);

	return $has_pack && $is_hangup;
	}

	private function getCommonEnvironment(PhabricatorUser $viewer) {
	$remote_address = $this->getRequest()->getRemoteAddress();

	return array(
	DiffusionCommitHookEngine::ENV_USER => $viewer->getUsername(),
	DiffusionCommitHookEngine::ENV_REMOTE_ADDRESS => $remote_address,
	DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL => 'http',
	);
	}

	private function validateGitLFSRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer) {
	if (!$this->getIsGitLFSRequest()) {
	return null;
	}

	if (!$repository->canUseGitLFS()) {
	return new PhabricatorVCSResponse(
	403,
	pht(
	'The requested repository ("%s") does not support Git LFS.',
	$repository->getDisplayName()));
	}

	// If this is using an LFS token, sanity check that we're using it on the
	// correct repository. This shouldn't really matter since the user could
	// just request a proper token anyway, but it suspicious and should not
	// be permitted.

	$token = $this->getGitLFSToken();
	if ($token) {
	$resource = $token->getTokenResource();
	if ($resource !== $repository->getPHID()) {
	return new PhabricatorVCSResponse(
	403,
	pht(
	'The authentication token provided in the request is bound to '.
	'a different repository than the requested repository ("%s").',
	$repository->getDisplayName()));
	}
	}

	return null;
	}

	private function serveGitLFSRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer) {

	if (!$this->getIsGitLFSRequest()) {
	throw new Exception(pht('This is not a Git LFS request!'));
	}

	$path = $this->getGitLFSRequestPath($repository);
	$matches = null;

	if (preg_match('(^upload/(.*)\z)', $path, $matches)) {
	$oid = $matches[1];
	return $this->serveGitLFSUploadRequest($repository, $viewer, $oid);
	} else if ($path == 'objects/batch') {
	return $this->serveGitLFSBatchRequest($repository, $viewer);
	} else {
	return DiffusionGitLFSResponse::newErrorResponse(
	404,
	pht(
	'Git LFS operation "%s" is not supported by this server.',
	$path));
	}
	}

	private function serveGitLFSBatchRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer) {

	$input = $this->getGitLFSInput();

	$operation = idx($input, 'operation');
	switch ($operation) {
	case 'upload':
	$want_upload = true;
	break;
	case 'download':
	$want_upload = false;
	break;
	default:
	return DiffusionGitLFSResponse::newErrorResponse(
	404,
	pht(
	'Git LFS batch operation "%s" is not supported by this server.',
	$operation));
	}

	$objects = idx($input, 'objects', array());

	$hashes = array();
	foreach ($objects as $object) {
	$hashes[] = idx($object, 'oid');
	}

	if ($hashes) {
	$refs = id(new PhabricatorRepositoryGitLFSRefQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withObjectHashes($hashes)
	->execute();
	$refs = mpull($refs, null, 'getObjectHash');
	} else {
	$refs = array();
	}

	$file_phids = mpull($refs, 'getFilePHID');
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs($file_phids)
	->execute();
	$files = mpull($files, null, 'getPHID');
	} else {
	$files = array();
	}

	$authorization = null;
	$output = array();
	foreach ($objects as $object) {
	$oid = idx($object, 'oid');
	$size = idx($object, 'size');
	$ref = idx($refs, $oid);
	$error = null;

	// NOTE: If we already have a ref for this object, we only emit a
	// "download" action. The client should not upload the file again.

	$actions = array();
	if ($ref) {
	$file = idx($files, $ref->getFilePHID());
	if ($file) {
	// Git LFS may prompt users for authentication if the action does
	// not provide an "Authorization" header and does not have a query
	// parameter named "token". See here for discussion:
	// <https://github.com/github/git-lfs/issues/1088>
	$no_authorization = 'Basic '.base64_encode('none');

	$get_uri = $file->getCDNURI();
	$actions['download'] = array(
	'href' => $get_uri,
	'header' => array(
	'Authorization' => $no_authorization,
	'X-Phabricator-Request-Type' => 'git-lfs',
	),
	);
	} else {
	$error = array(
	'code' => 404,
	'message' => pht(
	'Object "%s" was previously uploaded, but no longer exists '.
	'on this server.',
	$oid),
	);
	}
	} else if ($want_upload) {
	if (!$authorization) {
	// Here, we could reuse the existing authorization if we have one,
	// but it's a little simpler to just generate a new one
	// unconditionally.
	$authorization = $this->newGitLFSHTTPAuthorization(
	$repository,
	$viewer,
	$operation);
	}

	$put_uri = $repository->getGitLFSURI("info/lfs/upload/{$oid}");

	$actions['upload'] = array(
	'href' => $put_uri,
	'header' => array(
	'Authorization' => $authorization,
	'X-Phabricator-Request-Type' => 'git-lfs',
	),
	);
	}

	$object = array(
	'oid' => $oid,
	'size' => $size,
	);

	if ($actions) {
	$object['actions'] = $actions;
	}

	if ($error) {
	$object['error'] = $error;
	}

	$output[] = $object;
	}

	$output = array(
	'objects' => $output,
	);

	return id(new DiffusionGitLFSResponse())
	->setContent($output);
	}

	private function serveGitLFSUploadRequest(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer,
	$oid) {

	$ref = id(new PhabricatorRepositoryGitLFSRefQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withObjectHashes(array($oid))
	->executeOne();
	if ($ref) {
	return DiffusionGitLFSResponse::newErrorResponse(
	405,
	pht(
	'Content for object "%s" is already known to this server. It can '.
	'not be uploaded again.',
	$oid));
	}

	// Remove the execution time limit because uploading large files may take
	// a while.
	set_time_limit(0);

	$request_stream = new AphrontRequestStream();
	$request_iterator = $request_stream->getIterator();
	$hashing_iterator = id(new PhutilHashingIterator($request_iterator))
	->setAlgorithm('sha256');

	$source = id(new PhabricatorIteratorFileUploadSource())
	->setName('lfs-'.$oid)
	->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
	->setIterator($hashing_iterator);

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file = $source->uploadFile();
	unset($unguarded);

	$hash = $hashing_iterator->getHash();
	if ($hash !== $oid) {
	return DiffusionGitLFSResponse::newErrorResponse(
	400,
	pht(
	'Uploaded data is corrupt or invalid. Expected hash "%s", actual '.
	'hash "%s".',
	$oid,
	$hash));
	}

	$ref = id(new PhabricatorRepositoryGitLFSRef())
	->setRepositoryPHID($repository->getPHID())
	->setObjectHash($hash)
	->setByteSize($file->getByteSize())
	->setAuthorPHID($viewer->getPHID())
	->setFilePHID($file->getPHID());

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	// Attach the file to the repository to give users permission
	// to access it.
	$file->attachToObject($repository->getPHID());
	$ref->save();
	unset($unguarded);

	// This is just a plain HTTP 200 with no content, which is what `git lfs`
	// expects.
	return new DiffusionGitLFSResponse();
	}

	private function newGitLFSHTTPAuthorization(
	PhabricatorRepository $repository,
	PhabricatorUser $viewer,
	$operation) {

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();

	$authorization = DiffusionGitLFSTemporaryTokenType::newHTTPAuthorization(
	$repository,
	$viewer,
	$operation);

	unset($unguarded);

	return $authorization;
	}

	private function getGitLFSRequestPath(PhabricatorRepository $repository) {
	$request_path = $this->getRequestDirectoryPath($repository);

	$matches = null;
	if (preg_match('(^/info/lfs(?:\z\|/)(.*))', $request_path, $matches)) {
	return $matches[1];
	}

	return null;
	}

	private function getGitLFSInput() {
	if (!$this->gitLFSInput) {
	$input = PhabricatorStartup::getRawInput();
	$input = phutil_json_decode($input);
	$this->gitLFSInput = $input;
	}

	return $this->gitLFSInput;
	}

	private function isGitLFSReadOnlyRequest(PhabricatorRepository $repository) {
	if (!$this->getIsGitLFSRequest()) {
	return false;
	}

	$path = $this->getGitLFSRequestPath($repository);

	if ($path === 'objects/batch') {
	$input = $this->getGitLFSInput();
	$operation = idx($input, 'operation');
	switch ($operation) {
	case 'download':
	return true;
	default:
	return false;
	}
	}

	return false;
	}


	}
	diff --git a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
	index e0d35c32b9..5ed42ba79d 100644
	--- a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
	+++ b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
	@@ -1,89 +1,89 @@
	<?php

	final class DiffusionGitUploadPackSSHWorkflow extends DiffusionGitSSHWorkflow {

	protected function didConstruct() {
	$this->setName('git-upload-pack');
	$this->setArguments(
	array(
	array(
	'name' => 'dir',
	'wildcard' => true,
	),
	));
	}

	protected function executeRepositoryOperations() {
	$repository = $this->getRepository();
	$viewer = $this->getSSHUser();
	$device = AlmanacKeys::getLiveDevice();

	$skip_sync = $this->shouldSkipReadSynchronization();
	$is_proxy = $this->shouldProxy();

	if ($is_proxy) {
	$command = $this->getProxyCommand();

	if ($device) {
	$this->writeClusterEngineLogMessage(
	pht(
	"# Fetch received by \"%s\", forwarding to cluster host.\n",
	$device->getName()));
	}
	} else {
	$command = csprintf('git-upload-pack -- %s', $repository->getLocalPath());
	if (!$skip_sync) {
	$cluster_engine = id(new DiffusionRepositoryClusterEngine())
	->setViewer($viewer)
	->setRepository($repository)
	->setLog($this)
	->synchronizeWorkingCopyBeforeRead();

	if ($device) {
	$this->writeClusterEngineLogMessage(
	pht(
	"# Cleared to fetch on cluster host \"%s\".\n",
	$device->getName()));
	}
	}
	}
	$command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);

	$pull_event = $this->newPullEvent();

	$future = id(new ExecFuture('%C', $command))
	->setEnv($this->getEnvironment());

	$err = $this->newPassthruCommand()
	->setIOChannel($this->getIOChannel())
	->setCommandChannelFromExecFuture($future)
	->execute();

	if ($err) {
	$pull_event
	- ->setResultType('error')
	+ ->setResultType(PhabricatorRepositoryPullEvent::RESULT_ERROR)
	->setResultCode($err);
	} else {
	$pull_event
	- ->setResultType('pull')
	+ ->setResultType(PhabricatorRepositoryPullEvent::RESULT_PULL)
	->setResultCode(0);
	}

	// TODO: Currently, when proxying, we do not write a log on the proxy.
	// Perhaps we should write a "proxy log". This is not very useful for
	// statistics or auditing, but could be useful for diagnostics. Marking
	// the proxy logs as proxied (and recording devicePHID on all logs) would
	// make differentiating between these use cases easier.

	if (!$is_proxy) {
	$pull_event->save();
	}

	if (!$err) {
	$this->waitForGitClient();
	}

	return $err;
	}

	}
	diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
	index 3882079f69..e40d8e1f51 100644
	--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
	+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
	@@ -1,280 +1,280 @@
	<?php

	abstract class DiffusionSSHWorkflow extends PhabricatorSSHWorkflow {

	private $args;
	private $repository;
	private $hasWriteAccess;
	private $proxyURI;
	private $baseRequestPath;

	public function getRepository() {
	if (!$this->repository) {
	throw new Exception(pht('Repository is not available yet!'));
	}
	return $this->repository;
	}

	private function setRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	public function getArgs() {
	return $this->args;
	}

	public function getEnvironment() {
	$env = array(
	DiffusionCommitHookEngine::ENV_USER => $this->getSSHUser()->getUsername(),
	DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL => 'ssh',
	);

	$remote_address = $this->getSSHRemoteAddress();
	if ($remote_address !== null) {
	$env[DiffusionCommitHookEngine::ENV_REMOTE_ADDRESS] = $remote_address;
	}

	return $env;
	}

	/**
	* Identify and load the affected repository.
	*/
	abstract protected function identifyRepository();
	abstract protected function executeRepositoryOperations();
	abstract protected function raiseWrongVCSException(
	PhabricatorRepository $repository);

	protected function getBaseRequestPath() {
	return $this->baseRequestPath;
	}

	protected function writeError($message) {
	$this->getErrorChannel()->write($message);
	return $this;
	}

	protected function getCurrentDeviceName() {
	$device = AlmanacKeys::getLiveDevice();
	if ($device) {
	return $device->getName();
	}

	return php_uname('n');
	}

	protected function getTargetDeviceName() {
	// TODO: This should use the correct device identity.
	$uri = new PhutilURI($this->proxyURI);
	return $uri->getDomain();
	}

	protected function shouldProxy() {
	return (bool)$this->proxyURI;
	}

	protected function getProxyCommand() {
	$uri = new PhutilURI($this->proxyURI);

	$username = AlmanacKeys::getClusterSSHUser();
	if ($username === null) {
	throw new Exception(
	pht(
	'Unable to determine the username to connect with when trying '.
	'to proxy an SSH request within the Phabricator cluster.'));
	}

	$port = $uri->getPort();
	$host = $uri->getDomain();
	$key_path = AlmanacKeys::getKeyPath('device.key');
	if (!Filesystem::pathExists($key_path)) {
	throw new Exception(
	pht(
	'Unable to proxy this SSH request within the cluster: this device '.
	'is not registered and has a missing device key (expected to '.
	'find key at "%s").',
	$key_path));
	}

	$options = array();
	$options[] = '-o';
	$options[] = 'StrictHostKeyChecking=no';
	$options[] = '-o';
	$options[] = 'UserKnownHostsFile=/dev/null';

	// This is suppressing "added <address> to the list of known hosts"
	// messages, which are confusing and irrelevant when they arise from
	// proxied requests. It might also be suppressing lots of useful errors,
	// of course. Ideally, we would enforce host keys eventually.
	$options[] = '-o';
	$options[] = 'LogLevel=quiet';

	// NOTE: We prefix the command with "@username", which the far end of the
	// connection will parse in order to act as the specified user. This
	// behavior is only available to cluster requests signed by a trusted
	// device key.

	return csprintf(
	'ssh %Ls -l %s -i %s -p %s %s -- %s %Ls',
	$options,
	$username,
	$key_path,
	$port,
	$host,
	'@'.$this->getSSHUser()->getUsername(),
	$this->getOriginalArguments());
	}

	final public function execute(PhutilArgumentParser $args) {
	$this->args = $args;

	$viewer = $this->getSSHUser();
	$have_diffusion = PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorDiffusionApplication',
	$viewer);
	if (!$have_diffusion) {
	throw new Exception(
	pht(
	'You do not have permission to access the Diffusion application, '.
	'so you can not interact with repositories over SSH.'));
	}

	$repository = $this->identifyRepository();
	$this->setRepository($repository);

	$is_cluster_request = $this->getIsClusterRequest();
	$uri = $repository->getAlmanacServiceURI(
	$viewer,
	$is_cluster_request,
	array(
	'ssh',
	));

	if ($uri) {
	$this->proxyURI = $uri;
	}

	try {
	return $this->executeRepositoryOperations();
	} catch (Exception $ex) {
	$this->writeError(get_class($ex).': '.$ex->getMessage());
	return 1;
	}
	}

	protected function loadRepositoryWithPath($path, $vcs) {
	$viewer = $this->getSSHUser();

	$info = PhabricatorRepository::parseRepositoryServicePath($path, $vcs);
	if ($info === null) {
	throw new Exception(
	pht(
	'Unrecognized repository path "%s". Expected a path like "%s", '.
	'"%s", or "%s".',
	$path,
	'/diffusion/X/',
	'/diffusion/123/',
	'/source/thaumaturgy.git'));
	}

	$identifier = $info['identifier'];
	$base = $info['base'];

	$this->baseRequestPath = $base;

	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withIdentifiers(array($identifier))
	->needURIs(true)
	->executeOne();
	if (!$repository) {
	throw new Exception(
	pht('No repository "%s" exists!', $identifier));
	}

	$protocol = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_SSH;
	if (!$repository->canServeProtocol($protocol, false)) {
	throw new Exception(
	pht(
	'This repository ("%s") is not available over SSH.',
	$repository->getDisplayName()));
	}

	if ($repository->getVersionControlSystem() != $vcs) {
	$this->raiseWrongVCSException($repository);
	}

	return $repository;
	}

	protected function requireWriteAccess($protocol_command = null) {
	if ($this->hasWriteAccess === true) {
	return;
	}

	$repository = $this->getRepository();
	$viewer = $this->getSSHUser();

	if ($viewer->isOmnipotent()) {
	throw new Exception(
	pht(
	'This request is authenticated as a cluster device, but is '.
	'performing a write. Writes must be performed with a real '.
	'user account.'));
	}

	$protocol = PhabricatorRepositoryURI::BUILTIN_PROTOCOL_SSH;
	if ($repository->canServeProtocol($protocol, true)) {
	$can_push = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	DiffusionPushCapability::CAPABILITY);
	if (!$can_push) {
	throw new Exception(
	pht('You do not have permission to push to this repository.'));
	}
	} else {
	if ($protocol_command !== null) {
	throw new Exception(
	pht(
	'This repository is read-only over SSH (tried to execute '.
	'protocol command "%s").',
	$protocol_command));
	} else {
	throw new Exception(
	pht('This repository is read-only over SSH.'));
	}
	}

	$this->hasWriteAccess = true;
	return $this->hasWriteAccess;
	}

	protected function shouldSkipReadSynchronization() {
	$viewer = $this->getSSHUser();

	// Currently, the only case where devices interact over SSH without
	// assuming user credentials is when synchronizing before a read. These
	// synchronizing reads do not themselves need to be synchronized.
	if ($viewer->isOmnipotent()) {
	return true;
	}

	return false;
	}

	protected function newPullEvent() {
	$viewer = $this->getSSHUser();
	$repository = $this->getRepository();
	$remote_address = $this->getSSHRemoteAddress();

	return id(new PhabricatorRepositoryPullEvent())
	->setEpoch(PhabricatorTime::getNow())
	->setRemoteAddress($remote_address)
	- ->setRemoteProtocol('ssh')
	+ ->setRemoteProtocol(PhabricatorRepositoryPullEvent::PROTOCOL_SSH)
	->setPullerPHID($viewer->getPHID())
	->setRepositoryPHID($repository->getPHID());
	}

	}
	diff --git a/src/applications/diffusion/view/DiffusionPullLogListView.php b/src/applications/diffusion/view/DiffusionPullLogListView.php
	index 7babb9c584..f2e3280eba 100644
	--- a/src/applications/diffusion/view/DiffusionPullLogListView.php
	+++ b/src/applications/diffusion/view/DiffusionPullLogListView.php
	@@ -1,115 +1,115 @@
	<?php

	final class DiffusionPullLogListView extends AphrontView {

	private $logs;

	public function setLogs(array $logs) {
	assert_instances_of($logs, 'PhabricatorRepositoryPullEvent');
	$this->logs = $logs;
	return $this;
	}

	public function render() {
	$events = $this->logs;
	$viewer = $this->getViewer();

	$handle_phids = array();
	foreach ($events as $event) {
	if ($event->getPullerPHID()) {
	$handle_phids[] = $event->getPullerPHID();
	}
	}
	$handles = $viewer->loadHandles($handle_phids);

	// Figure out which repositories are editable. We only let you see remote
	// IPs if you have edit capability on a repository.
	$editable_repos = array();
	if ($events) {
	$editable_repos = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->withPHIDs(mpull($events, 'getRepositoryPHID'))
	->execute();
	$editable_repos = mpull($editable_repos, null, 'getPHID');
	}

	$rows = array();
	$any_host = false;
	foreach ($events as $event) {
	if ($event->getRepositoryPHID()) {
	$repository = $event->getRepository();
	} else {
	$repository = null;
	}

	// Reveal this if it's valid and the user can edit the repository. For
	// invalid requests you currently have to go fishing in the database.
	$remote_address = '-';
	if ($repository) {
	if (isset($editable_repos[$event->getRepositoryPHID()])) {
	$remote_address = $event->getRemoteAddress();
	}
	}

	$event_id = $event->getID();

	$repository_link = null;
	if ($repository) {
	$repository_link = phutil_tag(
	'a',
	array(
	'href' => $repository->getURI(),
	),
	$repository->getDisplayName());
	}

	$puller_link = null;
	if ($event->getPullerPHID()) {
	$puller_link = $viewer->renderHandle($event->getPullerPHID());
	}

	$rows[] = array(
	$event_id,
	$repository_link,
	$puller_link,
	$remote_address,
	$event->getRemoteProtocolDisplayName(),
	$event->newResultIcon(),
	$event->getResultCode(),
	phabricator_datetime($event->getEpoch(), $viewer),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Pull'),
	pht('Repository'),
	pht('Puller'),
	pht('From'),
	pht('Via'),
	null,
	- pht('Error'),
	+ pht('Code'),
	pht('Date'),
	))
	->setColumnClasses(
	array(
	'n',
	'',
	'',
	'n',
	'wide',
	'',
	'n',
	'right',
	));

	return $table;
	}

	}
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
	index 1b095ce8fd..85ea27062b 100644
	--- a/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
	@@ -1,127 +1,164 @@
	<?php

	final class PhabricatorRepositoryPullEvent
	extends PhabricatorRepositoryDAO
	implements PhabricatorPolicyInterface {

	protected $repositoryPHID;
	protected $epoch;
	protected $pullerPHID;
	protected $remoteAddress;
	protected $remoteProtocol;
	protected $resultType;
	protected $resultCode;
	protected $properties;

	private $repository = self::ATTACHABLE;

	+ const RESULT_PULL = 'pull';
	+ const RESULT_ERROR = 'error';
	+ const RESULT_EXCEPTION = 'exception';
	+
	+ const PROTOCOL_HTTP = 'http';
	+ const PROTOCOL_HTTPS = 'https';
	+ const PROTOCOL_SSH = 'ssh';
	+
	public static function initializeNewEvent(PhabricatorUser $viewer) {
	return id(new PhabricatorRepositoryPushEvent())
	->setPusherPHID($viewer->getPHID());
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_SERIALIZATION => array(
	'properties' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'repositoryPHID' => 'phid?',
	'pullerPHID' => 'phid?',
	'remoteAddress' => 'ipaddress?',
	'remoteProtocol' => 'text32?',
	'resultType' => 'text32',
	'resultCode' => 'uint32',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_repository' => array(
	'columns' => array('repositoryPHID'),
	),
	'key_epoch' => array(
	'columns' => array('epoch'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorRepositoryPullEventPHIDType::TYPECONST);
	}

	public function attachRepository(PhabricatorRepository $repository = null) {
	$this->repository = $repository;
	return $this;
	}

	public function getRepository() {
	return $this->assertAttached($this->repository);
	}

	public function getRemoteProtocolDisplayName() {
	$map = array(
	- 'ssh' => pht('SSH'),
	- 'http' => pht('HTTP'),
	+ self::PROTOCOL_SSH => pht('SSH'),
	+ self::PROTOCOL_HTTP => pht('HTTP'),
	+ self::PROTOCOL_HTTPS => pht('HTTPS'),
	);

	$protocol = $this->getRemoteProtocol();

	return idx($map, $protocol, $protocol);
	}

	public function newResultIcon() {
	$icon = new PHUIIconView();
	$type = $this->getResultType();
	+ $code = $this->getResultCode();
	+
	+ $protocol = $this->getRemoteProtocol();
	+
	+ $is_any_http =
	+ ($protocol === self::PROTOCOL_HTTP) \|\|
	+ ($protocol === self::PROTOCOL_HTTPS);
	+
	+ // If this was an HTTP request and we responded with a 401, that means
	+ // the user didn't provide credentials. This is technically an error, but
	+ // it's routine and just causes the client to prompt them. Show a more
	+ // comforting icon and description in the UI.
	+ if ($is_any_http) {
	+ if ($code == 401) {
	+ return $icon
	+ ->setIcon('fa-key blue')
	+ ->setTooltip(pht('Authentication Required'));
	+ }
	+ }

	switch ($type) {
	- case 'wild':
	+ case self::RESULT_ERROR:
	$icon
	- ->setIcon('fa-question indigo')
	- ->setTooltip(pht('Unknown ("%s")', $type));
	+ ->setIcon('fa-times red')
	+ ->setTooltip(pht('Error'));
	break;
	- case 'pull':
	+ case self::RESULT_EXCEPTION:
	+ $icon
	+ ->setIcon('fa-exclamation-triangle red')
	+ ->setTooltip(pht('Exception'));
	+ break;
	+ case self::RESULT_PULL:
	$icon
	->setIcon('fa-download green')
	->setTooltip(pht('Pull'));
	break;
	+ default:
	+ $icon
	+ ->setIcon('fa-question indigo')
	+ ->setTooltip(pht('Unknown ("%s")', $type));
	+ break;
	}

	return $icon;
	}


	-
	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	if ($this->getRepository()) {
	return $this->getRepository()->getPolicy($capability);
	}

	return PhabricatorPolicies::POLICY_ADMIN;
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	if (!$this->getRepository()) {
	return false;
	}

	return $this->getRepository()->hasAutomaticCapability($capability, $viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht(
	"A repository's pull events are visible to users who can see the ".
	"repository.");
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Feb 6, 9:26 PM (1 d, 16 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 34043
Default Alt Text: (58 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions