-
Notifications
You must be signed in to change notification settings - Fork 3
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 #67 from nextcloud/fix/config-handling
feat: correct config handling, encrypt secrets
- Loading branch information
Showing
7 changed files
with
169 additions
and
30 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,91 @@ | ||
| <?php | ||
| /** | ||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace OCA\Discourse\Migration; | ||
|
|
||
| use Closure; | ||
| use OCA\Discourse\AppInfo\Application; | ||
| use OCP\DB\ISchemaWrapper; | ||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IConfig; | ||
| use OCP\IDBConnection; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\SimpleMigrationStep; | ||
| use OCP\Security\ICrypto; | ||
|
|
||
| class Version2200Date202410231719 extends SimpleMigrationStep { | ||
|
|
||
| public function __construct( | ||
| private IDBConnection $connection, | ||
| private ICrypto $crypto, | ||
| private IConfig $config, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * @param IOutput $output | ||
| * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| * | ||
| * @return null|ISchemaWrapper | ||
| */ | ||
| public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { | ||
| // encrypt private_key | ||
| $privKey = $this->config->getAppValue(Application::APP_ID, 'private_key'); | ||
| if ($privKey !== '') { | ||
| $privKey = $this->crypto->encrypt($privKey); | ||
| $this->config->setAppValue(Application::APP_ID, 'private_key', $privKey); | ||
| } | ||
|
|
||
| // encrypt user tokens and client_ids | ||
| $qbUpdate = $this->connection->getQueryBuilder(); | ||
| $qbUpdate->update('preferences') | ||
| ->set('configvalue', $qbUpdate->createParameter('updateValue')) | ||
| ->where( | ||
| $qbUpdate->expr()->eq('appid', $qbUpdate->createNamedParameter(Application::APP_ID, IQueryBuilder::PARAM_STR)) | ||
| ) | ||
| ->andWhere( | ||
| $qbUpdate->expr()->eq('configkey', $qbUpdate->createParameter('updateConfigKey')) | ||
| ); | ||
| $qbUpdate->andWhere( | ||
| $qbUpdate->expr()->eq('userid', $qbUpdate->createParameter('updateUserId')) | ||
| ); | ||
|
|
||
| $qbSelect = $this->connection->getQueryBuilder(); | ||
| $qbSelect->select(['userid', 'configvalue', 'configkey']) | ||
| ->from('preferences') | ||
| ->where( | ||
| $qbSelect->expr()->eq('appid', $qbSelect->createNamedParameter(Application::APP_ID, IQueryBuilder::PARAM_STR)) | ||
| ); | ||
|
|
||
| $or = $qbSelect->expr()->orx(); | ||
| $or->add($qbSelect->expr()->eq('configkey', $qbSelect->createNamedParameter('token', IQueryBuilder::PARAM_STR))); | ||
| $or->add($qbSelect->expr()->eq('configkey', $qbSelect->createNamedParameter('client_id', IQueryBuilder::PARAM_STR))); | ||
| $qbSelect->andWhere($or); | ||
|
|
||
| $qbSelect->andWhere( | ||
| $qbSelect->expr()->nonEmptyString('configvalue') | ||
| ) | ||
| ->andWhere( | ||
| $qbSelect->expr()->isNotNull('configvalue') | ||
| ); | ||
| $req = $qbSelect->executeQuery(); | ||
| while ($row = $req->fetch()) { | ||
| $userId = $row['userid']; | ||
| $configKey = $row['configkey']; | ||
| $storedClearValue = $row['configvalue']; | ||
| $encryptedValue = $this->crypto->encrypt($storedClearValue); | ||
| $qbUpdate->setParameter('updateUserId', $userId, IQueryBuilder::PARAM_STR); | ||
| $qbUpdate->setParameter('updateConfigKey', $configKey, IQueryBuilder::PARAM_STR); | ||
| $qbUpdate->setParameter('updateValue', $encryptedValue, IQueryBuilder::PARAM_STR); | ||
| $qbUpdate->executeStatement(); | ||
| } | ||
| $req->closeCursor(); | ||
| return null; | ||
| } | ||
| } |
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