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

Merge pull request #6588 from nextcloud/moveFromCache-from-shared-11 

[11] fix moving folders out of a cache jail
This commit is contained in:
Morris Jobke 2017-09-25 11:06:33 +02:00 committed by GitHub
parent b93d2de6d6 94fe6fdbb1
commit 2c2d2e552b
17 changed files with 735 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/composer/composer/autoload_classmap.php
View File

@ -80,6 +80,7 @@ return array(
'OCP\\DB' => $baseDir . '/lib/public/DB.php',
'OCP\\DB\\QueryBuilder\\ICompositeExpression' => $baseDir . '/lib/public/DB/QueryBuilder/ICompositeExpression.php',
'OCP\\DB\\QueryBuilder\\IExpressionBuilder' => $baseDir . '/lib/public/DB/QueryBuilder/IExpressionBuilder.php',
'OCP\\DB\\QueryBuilder\\IFunctionBuilder' => $baseDir . '/lib/public/DB/QueryBuilder/IFunctionBuilder.php',
'OCP\\DB\\QueryBuilder\\ILiteral' => $baseDir . '/lib/public/DB/QueryBuilder/ILiteral.php',
'OCP\\DB\\QueryBuilder\\IParameter' => $baseDir . '/lib/public/DB/QueryBuilder/IParameter.php',
'OCP\\DB\\QueryBuilder\\IQueryBuilder' => $baseDir . '/lib/public/DB/QueryBuilder/IQueryBuilder.php',
@ -455,6 +456,10 @@ return array(
'OC\\DB\\QueryBuilder\\ExpressionBuilder\\MySqlExpressionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php',
'OC\\DB\\QueryBuilder\\ExpressionBuilder\\OCIExpressionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php',
'OC\\DB\\QueryBuilder\\ExpressionBuilder\\PgSqlExpressionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\FunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\OCIFunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\PgSqlFunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\SqliteFunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php',
'OC\\DB\\QueryBuilder\\Literal' => $baseDir . '/lib/private/DB/QueryBuilder/Literal.php',
'OC\\DB\\QueryBuilder\\Parameter' => $baseDir . '/lib/private/DB/QueryBuilder/Parameter.php',
'OC\\DB\\QueryBuilder\\QueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/QueryBuilder.php',
@ -683,6 +688,7 @@ return array(
'OC\\Repair\\NC11\\FixMountStorages' => $baseDir . '/lib/private/Repair/NC11/FixMountStorages.php',
'OC\\Repair\\NC11\\MoveAvatars' => $baseDir . '/lib/private/Repair/NC11/MoveAvatars.php',
'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
'OC\\Repair\\NC13\\RepairInvalidPaths' => $baseDir . '/lib/private/Repair/NC11/RepairInvalidPaths.php',
'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php',
'OC\\Repair\\Preview' => $baseDir . '/lib/private/Repair/Preview.php',
'OC\\Repair\\RemoveGetETagEntries' => $baseDir . '/lib/private/Repair/RemoveGetETagEntries.php',

6
lib/composer/composer/autoload_static.php
View File

@ -110,6 +110,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\DB' => __DIR__ . '/../../..' . '/lib/public/DB.php',
'OCP\\DB\\QueryBuilder\\ICompositeExpression' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/ICompositeExpression.php',
'OCP\\DB\\QueryBuilder\\IExpressionBuilder' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IExpressionBuilder.php',
'OCP\\DB\\QueryBuilder\\IFunctionBuilder' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IFunctionBuilder.php',
'OCP\\DB\\QueryBuilder\\ILiteral' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/ILiteral.php',
'OCP\\DB\\QueryBuilder\\IParameter' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IParameter.php',
'OCP\\DB\\QueryBuilder\\IQueryBuilder' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IQueryBuilder.php',
@ -485,6 +486,10 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\DB\\QueryBuilder\\ExpressionBuilder\\MySqlExpressionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php',
'OC\\DB\\QueryBuilder\\ExpressionBuilder\\OCIExpressionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php',
'OC\\DB\\QueryBuilder\\ExpressionBuilder\\PgSqlExpressionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\FunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\OCIFunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\PgSqlFunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php',
'OC\\DB\\QueryBuilder\\FunctionBuilder\\SqliteFunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php',
'OC\\DB\\QueryBuilder\\Literal' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Literal.php',
'OC\\DB\\QueryBuilder\\Parameter' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Parameter.php',
'OC\\DB\\QueryBuilder\\QueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryBuilder.php',
@ -713,6 +718,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Repair\\NC11\\FixMountStorages' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/FixMountStorages.php',
'OC\\Repair\\NC11\\MoveAvatars' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatars.php',
'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
'OC\\Repair\\NC13\\RepairInvalidPaths' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/RepairInvalidPaths.php',
'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php',
'OC\\Repair\\Preview' => __DIR__ . '/../../..' . '/lib/private/Repair/Preview.php',
'OC\\Repair\\RemoveGetETagEntries' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveGetETagEntries.php',

55
lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php Normal file
View File

@ -0,0 +1,55 @@
<?php
/**
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
use OC\DB\QueryBuilder\QuoteHelper;
use OCP\DB\QueryBuilder\IFunctionBuilder;
class FunctionBuilder implements IFunctionBuilder {
/** @var QuoteHelper */
protected $helper;
/**
* ExpressionBuilder constructor.
*
* @param QuoteHelper $helper
*/
public function __construct(QuoteHelper $helper) {
$this->helper = $helper;
}
public function md5($input) {
return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
}
public function concat($x, $y) {
return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}
public function substring($input, $start, $length = null) {
if ($length) {
return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
} else {
return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
}
}
}

29
lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
class OCIFunctionBuilder extends FunctionBuilder {
public function md5($input) {
return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
}
}

29
lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
class PgSqlFunctionBuilder extends FunctionBuilder {
public function concat($x, $y) {
return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
}
}

29
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
class SqliteFunctionBuilder extends FunctionBuilder {
public function concat($x, $y) {
return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
}
}

34
lib/private/DB/QueryBuilder/QueryBuilder.php
View File

@ -26,11 +26,17 @@ namespace OC\DB\QueryBuilder;
use Doctrine\DBAL\Platforms\MySqlPlatform;
use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform;
use OC\DB\OracleConnection;
use OC\DB\QueryBuilder\ExpressionBuilder\ExpressionBuilder;
use OC\DB\QueryBuilder\ExpressionBuilder\MySqlExpressionBuilder;
use OC\DB\QueryBuilder\ExpressionBuilder\OCIExpressionBuilder;
use OC\DB\QueryBuilder\ExpressionBuilder\PgSqlExpressionBuilder;
use OC\DB\QueryBuilder\ExpressionBuilder\SqliteExpressionBuilder;
use OC\DB\QueryBuilder\FunctionBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\FunctionBuilder\OCIFunctionBuilder;
use OC\DB\QueryBuilder\FunctionBuilder\PgSqlFunctionBuilder;
use OC\DB\QueryBuilder\FunctionBuilder\SqliteFunctionBuilder;
use OC\SystemConfig;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\DB\QueryBuilder\IQueryFunction;
@ -115,6 +121,34 @@ class QueryBuilder implements IQueryBuilder {
}
}
/**
* Gets an FunctionBuilder used for object-oriented construction of query functions.
* This producer method is intended for convenient inline usage. Example:
*
* <code>
* $qb = $conn->getQueryBuilder()
* ->select('u')
* ->from('users', 'u')
* ->where($qb->fun()->md5('u.id'));
* </code>
*
* For more complex function construction, consider storing the function
* builder object in a local variable.
*
* @return \OCP\DB\QueryBuilder\IFunctionBuilder
*/
public function func() {
if ($this->connection instanceof OracleConnection) {
return new OCIFunctionBuilder($this->helper);
} else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
return new SqliteFunctionBuilder($this->helper);
} else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
return new PgSqlFunctionBuilder($this->helper);
} else {
return new FunctionBuilder($this->helper);
}
}
/**
* Gets the type of the currently built query.
*

3
lib/private/DB/SQLiteSessionInit.php
View File

@ -58,6 +58,9 @@ class SQLiteSessionInit implements EventSubscriber {
$sensitive = ($this->caseSensitiveLike) ? 'true' : 'false';
$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
/** @var \PDO $pdo */
$pdo = $args->getConnection()->getWrappedConnection();
$pdo->sqliteCreateFunction('md5', 'md5', 1);
}
public function getSubscribedEvents() {

12
lib/private/Files/Cache/Wrapper/CacheJail.php
View File

@ -93,7 +93,7 @@ class CacheJail extends CacheWrapper {
* get the stored metadata of a file or folder
*
* @param string /int $file
* @return array|false
* @return ICacheEntry|false
*/
public function get($file) {
if (is_string($file) or $file == '') {
@ -178,6 +178,16 @@ class CacheJail extends CacheWrapper {
$this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
}
/**
* Get the storage id and path needed for a move
*
* @param string $path
* @return array [$storageId, $internalPath]
*/
protected function getMoveInfo($path) {
return [$this->getNumericStorageId(), $this->getSourcePath($path)];
}
/**
* remove all entries for files that are stored on the storage from the cache
*/

4
lib/private/Repair.php
View File

@ -43,6 +43,7 @@ use OC\Repair\OldGroupMembershipShares;
use OC\Repair\RemoveGetETagEntries;
use OC\Repair\RemoveOldShares;
use OC\Repair\RemoveRootShares;
use OC\Repair\NC13\RepairInvalidPaths;
use OC\Repair\SharePropagation;
use OC\Repair\SqliteAutoincrement;
use OC\Repair\DropOldTables;
@ -163,6 +164,7 @@ class Repair implements IOutput{
\OC::$server->getConfig()
),
new FixMountStorages(\OC::$server->getDatabaseConnection()),
new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig())
];
}
@ -174,7 +176,7 @@ class Repair implements IOutput{
*/
public static function getExpensiveRepairSteps() {
return [
new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
];
}

170
lib/private/Repair/NC11/RepairInvalidPaths.php Normal file
View File

@ -0,0 +1,170 @@
<?php
/**
* @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Repair\NC13;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
class RepairInvalidPaths implements IRepairStep {
const MAX_ROWS = 1000;
/** @var IDBConnection */
private $connection;
/** @var IConfig */
private $config;
private $getIdQuery;
private $updateQuery;
private $reparentQuery;
private $deleteQuery;
public function __construct(IDBConnection $connection, IConfig $config) {
$this->connection = $connection;
$this->config = $config;
}
public function getName() {
return 'Repair invalid paths in file cache';
}
private function getInvalidEntries() {
$builder = $this->connection->getQueryBuilder();
$computedPath = $builder->func()->concat(
'p.path',
$builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
);
//select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
$query = $builder->select('f.fileid', 'f.path', 'p.path AS parent_path', 'f.name', 'f.parent', 'f.storage')
->from('filecache', 'f')
->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
$builder->expr()->eq('f.parent', 'p.fileid'),
$builder->expr()->neq('p.name', $builder->createNamedParameter(''))
))
->where($builder->expr()->neq('f.path', $computedPath))
->setMaxResults(self::MAX_ROWS);
do {
$result = $query->execute();
$rows = $result->fetchAll();
foreach ($rows as $row) {
yield $row;
}
$result->closeCursor();
} while (count($rows) >= self::MAX_ROWS);
}
private function getId($storage, $path) {
if (!$this->getIdQuery) {
$builder = $this->connection->getQueryBuilder();
$this->getIdQuery = $builder->select('fileid')
->from('filecache')
->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
->andWhere($builder->expr()->eq('path', $builder->createParameter('path')));
}
$this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
$this->getIdQuery->setParameter('path', $path);
return $this->getIdQuery->execute()->fetchColumn();
}
private function update($fileid, $newPath) {
if (!$this->updateQuery) {
$builder = $this->connection->getQueryBuilder();
$this->updateQuery = $builder->update('filecache')
->set('path', $builder->createParameter('newpath'))
->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
}
$this->updateQuery->setParameter('newpath', $newPath);
$this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
$this->updateQuery->execute();
}
private function reparent($from, $to) {
if (!$this->reparentQuery) {
$builder = $this->connection->getQueryBuilder();
$this->reparentQuery = $builder->update('filecache')
->set('parent', $builder->createParameter('to'))
->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
}
$this->reparentQuery->setParameter('from', $from);
$this->reparentQuery->setParameter('to', $to);
$this->reparentQuery->execute();
}
private function delete($fileid) {
if (!$this->deleteQuery) {
$builder = $this->connection->getQueryBuilder();
$this->deleteQuery = $builder->delete('filecache')
->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
}
$this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
$this->deleteQuery->execute();
}
private function repair() {
$this->connection->beginTransaction();
$entries = $this->getInvalidEntries();
$count = 0;
foreach ($entries as $entry) {
$count++;
$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
if ($newId = $this->getId($entry['storage'], $calculatedPath)) {
// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
$this->reparent($entry['fileid'], $newId);
$this->delete($entry['fileid']);
} else {
$this->update($entry['fileid'], $calculatedPath);
}
}
$this->connection->commit();
return $count;
}
public function run(IOutput $output) {
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
// was added to 11.0.5.2
if (version_compare($versionFromBeforeUpdate, '11.0.5.2', '<')) {
$count = $this->repair();
$output->info('Repaired ' . $count . ' paths');
}
}
}

