-
Notifications
You must be signed in to change notification settings - Fork 34
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 #636 from nextcloud/enh/noid/encrypt-client-secret
Encrypt stored oidc provider client secrets and id4me client secrets
- Loading branch information
Showing
7 changed files
with
175 additions
and
31 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
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,98 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright 2023, Julien Veyssier <julien-nc@posteo.net> | ||
| * | ||
| * @author Julien Veyssier <julien-nc@posteo.net> | ||
| * | ||
| * @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\UserOIDC\Migration; | ||
|
|
||
| use Closure; | ||
| use OCP\DB\ISchemaWrapper; | ||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IDBConnection; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\SimpleMigrationStep; | ||
| use OCP\Security\ICrypto; | ||
|
|
||
| class Version010303Date20230602125945 extends SimpleMigrationStep { | ||
|
|
||
| /** | ||
| * @var IDBConnection | ||
| */ | ||
| private $connection; | ||
| /** | ||
| * @var ICrypto | ||
| */ | ||
| private $crypto; | ||
|
|
||
| public function __construct( | ||
| IDBConnection $connection, | ||
| ICrypto $crypto | ||
| ) { | ||
| $this->connection = $connection; | ||
| $this->crypto = $crypto; | ||
| } | ||
|
|
||
| public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| foreach (['user_oidc_providers', 'user_oidc_id4me'] as $tableName) { | ||
| if ($schema->hasTable($tableName)) { | ||
| $table = $schema->getTable($tableName); | ||
| if ($table->hasColumn('client_secret')) { | ||
| $column = $table->getColumn('client_secret'); | ||
| $column->setLength(512); | ||
| return $schema; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { | ||
| // update secrets in user_oidc_providers and user_oidc_id4me | ||
| foreach (['user_oidc_providers', 'user_oidc_id4me'] as $tableName) { | ||
| $qbUpdate = $this->connection->getQueryBuilder(); | ||
| $qbUpdate->update($tableName) | ||
| ->set('client_secret', $qbUpdate->createParameter('updateSecret')) | ||
| ->where( | ||
| $qbUpdate->expr()->eq('id', $qbUpdate->createParameter('updateId')) | ||
| ); | ||
|
|
||
| $qbSelect = $this->connection->getQueryBuilder(); | ||
| $qbSelect->select('id', 'client_secret') | ||
| ->from($tableName); | ||
| $req = $qbSelect->executeQuery(); | ||
| while ($row = $req->fetch()) { | ||
| $id = $row['id']; | ||
| $secret = $row['client_secret']; | ||
| $encryptedSecret = $this->crypto->encrypt($secret); | ||
| $qbUpdate->setParameter('updateSecret', $encryptedSecret, IQueryBuilder::PARAM_STR); | ||
| $qbUpdate->setParameter('updateId', $id, IQueryBuilder::PARAM_INT); | ||
| $qbUpdate->executeStatement(); | ||
| } | ||
| $req->closeCursor(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.