mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-28 09:42:41 +01:00
384b670709
Summary: Fixes T6608, though I'll also clean up the comment for PhutilStringTruncator in another diff. If I understand correctly, before T1191, MySQL column length was by character count and post T1191 its by byte count. Ergo, most of these changes are going from codepoint -> bytes. See test plan for complete list of what was and was not done. Test Plan: Thought very carefully about each callsite and made changes as appropos. "Display" means the string is clearly used for display-only purposes and correctly uses "glyph" already. grep -rn PhutilUTF8StringTruncator * applications/calendar/query/PhabricatorCalendarEventSearchEngine.php:217: ->addAttribute(id(new PhutilUTF8StringTruncator()) -- display applications/chatlog/controller/PhabricatorChatLogChannelLogController.php:111: $author = id(new PhutilUTF8StringTruncator()) -- display applications/conduit/method/ConduitConnectConduitAPIMethod.php:62: $client_description = id(new PhutilUTF8StringTruncator()) -- was codepoint, changed to bytes applications/conpherence/view/ConpherenceFileWidgetView.php:22: ->setFileName(id(new PhutilUTF8StringTruncator()) -- display applications/differential/controller/DifferentialDiffViewController.php:65: id(new PhutilUTF8StringTruncator()) -- display applications/differential/event/DifferentialHovercardEventListener.php:69: id(new PhutilUTF8StringTruncator()) -- display applications/differential/parser/DifferentialCommitMessageParser.php:144: $short = id(new PhutilUTF8StringTruncator()) -- was glyphs, made to bytes applications/differential/view/DifferentialLocalCommitsView.php:80: $summary = id(new PhutilUTF8StringTruncator()) -- display applications/diffusion/controller/DiffusionBrowseFileController.php:686: id(new PhutilUTF8StringTruncator()) -- display applications/feed/story/PhabricatorFeedStory.php:392: $text = id(new PhutilUTF8StringTruncator()) -- display, unless people are saving the results of renderSummary() somewhere... applications/harbormaster/storage/build/HarbormasterBuild.php:216: $log_source = id(new PhutilUTF8StringTruncator()) -- was codepoints now bytes applications/herald/storage/transcript/HeraldObjectTranscript.php:55: // NOTE: PhutilUTF8StringTruncator has huge runtime for giant strings. -- not applicable applications/maniphest/export/ManiphestExcelDefaultFormat.php:107: id(new PhutilUTF8StringTruncator()) -- bytes applications/metamta/storage/PhabricatorMetaMTAMail.php:587: $body = id(new PhutilUTF8StringTruncator()) -- bytes applications/people/event/PhabricatorPeopleHovercardEventListener.php:62: id(new PhutilUTF8StringTruncator()) -- display applications/phame/conduit/PhameCreatePostConduitAPIMethod.php:93: id(new PhutilUTF8StringTruncator()) -- was codepoints, now bytes applications/pholio/storage/PholioTransaction.php:300: id(new PhutilUTF8StringTruncator()) -- display applications/phortune/provider/PhortuneBalancedPaymentProvider.php:147: $charge_as = id(new PhutilUTF8StringTruncator()) -- bytes applications/ponder/storage/PonderAnswerTransaction.php:86: id(new PhutilUTF8StringTruncator()) -- display applications/ponder/storage/PonderQuestionTransaction.php:267: id(new PhutilUTF8StringTruncator()) -- display applications/ponder/storage/PonderQuestionTransaction.php:276: id(new PhutilUTF8StringTruncator()) -- display applications/repository/storage/PhabricatorRepositoryCommitData.php:43: $summary = id(new PhutilUTF8StringTruncator()) -- was codepoints, now bytes applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php:20: $data->setAuthorName(id(new PhutilUTF8StringTruncator()) -- was codepoints, now bytes applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php:158: $item->addAttribute(id(new PhutilUTF8StringTruncator()) -- display infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php:317: $host = id(new PhutilUTF8StringTruncator()) -- bytes view/form/control/AphrontFormPolicyControl.php:61: $policy_short_name = id(new PhutilUTF8StringTruncator()) -- glyphs, probably display only Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T6608 Differential Revision: https://secure.phabricator.com/D11219
159 lines
5.4 KiB
PHP
159 lines
5.4 KiB
PHP
<?php
|
|
|
|
final class ConduitConnectConduitAPIMethod extends ConduitAPIMethod {
|
|
|
|
public function getAPIMethodName() {
|
|
return 'conduit.connect';
|
|
}
|
|
|
|
public function shouldRequireAuthentication() {
|
|
return false;
|
|
}
|
|
|
|
public function shouldAllowUnguardedWrites() {
|
|
return true;
|
|
}
|
|
|
|
public function getMethodDescription() {
|
|
return 'Connect a session-based client.';
|
|
}
|
|
|
|
public function defineParamTypes() {
|
|
return array(
|
|
'client' => 'required string',
|
|
'clientVersion' => 'required int',
|
|
'clientDescription' => 'optional string',
|
|
'user' => 'optional string',
|
|
'authToken' => 'optional int',
|
|
'authSignature' => 'optional string',
|
|
'host' => 'deprecated',
|
|
);
|
|
}
|
|
|
|
public function defineReturnType() {
|
|
return 'dict<string, any>';
|
|
}
|
|
|
|
public function defineErrorTypes() {
|
|
return array(
|
|
'ERR-BAD-VERSION' =>
|
|
'Client/server version mismatch. Upgrade your server or downgrade '.
|
|
'your client.',
|
|
'NEW-ARC-VERSION' =>
|
|
'Client/server version mismatch. Upgrade your client.',
|
|
'ERR-UNKNOWN-CLIENT' =>
|
|
'Client is unknown.',
|
|
'ERR-INVALID-USER' =>
|
|
'The username you are attempting to authenticate with is not valid.',
|
|
'ERR-INVALID-CERTIFICATE' =>
|
|
'Your authentication certificate for this server is invalid.',
|
|
'ERR-INVALID-TOKEN' =>
|
|
"The challenge token you are authenticating with is outside of the ".
|
|
"allowed time range. Either your system clock is out of whack or ".
|
|
"you're executing a replay attack.",
|
|
'ERR-NO-CERTIFICATE' => 'This server requires authentication.',
|
|
);
|
|
}
|
|
|
|
protected function execute(ConduitAPIRequest $request) {
|
|
$client = $request->getValue('client');
|
|
$client_version = (int)$request->getValue('clientVersion');
|
|
$client_description = (string)$request->getValue('clientDescription');
|
|
$client_description = id(new PhutilUTF8StringTruncator())
|
|
->setMaximumBytes(255)
|
|
->truncateString($client_description);
|
|
$username = (string)$request->getValue('user');
|
|
|
|
// Log the connection, regardless of the outcome of checks below.
|
|
$connection = new PhabricatorConduitConnectionLog();
|
|
$connection->setClient($client);
|
|
$connection->setClientVersion($client_version);
|
|
$connection->setClientDescription($client_description);
|
|
$connection->setUsername($username);
|
|
$connection->save();
|
|
|
|
switch ($client) {
|
|
case 'arc':
|
|
$server_version = 6;
|
|
$supported_versions = array(
|
|
$server_version => true,
|
|
// Client version 5 introduced "user.query" call
|
|
4 => true,
|
|
// Client version 6 introduced "diffusion.getlintmessages" call
|
|
5 => true,
|
|
);
|
|
|
|
if (empty($supported_versions[$client_version])) {
|
|
if ($server_version < $client_version) {
|
|
$ex = new ConduitException('ERR-BAD-VERSION');
|
|
$ex->setErrorDescription(
|
|
"Your 'arc' client version is '{$client_version}', which ".
|
|
"is newer than the server version, '{$server_version}'. ".
|
|
"Upgrade your Phabricator install.");
|
|
} else {
|
|
$ex = new ConduitException('NEW-ARC-VERSION');
|
|
$ex->setErrorDescription(
|
|
"A new version of arc is available! You need to upgrade ".
|
|
"to connect to this server (you are running version ".
|
|
"{$client_version}, the server is running version ".
|
|
"{$server_version}).");
|
|
}
|
|
throw $ex;
|
|
}
|
|
break;
|
|
default:
|
|
// Allow new clients by default.
|
|
break;
|
|
}
|
|
|
|
$token = $request->getValue('authToken');
|
|
$signature = $request->getValue('authSignature');
|
|
|
|
$user = id(new PhabricatorUser())->loadOneWhere('username = %s', $username);
|
|
if (!$user) {
|
|
throw new ConduitException('ERR-INVALID-USER');
|
|
}
|
|
|
|
$session_key = null;
|
|
if ($token && $signature) {
|
|
$threshold = 60 * 15;
|
|
$now = time();
|
|
if (abs($token - $now) > $threshold) {
|
|
throw id(new ConduitException('ERR-INVALID-TOKEN'))
|
|
->setErrorDescription(
|
|
pht(
|
|
'The request you submitted is signed with a timestamp, but that '.
|
|
'timestamp is not within %s of the current time. The '.
|
|
'signed timestamp is %s (%s), and the current server time is '.
|
|
'%s (%s). This is a difference of %s seconds, but the '.
|
|
'timestamp must differ from the server time by no more than '.
|
|
'%s seconds. Your client or server clock may not be set '.
|
|
'correctly.',
|
|
phutil_format_relative_time($threshold),
|
|
$token,
|
|
date('r', $token),
|
|
$now,
|
|
date('r', $now),
|
|
($token - $now),
|
|
$threshold));
|
|
}
|
|
$valid = sha1($token.$user->getConduitCertificate());
|
|
if ($valid != $signature) {
|
|
throw new ConduitException('ERR-INVALID-CERTIFICATE');
|
|
}
|
|
$session_key = id(new PhabricatorAuthSessionEngine())->establishSession(
|
|
PhabricatorAuthSession::TYPE_CONDUIT,
|
|
$user->getPHID(),
|
|
$partial = false);
|
|
} else {
|
|
throw new ConduitException('ERR-NO-CERTIFICATE');
|
|
}
|
|
|
|
return array(
|
|
'connectionID' => $connection->getID(),
|
|
'sessionKey' => $session_key,
|
|
'userPHID' => $user->getPHID(),
|
|
);
|
|
}
|
|
|
|
}
|