holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert accidently commited "fix not used APi rights for mounted eTemplates in anonymous sessions"

Browse Source 
This reverts commit 7abec0a5d6.
This commit is contained in:
Ralf Becker 2021-04-07 10:09:39 +02:00
parent d82be8e985
commit 213fc4f8fa
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
webdav.php
View File

@ -16,13 +16,14 @@
* @package api * @package api
* @subpackage vfs * @subpackage vfs
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2006-21 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2006-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @version $Id$
*/ */
use EGroupware\Api; use EGroupware\Api;
use EGroupware\Api\Vfs; use EGroupware\Api\Vfs;
//$starttime = microtime(true); $starttime = microtime(true);
/** /**
* check if the given user has access * check if the given user has access
@ -45,33 +46,7 @@ $GLOBALS['egw_info'] = array(
'flags' => array( 'flags' => array(
'disable_Template_class' => True, 'disable_Template_class' => True,
'noheader' => True, 'noheader' => True,
'currentapp' => (static function($uri) 'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
{
if (preg_match('#/webdav.php/(etemplates|apps/([A-Za-z0-9_-]+)|home/'.
preg_quote($GLOBALS['egw_info']['user']['account_lid'], '#').'/.tmp)/#', $uri, $matches))
{
if (!empty($matches[2]))
{
$app = $matches[2];
}
// allow access to mounted eTemplates and temp file upload
else
{
return 'api';
}
}
else
{
$app = 'filemanager';
}
if (empty($GLOBALS['egw_info']['user']['apps'][$app]) &&
(!empty($GLOBALS['egw_info']['user']['apps'][$a='filemanager']) ||
!empty($GLOBALS['egw_info']['user']['apps'][$a='sitemgr-link'])))
{
$app = $a;
}
return $app;
})($_SERVER['REQUEST_URI']),
'autocreate_session_callback' => 'check_access', 'autocreate_session_callback' => 'check_access',
'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm) 'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup! 'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
@ -79,7 +54,31 @@ $GLOBALS['egw_info'] = array(
); );
// if you move this file somewhere else, you need to adapt the path to the header! // if you move this file somewhere else, you need to adapt the path to the header!
require_once __DIR__.'/header.inc.php'; try
{
include(dirname(__FILE__).'/header.inc.php');
}
catch (Api\Exception\NoPermission\App $e)
{
if (isset($GLOBALS['egw_info']['user']['apps']['filemanager']))
{
$GLOBALS['egw_info']['currentapp'] = 'filemanager';
}
elseif (isset($GLOBALS['egw_info']['user']['apps']['sitemgr-link']))
{
$GLOBALS['egw_info']['currentapp'] = 'sitemgr-link';
}
// allow access to mounted eTemplates, if there are no filemanager or sitemgr-link app rights
// and still allow for temp file upload.
elseif (preg_match("/\/webdav\.php\/etemplates\/|\/webdav.php\/home\/".$GLOBALS['egw_info']['user']['account_lid']."\/.tmp\//", $_SERVER['REQUEST_URI']))
{
$GLOBALS['egw_info']['currentapp'] = 'api';
}
else
{
throw $e;
}
}
//$headertime = microtime(true); //$headertime = microtime(true);
// webdav is stateless: we dont need to keep the session open, it only blocks other calls to same basic-auth session // webdav is stateless: we dont need to keep the session open, it only blocks other calls to same basic-auth session