summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-06-27 22:18:47 +0200
committerGitHub <noreply@github.com>2019-06-27 22:18:47 +0200
commit01f8fb00bde4e5463a2f747b75b305b0d025fdad (patch)
tree0ce9c35b1cf69d422a9ccdaf6a6966dd200d3193
parente648c0733577ba8ec5f4de6dcfe7960881f3ffd0 (diff)
parent8c73c1ea5e2786d3d47e0553d98d0b727c26c6d6 (diff)
downloadnextcloud-server-01f8fb00bde4e5463a2f747b75b305b0d025fdad.tar.gz
nextcloud-server-01f8fb00bde4e5463a2f747b75b305b0d025fdad.zip
Merge pull request #16121 from nextcloud/bugfix/noid/dont-allow-to-disable-encryption-via-the-api
Don't allow to disable encryption via the API
-rw-r--r--apps/provisioning_api/lib/Controller/AppConfigController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/provisioning_api/lib/Controller/AppConfigController.php b/apps/provisioning_api/lib/Controller/AppConfigController.php
index 38483d2796c..6e61e10a2f2 100644
--- a/apps/provisioning_api/lib/Controller/AppConfigController.php
+++ b/apps/provisioning_api/lib/Controller/AppConfigController.php
@@ -153,7 +153,7 @@ class AppConfigController extends OCSController {
throw new \InvalidArgumentException('The given key can not be set');
}
- if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
+ if ($app === 'core' && ($key === 'encryption_enabled' || strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
throw new \InvalidArgumentException('The given key can not be set');
}
}