61
lib/public/DB/QueryBuilder/IFunctionBuilder.php Normal file
View File

@ -0,0 +1,61 @@
<?php
/**
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCP\DB\QueryBuilder;
/**
* This class provides a builder for sql some functions
*
* @since 12.0.0
*/
interface IFunctionBuilder {
/**
* Calculates the MD5 hash of a given input
*
* @param mixed $input The input to be hashed
*
* @return IQueryFunction
* @since 12.0.0
*/
public function md5($input);
/**
* Combines two input strings
*
* @param mixed $x The first input string
* @param mixed $y The seccond input string
*
* @return IQueryFunction
* @since 12.0.0
*/
public function concat($x, $y);
/**
* Takes a substring from the input string
*
* @param mixed $input The input string
* @param mixed $start The start of the substring, note that counting starts at 1
* @param mixed $length The length of the substring
*
* @return IQueryFunction
* @since 12.0.0
*/
public function substring($input, $start, $length = null);
}

19
lib/public/DB/QueryBuilder/IQueryBuilder.php
View File

@ -94,6 +94,25 @@ interface IQueryBuilder {
*/
public function expr();
/**
* Gets an FunctionBuilder used for object-oriented construction of query functions.
* This producer method is intended for convenient inline usage. Example:
*
* <code>
* $qb = $conn->getQueryBuilder()
* ->select('u')
* ->from('users', 'u')
* ->where($qb->fun()->md5('u.id'));
* </code>
*
* For more complex function construction, consider storing the function
* builder object in a local variable.
*
* @return \OCP\DB\QueryBuilder\IFunctionBuilder
* @since 12.0.0
*/
public function func();
/**
* Gets the type of the currently built query.
*

74
tests/lib/DB/QueryBuilder/FunctionBuilderTest.php Normal file
View File

@ -0,0 +1,74 @@
<?php
/**
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace Test\DB\QueryBuilder;
use OC\DB\QueryBuilder\Literal;
use Test\TestCase;
/**
* Class FunctionBuilderTest
*
* @group DB
*
* @package Test\DB\QueryBuilder
*/
class FunctionBuilderTest extends TestCase {
/** @var \Doctrine\DBAL\Connection|\OCP\IDBConnection */
protected $connection;
protected function setUp() {
parent::setUp();
$this->connection = \OC::$server->getDatabaseConnection();
}
public function testConcat() {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->concat($query->createNamedParameter('foo'), new Literal("'bar'")));
$this->assertEquals('foobar', $query->execute()->fetchColumn());
}
public function testMd5() {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->md5($query->createNamedParameter('foobar')));
$this->assertEquals(md5('foobar'), $query->execute()->fetchColumn());
}
public function testSubstring() {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->substring($query->createNamedParameter('foobar'), new Literal(2), $query->createNamedParameter(2)));
$this->assertEquals('oo', $query->execute()->fetchColumn());
}
public function testSubstringNoLength() {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->substring($query->createNamedParameter('foobar'), new Literal(2)));
$this->assertEquals('oobar', $query->execute()->fetchColumn());
}
}

