Page MenuHomePhabricator
Files F14753633

D17623.id42387.diff
No OneTemporary
Actions

D17623.id42387.diff
View Options

diff --git a/src/applications/files/engine/PhabricatorChunkedFileStorageEngine.php b/src/applications/files/engine/PhabricatorChunkedFileStorageEngine.php
--- a/src/applications/files/engine/PhabricatorChunkedFileStorageEngine.php
+++ b/src/applications/files/engine/PhabricatorChunkedFileStorageEngine.php
@@ -174,7 +174,16 @@
return (4 * 1024 * 1024);
}
- public function getRawFileDataIterator(PhabricatorFile $file, $begin, $end) {
+ public function getRawFileDataIterator(
+ PhabricatorFile $file,
+ $begin,
+ $end,
+ PhabricatorFileStorageFormat $format) {
+
+ // NOTE: It is currently impossible for files stored with the chunk
+ // engine to have their own formatting (instead, the individual chunks
+ // are formatted), so we ignore the format object.
+
$chunks = id(new PhabricatorFileChunkQuery())
->setViewer(PhabricatorUser::getOmnipotentUser())
->withChunkHandles(array($file->getStorageHandle()))
diff --git a/src/applications/files/engine/PhabricatorFileStorageEngine.php b/src/applications/files/engine/PhabricatorFileStorageEngine.php
--- a/src/applications/files/engine/PhabricatorFileStorageEngine.php
+++ b/src/applications/files/engine/PhabricatorFileStorageEngine.php
@@ -325,10 +325,20 @@
return $engine->getChunkSize();
}
- public function getRawFileDataIterator(PhabricatorFile $file, $begin, $end) {
- // The default implementation is trivial and just loads the entire file
- // upfront.
- $data = $this->readFile($file->getStorageHandle());
+ public function getRawFileDataIterator(
+ PhabricatorFile $file,
+ $begin,
+ $end,
+ PhabricatorFileStorageFormat $format) {
+
+ $formatted_data = $this->readFile($file->getStorageHandle());
+ $formatted_data = array($formatted_data);
+
+ $data = '';
+ $format_iterator = $format->newReadIterator($formatted_data);
+ foreach ($format_iterator as $raw_chunk) {
+ $data .= $raw_chunk;
+ }
if ($begin !== null && $end !== null) {
$data = substr($data, $begin, ($end - $begin));
diff --git a/src/applications/files/format/__tests__/PhabricatorFileStorageFormatTestCase.php b/src/applications/files/format/__tests__/PhabricatorFileStorageFormatTestCase.php
--- a/src/applications/files/format/__tests__/PhabricatorFileStorageFormatTestCase.php
+++ b/src/applications/files/format/__tests__/PhabricatorFileStorageFormatTestCase.php
@@ -33,6 +33,15 @@
// The actual raw data in the storage engine should be encoded.
$raw_data = $engine->readFile($file->getStorageHandle());
$this->assertEqual($expect, $raw_data);
+
+ // If we generate an iterator over a slice of the file, it should return
+ // the decrypted file.
+ $iterator = $file->getFileDataIterator(4, 14);
+ $raw_data = '';
+ foreach ($iterator as $data_chunk) {
+ $raw_data .= $data_chunk;
+ }
+ $this->assertEqual('cow jumped', $raw_data);
}
public function testAES256Storage() {
@@ -73,5 +82,14 @@
// input data.
$raw_data = $engine->readFile($file->getStorageHandle());
$this->assertTrue($data !== $raw_data);
+
+ // If we generate an iterator over a slice of the file, it should return
+ // the decrypted file.
+ $iterator = $file->getFileDataIterator(4, 14);
+ $raw_data = '';
+ foreach ($iterator as $data_chunk) {
+ $raw_data .= $data_chunk;
+ }
+ $this->assertEqual('cow jumped', $raw_data);
}
}
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -746,14 +746,18 @@
*/
public function getFileDataIterator($begin = null, $end = null) {
$engine = $this->instantiateStorageEngine();
- $raw_iterator = $engine->getRawFileDataIterator($this, $begin, $end);
$key = $this->getStorageFormat();
-
$format = id(clone PhabricatorFileStorageFormat::requireFormat($key))
->setFile($this);
- return $format->newReadIterator($raw_iterator);
+ $iterator = $engine->getRawFileDataIterator(
+ $this,
+ $begin,
+ $end,
+ $format);
+
+ return $iterator;
}
public function getURI() {

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 3:15 PM (10 h, 31 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7034138
Default Alt Text
D17623.id42387.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility