Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable15] Log and continue on Dav reader failure (repair uid) #12867

Merged
merged 1 commit into from
Dec 6, 2018
Merged

[stable15] Log and continue on Dav reader failure (repair uid) #12867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/Repair.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public static function getRepairSteps() {
new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig())
new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger())
];
}

Expand Down
31 changes: 22 additions & 9 deletions lib/private/Repair/NC15/SetVcardDatabaseUID.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@

use OCP\IConfig;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
use Sabre\VObject\Reader;
use Sabre\VObject\ParseException;

class SetVcardDatabaseUID implements IRepairStep {
const MAX_ROWS = 1000;
Expand All @@ -38,11 +40,15 @@ class SetVcardDatabaseUID implements IRepairStep {
/** @var IConfig */
private $config;

/** @var ILogger */
private $logger;

private $updateQuery;

public function __construct(IDBConnection $connection, IConfig $config) {
public function __construct(IDBConnection $connection, IConfig $config, ILogger $logger) {
$this->connection = $connection;
$this->config = $config;
$this->logger = $logger;
}

public function getName() {
Expand Down Expand Up @@ -75,13 +81,20 @@ private function getInvalidEntries() {
* Extract UID from vcard
*
* @param string $cardData the vcard raw data
* @param IOutput $output the output logger
* @return string the uid or empty if none
*/
private function getUID(string $cardData): string {
$vCard = Reader::read($cardData);
if ($vCard->UID) {
$uid = $vCard->UID->getValue();
return $uid;
private function getUID(string $cardData, IOutput $output): string {
try {
$vCard = Reader::read($cardData);
if ($vCard->UID) {
$uid = $vCard->UID->getValue();

return $uid;
}
} catch (ParseException $e) {
$output->warning('One vCard is broken. We logged the exception and will continue the repair.');
$this->logger->logException($e);
}

return '';
Expand All @@ -106,7 +119,7 @@ private function update(int $id, string $uid) {
$this->updateQuery->execute();
}

private function repair(): int {
private function repair(IOutput $output): int {
$this->connection->beginTransaction();
$entries = $this->getInvalidEntries();
$count = 0;
Expand All @@ -116,7 +129,7 @@ private function repair(): int {
if (is_resource($cardData)) {
$cardData = stream_get_contents($cardData);
}
$uid = $this->getUID($cardData);
$uid = $this->getUID($cardData, $output);
$this->update($entry['id'], $uid);
}
$this->connection->commit();
Expand All @@ -133,7 +146,7 @@ private function shouldRun() {

public function run(IOutput $output) {
if ($this->shouldRun()) {
$count = $this->repair();
$count = $this->repair($output);

$output->info('Fixed ' . $count . ' vcards');
}
Expand Down
11 changes: 9 additions & 2 deletions tests/lib/Repair/SetVcardDatabaseUIDTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
namespace Test\Repair;

use OCP\IConfig;
use OCP\ILogger;
use OCP\Migration\IOutput;
use OC\Repair\NC15\SetVcardDatabaseUID;
use Test\TestCase;

Expand All @@ -38,11 +40,15 @@ class SetVcardDatabaseUIDTest extends TestCase {
/** @var IConfig */
private $config;

/** @var Ilogger */
private $logger;

protected function setUp() {
parent::setUp();

$this->config = $this->createMock(IConfig::class);
$this->repair = new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), $this->config);
$this->logger = $this->createMock(Ilogger::class);
$this->repair = new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), $this->config, $this->logger);
}

protected function tearDown() {
Expand Down Expand Up @@ -86,7 +92,8 @@ public function dataTestVcards() {
* @param string|boolean $expected
*/
public function testExtractUIDFromVcard($from, $expected) {
$uid = $this->invokePrivate($this->repair, 'getUid', ['carddata' => $from]);
$output = $this->createMock(IOutput::class);
$uid = $this->invokePrivate($this->repair, 'getUid', ['carddata' => $from, 'output' => $output]);
$this->assertEquals($expected, $uid);
}

Expand Down