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

Merge pull request #15637 from nextcloud/bugfix/15567/ignore-hidden-share 

Allow hidden smb shares
This commit is contained in:
blizzz 2019-07-24 12:43:29 +02:00 committed by GitHub
parent babe1333ad b1bd3f1fe5
commit 7e8dfd404e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,12 +287,10 @@ class OC_Mount_Config {
$result = true;
if(is_array($option)) {
foreach ($option as $optionItem) {
if(is_array($optionItem)) {
$result = $result && self::arePlaceholdersSubstituted($option);
}
$result = $result && self::arePlaceholdersSubstituted($optionItem);
}
} else if (is_string($option)) {
if (strpos($option, '$') !== false) {
if (strpos(rtrim($option, '$'), '$') !== false) {
$result = false;
}
}

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

@ -0,0 +1,49 @@
<?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));
}
}