diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-08-25 19:33:42 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-25 19:33:42 +0300 |
| commit | 6bcffdc889445611273acf92181f9ae057992b34 (patch) | |
| tree | 39b4dc4c51853db0ae14be1b22dcfea2f960487d | |
| parent | 3b3ce91d46a4182084ae7c9a2087e77af8d5922c (diff) | |
| parent | b05e178bbf884b120d1106e6a28f35aa50d6d06f (diff) | |
Merge pull request #18561 from owncloud/ext-objectstore-stable7
[stable7] Prevent objectstore being set from client side
| -rw-r--r-- | apps/files_external/lib/config.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 717426c0e01..b3ec25b3391 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -489,6 +489,11 @@ class OC_Mount_Config { return false; } + if (isset($classOptions['objectstore'])) { + // objectstore cannot be set by client side + return false; + } + if (!isset($backends[$class])) { // invalid backend return false; @@ -875,6 +880,13 @@ class OC_Mount_Config { $mountPoint[$applicable][$mountPath]['priority'] = $data[$mountType][$applicable][$mountPath]['priority']; } + // Persistent objectstore + if (isset($data[$mountType][$applicable][$mountPath]) + && isset($data[$mountType][$applicable][$mountPath]['objectstore']) + ) { + $mountPoint[$applicable][$mountPath]['objectstore'] + = $data[$mountType][$applicable][$mountPath]['objectstore']; + } $data[$mountType][$applicable] = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); } else { |