-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #210 from astrairidium/delay-failed-verify
Delay validating previously failed files.
- Loading branch information
Showing
9 changed files
with
311 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2023, struktur AG. | ||
| * | ||
| * @author Joachim Bauch <bauch@struktur.de> | ||
| * | ||
| * @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 OCA\Certificate24\Migration; | ||
|
|
||
| use Doctrine\DBAL\Types\Types; | ||
| use OCP\DB\ISchemaWrapper; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\SimpleMigrationStep; | ||
|
|
||
| class Version1000Date20230830121523 extends SimpleMigrationStep { | ||
| /** | ||
| * @param IOutput $output | ||
| * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| * @return null|ISchemaWrapper | ||
| */ | ||
| public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { | ||
| $schema = $schemaClosure(); | ||
|
|
||
| if (!$schema->hasTable('c24_verify_failed')) { | ||
| $table = $schema->createTable('c24_verify_failed'); | ||
| $table->addColumn('id', Types::BIGINT, [ | ||
| 'autoincrement' => true, | ||
| 'notnull' => true, | ||
| ]); | ||
| $table->addColumn('file_id', Types::BIGINT, [ | ||
| 'notnull' => true, | ||
| 'length' => 64, | ||
| ]); | ||
| $table->addColumn('created', Types::DATETIMETZ_MUTABLE, [ | ||
| 'notnull' => true, | ||
| ]); | ||
| $table->addColumn('updated', Types::DATETIMETZ_MUTABLE, [ | ||
| 'notnull' => true, | ||
| ]); | ||
| $table->addColumn('count', Types::INTEGER, [ | ||
| 'notnull' => true, | ||
| ]); | ||
| $table->setPrimaryKey(['id']); | ||
| $table->addUniqueIndex(['file_id']); | ||
| } | ||
| return $schema; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2023, struktur AG. | ||
| * | ||
| * @author Joachim Bauch <bauch@struktur.de> | ||
| * | ||
| * @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 OCA\Certificate24\Tests\php; | ||
|
|
||
| use OCA\Certificate24\Requests; | ||
| use OCA\Certificate24\Verify; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\Files\File; | ||
| use OCP\Files\IMimeTypeLoader; | ||
| use OCP\IDBConnection; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
| use Psr\Log\LoggerInterface; | ||
| use Test\TestCase; | ||
|
|
||
| /** | ||
| * @group DB | ||
| */ | ||
| class VerifyTest extends TestCase { | ||
| /** @var MockObject|ITimeFactory $timeFactory */ | ||
| protected ITimeFactory $timeFactory; | ||
| protected Verify $verify; | ||
|
|
||
| public function setUp(): void { | ||
| parent::setUp(); | ||
|
|
||
| $this->timeFactory = $this->createMock(ITimeFactory::class); | ||
| $db = \OC::$server->query(IDBConnection::class); | ||
| $mimeTypeLoader = \OC::$server->query(IMimeTypeLoader::class); | ||
| $logger = $this->createMock(LoggerInterface::class); | ||
| $requests = $this->createMock(Requests::class); | ||
|
|
||
| $this->verify = new Verify($logger, $db, $mimeTypeLoader, $requests); | ||
| $this->verify->deleteAllFileSignatures(); | ||
| $this->verify->deleteAllFailed(); | ||
| } | ||
|
|
||
| public function testIncrementFailed() { | ||
| /** @var MockObject|File $file */ | ||
| $file = $this->createMock(File::class); | ||
| $file | ||
| ->method('getId') | ||
| ->willReturn(1); | ||
|
|
||
| $this->assertEquals(0, $this->verify->getFailedCount($file)); | ||
| $this->verify->storeFailed($file); | ||
| $this->assertEquals(1, $this->verify->getFailedCount($file)); | ||
| $this->verify->storeFailed($file); | ||
| $this->assertEquals(2, $this->verify->getFailedCount($file)); | ||
| $this->verify->deleteFailed($file); | ||
| $this->assertEquals(0, $this->verify->getFailedCount($file)); | ||
| } | ||
| } |
Oops, something went wrong.