Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/twofactor_backupcodes/appinfo/database.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<overwrite>false</overwrite>
<charset>utf8</charset>
<table>
<name>*dbprefix*twofactor_backup_codes</name>
<name>*dbprefix*twofactor_backupcodes</name>
<declaration>
<field>
<name>id</name>
Expand Down Expand Up @@ -37,7 +37,7 @@
</field>

<index>
<name>two_factor_backupcodes_user_id</name>
<name>twofactor_backupcodes_uid</name>
<field>
<name>user_id</name>
<sorting>ascending</sorting>
Expand Down
8 changes: 7 additions & 1 deletion apps/twofactor_backupcodes/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<description>A two-factor auth backup codes provider</description>
<licence>agpl</licence>
<author>Christoph Wurst</author>
<version>1.1.0</version>
<version>1.1.1</version>
<namespace>TwoFactorBackupCodes</namespace>
<category>other</category>

Expand All @@ -29,4 +29,10 @@
<provider>OCA\TwoFactorBackupCodes\Activity\Provider</provider>
</providers>
</activity>

<repair-steps>
<post-migration>
<step>OCA\TwoFactorBackupCodes\Migration\CopyEntriesFromOldTable</step>
</post-migration>
</repair-steps>
</info>
7 changes: 4 additions & 3 deletions apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
namespace OCA\TwoFactorBackupCodes\Db;

use OCP\AppFramework\Db\Mapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IUser;

class BackupCodeMapper extends Mapper {

public function __construct(IDBConnection $db) {
parent::__construct($db, 'twofactor_backup_codes');
parent::__construct($db, 'twofactor_backupcodes');
}

/**
Expand All @@ -40,7 +41,7 @@ public function getBackupCodes(IUser $user) {
$qb = $this->db->getQueryBuilder();

$qb->select('id', 'user_id', 'code', 'used')
->from('twofactor_backup_codes')
->from('twofactor_backupcodes')
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
$result = $qb->execute();

Expand All @@ -66,7 +67,7 @@ public function deleteCodesByUserId($uid) {
/* @var IQueryBuilder $qb */
$qb = $this->db->getQueryBuilder();

$qb->delete('twofactor_backup_codes')
$qb->delete('twofactor_backupcodes')
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
$qb->execute();
}
Expand Down
108 changes: 108 additions & 0 deletions apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?php
/**
* @copyright Copyright (c) 2017 Joas Schilling <[email protected]>
*
* @author Joas Schilling <[email protected]>
*
* @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 OCA\TwoFactorBackupCodes\Migration;

use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

class CopyEntriesFromOldTable implements IRepairStep {

/** @var IDBConnection */
protected $connection;

/** @var IConfig */
protected $config;

/**
* @param IDBConnection $connection
* @param IConfig $config
*/
public function __construct(IDBConnection $connection, IConfig $config) {
$this->connection = $connection;
$this->config = $config;
}

/**
* Returns the step's name
*
* @return string
* @since 9.1.0
*/
public function getName() {
return 'Copy twofactor backup codes from legacy table';
}

/**
* Run repair step.
* Must throw exception on error.
*
* @since 9.1.0
* @param IOutput $output
* @throws \Exception in case of failure
*/
public function run(IOutput $output) {
$version = $this->config->getAppValue('twofactor_backupcodes', 'installed_version', '0.0.0');
if (version_compare($version, '1.1.1', '>=')) {
return;
}

if (!$this->connection->tableExists('twofactor_backup_codes')) {
// Legacy table does not exist
return;
}

$insert = $this->connection->getQueryBuilder();
$insert->insert('twofactor_backupcodes')
->values([
// Inserting with id might fail: 'id' => $insert->createParameter('id'),
'user_id' => $insert->createParameter('user_id'),
'code' => $insert->createParameter('code'),
'used' => $insert->createParameter('used'),
]);

$query = $this->connection->getQueryBuilder();
$query->select('*')
->from('twofactor_backup_codes')
->orderBy('id', 'ASC');
$result = $query->execute();

$output->startProgress();
while ($row = $result->fetch()) {
$output->advance();

$insert
// Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
->execute();
}
$output->finishProgress();

$this->connection->dropTable('twofactor_backup_codes');
}
}