mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19932 from nextcloud/remove-placeholder-check 

remove the requirement that everything that looks like a placeholder …
This commit is contained in:
Roeland Jago Douma 2020-03-17 21:34:08 +01:00 committed by GitHub
parent 7e1bee3389 59082661ca
commit 0eb3c3ed18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/files_external/lib/config.php
View File

@ -252,20 +252,6 @@ class OC_Mount_Config {
continue; continue;
} }
$option = self::substitutePlaceholdersInConfig($option); $option = self::substitutePlaceholdersInConfig($option);
if(!self::arePlaceholdersSubstituted($option)) {
\OC::$server->getLogger()->error(
'A placeholder was not substituted: {option} for mount type {class}',
[
'app' => 'files_external',
'option' => $option,
'class' => $class,
]
);
throw new StorageNotAvailableException(
'Mount configuration incomplete',
StorageNotAvailableException::STATUS_INCOMPLETE_CONF
);
}
} }
if (class_exists($class)) { if (class_exists($class)) {
try { try {
@ -290,20 +276,6 @@ class OC_Mount_Config {
return StorageNotAvailableException::STATUS_ERROR; return StorageNotAvailableException::STATUS_ERROR;
} }
public static function arePlaceholdersSubstituted($option):bool {
$result = true;
if(is_array($option)) {
foreach ($option as $optionItem) {
$result = $result && self::arePlaceholdersSubstituted($optionItem);
}
} else if (is_string($option)) {
if (strpos(rtrim($option, '$'), '$') !== false) {
$result = false;
}
}
return $result;
}
/** /**
* Read the mount points in the config file into an array * Read the mount points in the config file into an array
* *

49
apps/files_external/tests/Config/PlaceholderSubstituteTest.php
View File

@ -1,49 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2019 Daniel Kesselberg <mail@danielkesselberg.de>
*
* @author Daniel Kesselberg <mail@danielkesselberg.de>
*
* @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\files_external\tests\Config;
use OC_Mount_Config;
use Test\TestCase;
class PlaceholderSubstituteTest extends TestCase {
public function dataArePlaceholdersSubstituted(): array {
return [
['smb_$user', false],
['hidden_share$', true],
[['smb_$user', 'hidden_share$'], false],
[['smb_hello', 'hidden_share$'], true]
];
}
/**
* @dataProvider dataArePlaceholdersSubstituted
* @param string|array $option
* @param bool $expected
*/
public function testArePlaceholdersSubstituted($option, $expected): void {
$this->assertSame($expected, OC_Mount_Config::arePlaceholdersSubstituted($option));
}
}