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

Merge pull request #26215 from nextcloud/backport/26145/stable21 

[stable21] add (hidden) option to always show smb root as writable
This commit is contained in:
Roeland Jago Douma 2021-03-20 10:53:40 +01:00 committed by GitHub
parent 798eff0161 7f066931e4
commit b3bf640111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_external/lib/Lib/Storage/SMB.php
View File

@ -97,6 +97,9 @@ class SMB extends Common implements INotifyStorage {
/** @var bool */ /** @var bool */
protected $checkAcl; protected $checkAcl;
/** @var bool */
protected $rootWritable;
public function __construct($params) { public function __construct($params) {
if (!isset($params['host'])) { if (!isset($params['host'])) {
throw new \Exception('Invalid configuration, no host provided'); throw new \Exception('Invalid configuration, no host provided');
@ -134,6 +137,7 @@ class SMB extends Common implements INotifyStorage {
$this->showHidden = isset($params['show_hidden']) && $params['show_hidden']; $this->showHidden = isset($params['show_hidden']) && $params['show_hidden'];
$this->checkAcl = isset($params['check_acl']) && $params['check_acl']; $this->checkAcl = isset($params['check_acl']) && $params['check_acl'];
$this->rootWritable = isset($params['root_force_writable']) && $params['root_force_writable'];
$this->statCache = new CappedMemoryCache(); $this->statCache = new CappedMemoryCache();
parent::__construct($params); parent::__construct($params);
@ -573,7 +577,11 @@ class SMB extends Common implements INotifyStorage {
private function getMetaDataFromFileInfo(IFileInfo $fileInfo) { private function getMetaDataFromFileInfo(IFileInfo $fileInfo) {
$permissions = Constants::PERMISSION_READ + Constants::PERMISSION_SHARE; $permissions = Constants::PERMISSION_READ + Constants::PERMISSION_SHARE;
if (!$fileInfo->isReadOnly()) { if (
!$fileInfo->isReadOnly() || (
$this->rootWritable && $fileInfo->getPath() == $this->buildPath('')
)
) {
$permissions += Constants::PERMISSION_DELETE; $permissions += Constants::PERMISSION_DELETE;
$permissions += Constants::PERMISSION_UPDATE; $permissions += Constants::PERMISSION_UPDATE;
if ($fileInfo->isDirectory()) { if ($fileInfo->isDirectory()) {