extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-29 01:59:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Collabora's extra share needs to use restricted fstab from original share, not full fstab

Browse Source
This commit is contained in:
nathan 2022-11-17 09:29:42 -07:00
parent 19f4e13c7a
commit 57be82de46
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/Vfs/Sharing.php
View File

@ -16,6 +16,7 @@ namespace EGroupware\Api\Vfs;
use EGroupware\Api; use EGroupware\Api;
use EGroupware\Api\Json\Response; use EGroupware\Api\Json\Response;
use EGroupware\Api\Vfs; use EGroupware\Api\Vfs;
use EGroupware\Collabora\Wopi;
use EGroupware\Filemanager\Sharing\AnonymousList; use EGroupware\Filemanager\Sharing\AnonymousList;
use EGroupware\Filemanager\Sharing\Ui; use EGroupware\Filemanager\Sharing\Ui;
use EGroupware\Filemanager\Sharing\Ui as ShareUi; use EGroupware\Filemanager\Sharing\Ui as ShareUi;
@ -439,12 +440,15 @@ class Sharing extends \EGroupware\Api\Sharing
if (($exists = ($stat = Vfs::stat($path)) && Vfs::check_access($path, Vfs::READABLE, $stat))) if (($exists = ($stat = Vfs::stat($path)) && Vfs::check_access($path, Vfs::READABLE, $stat)))
{ {
// Not sure why stat puts a / on the end of files, but remove it // Not sure why stat puts a / on the end of files, but remove it
if(substr($stat['url'],-1) == '/' && !Vfs::is_dir($stat['url'])) if(substr($stat['url'], -1) == '/' && !Vfs::is_dir($stat['url']))
{ {
$stat['url'] = substr($stat['url'],0,strlen($stat['url'])-1); $stat['url'] = substr($stat['url'], 0, strlen($stat['url']) - 1);
} }
// Make sure we get the correct path if sharing from a share // Make sure we get the correct path if sharing from a share
if(isset($GLOBALS['egw']->sharing) && array_key_exists(static::get_token(), $GLOBALS['egw']->sharing) && $exists) if(isset($GLOBALS['egw']->sharing) && array_key_exists(static::get_token(), $GLOBALS['egw']->sharing) && $exists
// Not for Collabora, it's working with share fstab and can't access full URL
&& $mode !== Wopi::WOPI_WRITABLE
)
{ {
$path = $stat['url']; $path = $stat['url'];
} }