50
tests/lib/Files/Cache/Wrapper/CacheJailTest.php
View File

@ -8,6 +8,7 @@
namespace Test\Files\Cache\Wrapper;
use OC\Files\Cache\Wrapper\CacheJail;
use Test\Files\Cache\CacheTest;
/**
@ -80,4 +81,53 @@ class CacheJailTest extends CacheTest {
//not supported
$this->assertTrue(true);
}
function testMoveFromJail() {
$folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
$this->sourceCache->put('source', $folderData);
$this->sourceCache->put('source/foo', $folderData);
$this->sourceCache->put('source/foo/bar', $folderData);
$this->sourceCache->put('target', $folderData);
$jail = new CacheJail($this->sourceCache, 'source');
$this->sourceCache->moveFromCache($jail, 'foo', 'target/foo');
$this->assertTrue($this->sourceCache->inCache('target/foo'));
$this->assertTrue($this->sourceCache->inCache('target/foo/bar'));
}
function testMoveToJail() {
$folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
$this->sourceCache->put('source', $folderData);
$this->sourceCache->put('source/foo', $folderData);
$this->sourceCache->put('source/foo/bar', $folderData);
$this->sourceCache->put('target', $folderData);
$jail = new CacheJail($this->sourceCache, 'target');
$jail->moveFromCache($this->sourceCache, 'source/foo', 'foo');
$this->assertTrue($this->sourceCache->inCache('target/foo'));
$this->assertTrue($this->sourceCache->inCache('target/foo/bar'));
}
function testMoveBetweenJail() {
$folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
$this->sourceCache->put('source', $folderData);
$this->sourceCache->put('source/foo', $folderData);
$this->sourceCache->put('source/foo/bar', $folderData);
$this->sourceCache->put('target', $folderData);
$jail = new CacheJail($this->sourceCache, 'target');
$sourceJail = new CacheJail($this->sourceCache, 'source');
$jail->moveFromCache($sourceJail, 'foo', 'foo');
$this->assertTrue($this->sourceCache->inCache('target/foo'));
$this->assertTrue($this->sourceCache->inCache('target/foo/bar'));
}
}

155
tests/lib/Repair/RepairInvalidPathsTest.php Normal file
View File

@ -0,0 +1,155 @@
<?php
/**
* @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test\Repair;
use OC\Files\Cache\Cache;
use OC\Files\Storage\Temporary;
use OC\Repair\NC13\RepairInvalidPaths;
use OCP\IConfig;
use OCP\Migration\IOutput;
use Test\TestCase;
/**
* @group DB
*/
class RepairInvalidPathsTest extends TestCase {
/** @var Temporary */
private $storage;
/** @var Cache */
private $cache;
/** @var RepairInvalidPaths */
private $repair;
protected function setUp() {
parent::setUp();
$this->storage = new Temporary();
$this->cache = $this->storage->getCache();
$config = $this->createMock(IConfig::class);
$config->expects($this->any())
->method('getSystemValue')
->with('version', '0.0.0')
->willReturn('11.0.0.1');
$this->repair = new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), $config);
}
protected function tearDown() {
$this->cache->clear();
return parent::tearDown();
}
public function testRepairNonDuplicate() {
$this->storage->mkdir('foo/bar/asd');
$this->storage->mkdir('foo2');
$this->storage->getScanner()->scan('');
$folderId = $this->cache->getId('foo/bar');
$newParentFolderId = $this->cache->getId('foo2');
// failed rename, moved entry is updated but not it's children
$this->cache->update($folderId, ['path' => 'foo2/bar', 'parent' => $newParentFolderId]);
$this->assertTrue($this->cache->inCache('foo2/bar'));
$this->assertTrue($this->cache->inCache('foo/bar/asd'));
$this->assertFalse($this->cache->inCache('foo2/bar/asd'));
$this->assertEquals($folderId, $this->cache->get('foo/bar/asd')['parent']);
$this->repair->run($this->createMock(IOutput::class));
$this->assertTrue($this->cache->inCache('foo2/bar'));
$this->assertTrue($this->cache->inCache('foo2/bar/asd'));
$this->assertFalse($this->cache->inCache('foo/bar/asd'));
$this->assertEquals($folderId, $this->cache->get('foo2/bar/asd')['parent']);
$this->assertEquals($folderId, $this->cache->getId('foo2/bar'));
}
public function testRepairDuplicate() {
$this->storage->mkdir('foo/bar/asd');
$this->storage->mkdir('foo2');
$this->storage->getScanner()->scan('');
$folderId = $this->cache->getId('foo/bar');
$newParentFolderId = $this->cache->getId('foo2');
// failed rename, moved entry is updated but not it's children
$this->cache->update($folderId, ['path' => 'foo2/bar', 'parent' => $newParentFolderId]);
$this->storage->rename('foo/bar', 'foo2/bar');
$this->storage->mkdir('foo2/bar/asd/foo');
// usage causes the renamed subfolder to be scanned
$this->storage->getScanner()->scan('foo2/bar/asd');
$this->assertTrue($this->cache->inCache('foo2/bar'));
$this->assertTrue($this->cache->inCache('foo/bar/asd'));
$this->assertTrue($this->cache->inCache('foo2/bar/asd'));
$this->assertEquals($folderId, $this->cache->get('foo/bar/asd')['parent']);
$this->repair->run($this->createMock(IOutput::class));
$this->assertTrue($this->cache->inCache('foo2/bar'));
$this->assertTrue($this->cache->inCache('foo2/bar/asd'));
$this->assertFalse($this->cache->inCache('foo/bar/asd'));
$this->assertEquals($this->cache->getId('foo2/bar'), $this->cache->get('foo2/bar/asd')['parent']);
$this->assertEquals($this->cache->getId('foo2/bar/asd'), $this->cache->get('foo2/bar/asd/foo')['parent']);
}
public function testRepairMultipleNonDuplicate() {
$this->storage->mkdir('foo/bar/asd');
$this->storage->mkdir('foo/bar2/asd');
$this->storage->mkdir('foo2');
$this->storage->getScanner()->scan('');
$folderId1 = $this->cache->getId('foo/bar');
$folderId2 = $this->cache->getId('foo/bar2');
$newParentFolderId = $this->cache->getId('foo2');
// failed rename, moved entry is updated but not it's children
$this->cache->update($folderId1, ['path' => 'foo2/bar', 'parent' => $newParentFolderId]);
$this->cache->update($folderId2, ['path' => 'foo2/bar2', 'parent' => $newParentFolderId]);
$this->assertTrue($this->cache->inCache('foo2/bar'));
$this->assertTrue($this->cache->inCache('foo2/bar2'));
$this->assertTrue($this->cache->inCache('foo/bar/asd'));
$this->assertTrue($this->cache->inCache('foo/bar2/asd'));
$this->assertFalse($this->cache->inCache('foo2/bar/asd'));
$this->assertFalse($this->cache->inCache('foo2/bar2/asd'));
$this->assertEquals($folderId1, $this->cache->get('foo/bar/asd')['parent']);
$this->assertEquals($folderId2, $this->cache->get('foo/bar2/asd')['parent']);
$this->repair->run($this->createMock(IOutput::class));
$this->assertTrue($this->cache->inCache('foo2/bar'));
$this->assertTrue($this->cache->inCache('foo2/bar2'));
$this->assertTrue($this->cache->inCache('foo2/bar/asd'));
$this->assertTrue($this->cache->inCache('foo2/bar2/asd'));
$this->assertFalse($this->cache->inCache('foo/bar/asd'));
$this->assertFalse($this->cache->inCache('foo/bar2/asd'));
$this->assertEquals($folderId1, $this->cache->get('foo2/bar/asd')['parent']);
$this->assertEquals($folderId2, $this->cache->get('foo2/bar2/asd')['parent']);
$this->assertEquals($folderId1, $this->cache->getId('foo2/bar'));
$this->assertEquals($folderId2, $this->cache->getId('foo2/bar2'));
}
}

2
version.php
View File

@ -26,7 +26,7 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
$OC_Version = array(11, 0, 5, 1);
$OC_Version = array(11, 0, 5, 2);
// The human readable string
$OC_VersionString = '11.0.5';