-
Notifications
You must be signed in to change notification settings - Fork 12
Fix migration issue caused during upgrade to version 10 #15
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,48 @@ | ||
| <?php | ||
| /** | ||
| * @author Sujith Haridasan <sharidasan@owncloud.com> | ||
| * | ||
| * @copyright Copyright (c) 2017, ownCloud GmbH | ||
| * @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\Encryption\Migrations; | ||
|
|
||
| use OCP\Migration\ISimpleMigration; | ||
| use OCP\Migration\IOutput; | ||
|
|
||
| class Version20170913113840 implements ISimpleMigration { | ||
|
|
||
| /** | ||
| * @param IOutput $out | ||
| */ | ||
| public function run(IOutput $out) { | ||
| $installedVersion = \OC::$server->getConfig()->getSystemValue('version', '0.0.0'); | ||
|
|
||
| if (version_compare('10.0.3', $installedVersion, '>=') === true) { | ||
| $encryptionEnable = \OC::$server->getAppConfig()->getValue('encryption', 'enabled', 'yes'); | ||
| $coreEncryptionEnable = \OC::$server->getAppConfig()->getValue('core', 'encryption_enabled', 'yes'); | ||
| $userSpecificKey = \OC::$server->getAppConfig()->getValue('encryption', 'userSpecificKey', ''); | ||
| $masterKey = \OC::$server->getAppConfig()->getValue('encryption', 'useMasterKey', ''); | ||
|
|
||
| if (($userSpecificKey === '') && ($masterKey === '') && | ||
| ($encryptionEnable === 'yes') && ($coreEncryptionEnable === 'yes')) { | ||
| \OC::$server->getConfig()->setAppValue('encryption', 'userSpecificKey', '1'); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now this is the only modification I made. This is equivalent to
10.0.3 >= $installeddVersion.Since we are heading towards 10.0.3, this should be good enough. The UI changed from 10.0.2.
So till version < 10.0.2, the upgrade should work as it did. Or lets say if
userSpecificKeyis added to appconfig for versions less than 10.0.2, then, nothing would prohibit the code flow.Now once the upgrade reaches 10.0.2 which is still less than 10.0.3, goes inside the if condition. And then tries to check if the condition is met with the inner
ifcondition ( the one with lots of&&). And adds theuserSpecificKeyif the condition is true and UI will not have dropdown list.Lets say if version >= 10.0.2, then the inner if condition may/may not be hit. Because if the encryption is enabled then either of the types would be selected. If not then again falls back to
userSpecificKey. This logic applies till, including version 10.0.3.Though technically the version check is redundant imho. Because unless explicitly selected for masterkey or enabled masterkey via command line => its userSpecificKey. Which sticks with the inner if condition.