extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

use sharing stream-wrapper to avoid destroying a user session (only commented out currently)

Browse Source
This commit is contained in:
Ralf Becker 2020-09-19 13:50:54 +02:00
parent 20c5dde04c
commit 60ae7f2b76
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,7 @@ class Sharing extends \EGroupware\Api\Sharing
$GLOBALS['egw_info']['server']['vfs_fstab'] = Vfs::mount();
Vfs::clearstatcache();
}
/*
$share['resolve_url'] = Vfs::resolve_url($share['share_path'], true, true, true, true); // true = fix evtl. contained url parameter
// if share not writable append ro=1 to mount url to make it readonly
if (!($share['share_writable'] & 1))
@ -105,8 +106,9 @@ class Sharing extends \EGroupware\Api\Sharing
$share['resolve_url'] .= (strpos($share['resolve_url'], '?') ? '&' : '?').'ro=1';
}
//_debug_array($share);
*/
$share['share_root'] = '/'.Vfs::basename($share['share_path']);
/*
if ($keep_session) // add share to existing session
{
// if current user is not the share owner, we cant just mount share
@ -115,6 +117,7 @@ class Sharing extends \EGroupware\Api\Sharing
$keep_session = false;
}
}
*/
if (!$keep_session) // do NOT change to else, as we might have set $keep_session=false!
{
// only allow filemanager app & collabora
@ -125,7 +128,7 @@ class Sharing extends \EGroupware\Api\Sharing
'filemanager' => $GLOBALS['egw_info']['apps']['filemanager'] || true,
'collabora' => $GLOBALS['egw_info']['apps']['collabora'] || $apps['collabora']
);
/*
Vfs::$user = $share['share_owner'];
// Need to re-init stream wrapper, as some of them look at
@ -134,18 +137,20 @@ class Sharing extends \EGroupware\Api\Sharing
if($scheme && method_exists($scheme, 'init_static'))
{
$scheme::init_static();
}
}*/
}
// mounting share
Vfs::$is_root = true;
$clear_fstab = !$keep_session && (!$GLOBALS['egw_info']['user']['account_lid'] || $GLOBALS['egw_info']['user']['account_lid'] == 'anonymous');
/*
// if current user is not the share owner, we cant just mount share into existing VFS
if ($GLOBALS['egw_info']['user']['account_id'] != $share['share_owner'])
{
$clear_fstab = true;
}
if (!Vfs::mount($share['resolve_url'], $share['share_root'], false, false, $clear_fstab))
*/
if (!Vfs::mount(Vfs\Sharing\StreamWrapper::share2url($share), $share['share_root'], false, false, $clear_fstab))
{
sleep(1);
return static::share_fail(
@ -167,9 +172,11 @@ class Sharing extends \EGroupware\Api\Sharing
Vfs::$is_root = false;
/*
Vfs::clearstatcache();
// clear link-cache and load link registry without permission check to access /apps
Api\Link::init_static(true);
*/
}
/**

24
api/src/Vfs/Sharing/StreamWrapper.php
View File

@ -45,12 +45,7 @@ class StreamWrapper extends Vfs\StreamWrapper
Api\Sharing::check_token(false, $share, $hash, $parts['pass'] ?? '');
if (empty($share['share_owner']) || !($account_lid = Api\Accounts::id2name($share['share_owner'])))
{
throw new Api\Exception\NotFound('Share owner not found', 404);
}
return Vfs::concat('vfs://'.$account_lid.'@default'.Vfs::parse_url($share['share_path'], PHP_URL_PATH), $rel_path).
($share['share_writable'] & 1 ? '' : '?ro=1');
return self::share2url($share);
}
catch (Api\Exception $e) {
_egw_log_exception($e);
@ -58,6 +53,23 @@ class StreamWrapper extends Vfs\StreamWrapper
}
}
/**
* Generate sharing URL from share
*
* @param array $share as returned eg. by Api\Sharing::check_token()
* @return string
* @throws Api\Exception\NotFound if sharee was not found
*/
static function share2url(array $share)
{
if (empty($share['share_owner']) || !($account_lid = Api\Accounts::id2name($share['share_owner'])))
{
throw new Api\Exception\NotFound('Share owner not found', 404);
}
return Vfs::concat('vfs://'.$account_lid.'@default'.Vfs::parse_url($share['share_path'], PHP_URL_PATH), $rel_path).
($share['share_writable'] & 1 ? '' : '?ro=1');
}
/**
* Resolve the given path according to our fstab
*