mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource 

urlencode s3 copyObject() copysource
This commit is contained in:
Jörn Friedrich Dreyer 2014-08-20 15:48:51 +02:00
parent 57746ffed4 240b952333
commit 6c593c6adf
2 changed files with 82 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_external/lib/amazons3.php
View File

@ -56,6 +56,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
/**
* @param string $path
* @return string correctly encoded path
*/
private function normalizePath($path) {
$path = trim($path, '/');
@ -436,7 +437,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$result = $this->connection->copyObject(array(
'Bucket' => $this->bucket,
'Key' => $this->cleanKey($path2),
'CopySource' => $this->bucket . '/' . $path1
'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
));
$this->testTimeout();
} catch (S3Exception $e) {
@ -452,7 +453,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$result = $this->connection->copyObject(array(
'Bucket' => $this->bucket,
'Key' => $path2 . '/',
'CopySource' => $this->bucket . '/' . $path1 . '/'
'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
));
$this->testTimeout();
} catch (S3Exception $e) {

95
tests/lib/files/storage/storage.php
View File

@ -161,26 +161,89 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$this->assertEquals('image/svg+xml', $this->instance->getMimeType('/logo-wide.svg'));
}
public function testCopyAndMove() {
public function copyAndMoveProvider() {
return array(
array('/source.txt', '/target.txt'),
array('/source.txt', '/target with space.txt'),
array('/source with space.txt', '/target.txt'),
array('/source with space.txt', '/target with space.txt'),
array('/source.txt', '/tärgét.txt'),
array('/sòurcē.txt', '/target.txt'),
array('/sòurcē.txt', '/tärgét.txt'),
);
}
public function initSourceAndTarget ($source, $target = null) {
$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
$this->instance->file_put_contents('/source.txt', file_get_contents($textFile));
$this->instance->copy('/source.txt', '/target.txt');
$this->assertTrue($this->instance->file_exists('/target.txt'));
$this->assertEquals($this->instance->file_get_contents('/source.txt'), $this->instance->file_get_contents('/target.txt'));
$this->instance->file_put_contents($source, file_get_contents($textFile));
if ($target) {
$testContents = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
$this->instance->file_put_contents($target, $testContents);
}
}
public function assertSameAsLorem ($file) {
$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
$this->assertEquals(
file_get_contents($textFile),
$this->instance->file_get_contents($file),
'Expected '.$file.' to be a copy of '.$textFile
);
}
/**
* @dataProvider copyAndMoveProvider
*/
public function testCopy($source, $target) {
$this->initSourceAndTarget($source);
$this->instance->copy($source, $target);
$this->assertTrue($this->instance->file_exists($target), $target.' was not created');
$this->assertSameAsLorem($target);
$this->assertTrue($this->instance->file_exists($source), $source.' was deleted');
}
/**
* @dataProvider copyAndMoveProvider
*/
public function testMove($source, $target) {
$this->initSourceAndTarget($source);
$this->instance->rename($source, $target);
$this->instance->rename('/source.txt', '/target2.txt');
$this->wait();
$this->assertTrue($this->instance->file_exists('/target2.txt'));
$this->assertFalse($this->instance->file_exists('/source.txt'));
$this->assertEquals(file_get_contents($textFile), $this->instance->file_get_contents('/target2.txt'));
$this->assertTrue($this->instance->file_exists($target), $target.' was not created');
$this->assertFalse($this->instance->file_exists($source), $source.' still exists');
$this->assertSameAsLorem($target);
}
// move to overwrite
$testContents = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
$this->instance->file_put_contents('/target3.txt', $testContents);
$this->instance->rename('/target2.txt', '/target3.txt');
$this->assertTrue($this->instance->file_exists('/target3.txt'));
$this->assertFalse($this->instance->file_exists('/target2.txt'));
$this->assertEquals(file_get_contents($textFile), $this->instance->file_get_contents('/target3.txt'));
/**
* @dataProvider copyAndMoveProvider
*/
public function testCopyOverwrite($source, $target) {
$this->initSourceAndTarget($source,$target);
$this->instance->copy($source, $target);
$this->assertTrue($this->instance->file_exists($target), $target.' was not created');
$this->assertTrue($this->instance->file_exists($source), $source.' was deleted');
$this->assertSameAsLorem($target);
$this->assertSameAsLorem($source);
}
/**
* @dataProvider copyAndMoveProvider
*/
public function testMoveOverwrite($source, $target) {
$this->initSourceAndTarget($source, $target);
$this->instance->rename($source, $target);
$this->assertTrue($this->instance->file_exists($target), $target.' was not created');
$this->assertFalse($this->instance->file_exists($source), $source.' still exists');
$this->assertSameAsLorem($target);
}
public function testLocal() {