Page MenuHomePhabricator
Files F13178371

D15499.diff
No OneTemporary
Actions

D15499.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -7,6 +7,7 @@
private $isGitLFSRequest;
private $gitLFSToken;
+ private $gitLFSInput;
public function setServiceViewer(PhabricatorUser $viewer) {
$this->getRequest()->setUser($viewer);
@@ -284,11 +285,20 @@
DiffusionPushCapability::CAPABILITY);
if (!$can_push) {
if ($viewer->isLoggedIn()) {
- return new PhabricatorVCSResponse(
- 403,
- pht(
- 'You do not have permission to push to this '.
- 'repository.'));
+ $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(
@@ -422,7 +432,9 @@
// TODO: This implementation is safe by default, but very incomplete.
- // TODO: This doesn't get the right result for Git LFS yet.
+ if ($this->getIsGitLFSRequest()) {
+ return $this->isGitLFSReadOnlyRequest($repository);
+ }
switch ($repository->getVersionControlSystem()) {
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
@@ -911,8 +923,7 @@
PhabricatorRepository $repository,
PhabricatorUser $viewer) {
- $input = PhabricatorStartup::getRawInput();
- $input = phutil_json_decode($input);
+ $input = $this->getGitLFSInput();
$operation = idx($input, 'operation');
switch ($operation) {
@@ -1061,6 +1072,10 @@
$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))
@@ -1133,4 +1148,36 @@
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;
+ }
+
+
}

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 8:22 PM (2 w, 3 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6276697
Default Alt Text
D15499.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility