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

Api: Fix fstab overlap when accessing a share while logged in

Browse Source
This commit is contained in:
nathangray 2020-09-10 11:11:23 -06:00
parent 3ee7574294
commit 372eadcff3
5 changed files with 314 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/Sharing.php
View File

@ -192,7 +192,7 @@ class Sharing
if (empty($token) || !($share = self::$db->select(self::TABLE, '*', array(
'share_token' => $token,
'(share_expires IS NULL OR share_expires > '.self::$db->quote(time(), 'date').')',
), __LINE__, __FILE__)->fetch()) ||
), __LINE__, __FILE__,false,'',Db::API_APPNAME)->fetch()) ||
!$GLOBALS['egw']->accounts->exists($share['share_owner']))
{
sleep(1);
@ -485,7 +485,7 @@ class Sharing
}
/**
* Server a request on a share specified in REQUEST_URI
* Serve a request on a share specified in REQUEST_URI
*/
public function ServeRequest()
{
@ -587,7 +587,7 @@ class Sharing
if (empty($name)) $name = $path;
$table_def = static::$db->get_table_definitions(false,static::TABLE);
$table_def = static::$db->get_table_definitions(Db::API_APPNAME,static::TABLE);
$extra = array_intersect_key($extra, $table_def['fd']);
// Check if path is mounted somewhere that needs a password
@ -600,7 +600,7 @@ class Sharing
'share_expires' => null,
'share_passwd' => null,
'share_writable'=> false,
), __LINE__, __FILE__)->fetch()))
), __LINE__, __FILE__, Db::API_APPNAME)->fetch()))
{
// if yes, just add additional recipients
$share['share_with'] = $share['share_with'] ? explode(',', $share['share_with']) : array();
@ -620,7 +620,7 @@ class Sharing
'share_with' => $share['share_with'],
), array(
'share_id' => $share['share_id'],
), __LINE__, __FILE__);
), __LINE__, __FILE__, Db::API_APPNAME);
}
}
else
@ -635,7 +635,7 @@ class Sharing
'share_owner' => Vfs::$user,
'share_with' => implode(',', (array)$recipients),
'share_created' => time(),
)+$extra, false, __LINE__, __FILE__);
)+$extra, false, __LINE__, __FILE__, Db::API_APPNAME);
$share['share_id'] = static::$db->get_last_insert_id(static::TABLE, 'share_id');
break;
@ -744,7 +744,7 @@ class Sharing
if (is_scalar($keys)) $keys = array('share_id' => $keys);
// delete specified shares
self::$db->delete(self::TABLE, $keys, __LINE__, __FILE__);
self::$db->delete(self::TABLE, $keys, __LINE__, __FILE__, Db::API_APPNAME);
$deleted = self::$db->affected_rows();
return $deleted;

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

@ -139,7 +139,12 @@ class Sharing extends \EGroupware\Api\Sharing
// mounting share
Vfs::$is_root = true;
$clear_fstab = !$GLOBALS['egw_info']['user']['account_lid'] || $GLOBALS['egw_info']['user']['account_lid'] == 'anonymous';
$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))
{
sleep(1);

253
api/tests/Vfs/SharingACLTest.php Normal file
View File

@ -0,0 +1,253 @@
<?php
/**
* Tests for sharing files and directories
*
* We check the access and permissions, making sure we only have access to what is supposed to be there.
*
* @link http://www.egroupware.org
* @author Nathan Gray
* @copyright (c) 2020 Nathan Gray
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
*/
namespace EGroupware\Api\Vfs;
require_once __DIR__ . '/SharingBase.php';
require_once __DIR__ . '/../../../admin/inc/class.admin_cmd_delete_account.inc.php';
require_once __DIR__ . '/../../../admin/inc/class.admin_cmd_edit_user.inc.php';
use EGroupware\Api\LoggedInTest as LoggedInTest;
use EGroupware\Api\Vfs;
class SharingACLTest extends SharingBase
{
// User for testing - we share with this user & log in as them for checking
protected $account_id;
// File that should not be available over the share
protected $no_access;
// Use a completely new user, so we know it's there and "clean"
protected $account = array(
'account_lid' => 'user_test',
'account_firstname' => 'ShareAccess',
'account_lastname' => 'Test',
'account_passwd' => 'passw0rd',
'account_passwd_2' => 'passw0rd'
);
protected function setUp() : void
{
if(($account_id = $GLOBALS['egw']->accounts->name2id($this->account['account_lid'])))
{
// Delete if there in case something went wrong
$GLOBALS['egw']->accounts->delete($account_id);
}
// Execute
$command = new \admin_cmd_edit_user(false, $this->account);
$command->comment = 'Needed for unit test ' . $this->getName();
$command->run();
$this->account_id = $command->account;
}
protected function tearDown() : void
{
parent::tearDown();
if($this->account_id)
{
$GLOBALS['egw']->accounts->delete($this->account_id);
}
}
public function setupShare(&$dir)
{
// First, create the files to be shared
$this->files[] = $dir = Vfs::get_home_dir() . '/share/';
Vfs::mkdir($dir);
$this->files = $this->addFiles($dir);
// Also create one that should not be accessed
$this->files[] = $this->no_access = Vfs::get_home_dir() . '/not_shared_file.txt';
$this->assertTrue(
file_put_contents(Vfs::PREFIX . $this->no_access, "This file is not shared") !== FALSE,
'Unable to write test file "' . Vfs::PREFIX . $this->no_access . '" - check file permissions for CLI user'
);
// Create and use link
$extra = array();
$this->getShareExtra($dir, Sharing::READONLY, $extra);
$share = $this->createShare($dir, Sharing::READONLY, $extra);
$link = Vfs\Sharing::share2link($share);
// Now log out and log in as someone else
Vfs::clearstatcache();
Vfs::init_static();
Vfs\StreamWrapper::init_static();
LoggedInTest::tearDownAfterClass();
return $link;
}
/**
* Test that a share of a directory only gives access to that directory, and any other
* directories that the sharer has are unavailable
*
* This checks an existing user that is logged in when they follow the share link.
*
* ** CURRENTLY we make a new session anyway, so no changes should be visible on VFS **
*/
public function testShareKeepSession()
{
$dir = '';
$link = $this->setupShare($dir);
LoggedInTest::load_egw($this->account['account_lid'],$this->account['account_passwd']);
Vfs::init_static();
Vfs\StreamWrapper::init_static();
// Check that we can't access the no_access file
$this->assertFalse(Vfs::is_readable($this->no_access), "Could access the not-readable file even before we started.");
// What's our VFS like?
$pre_fstab = Vfs::mount();
$vfs_options = array(
'maxdepth' => 3,
// Exclude a lot of the stuff we're not interested in
'path_preg' => '#^' . Vfs::PREFIX . '\/(?!apps|templates|etemplates|apps-backup).*#'
);
//$pre_files = Vfs::find('/', $vfs_options);
$data = array();
$form = $this->getShare($link, $data, true);
$this->assertNotNull($form, "Could not read the share link");
$rows = $data->data->content->nm->rows;
$post_mount_vfs = Vfs::mount();
//$post_files = Vfs::find('/', $vfs_options);
// Check that our fstab was not changed
$this->assertEquals(count($pre_fstab), count($post_mount_vfs), "fstab mounts changed");
// Check we can't find the non-shared file in VFS
$this->assertFalse(Vfs::is_readable($this->no_access),
"Could access the not-readable file '$this->no_access' after accessing the share."
);
// Check we can't find the non-shared file in results
$result = array_filter($rows, function($v) {
return $v->name == $this->no_access;
});
$this->assertEmpty($result, "Found the file we shouldn't have access to ({$this->no_access})");
// Check that we can find the shared file(s) in the form / nm list
// Don't test the no-access one (done above), and no good way to get the sub-dir file either,
// since nm only has top-level files and we can't switch the filter
$this->checkNextmatch($dir, array_diff($this->files, [$this->no_access, $dir."sub_dir/subdir_test_file.txt"]), $rows);
}
/**
* Test that a share of a directory only gives access to that directory, and any other
* directories that the sharer has are unavailable
*
* This checks from one logged in user to anonymous with a new session
*/
public function testShareNewSession()
{
$dir = '';
$link = $this->setupShare($dir);
// Now follow the link - this _should_ be enough to get it added
//$mimetype = Vfs::mime_content_type($dir);
//$this->checkSharedFile($link, $mimetype);
// Read the etemplate
$data = array();
$form = $this->getShare($link, $data, false);
$this->assertNotNull($form, "Could not read the share link");
$rows = $data->data->content->nm->rows;
Vfs::clearstatcache();
Vfs::init_static();
Vfs\StreamWrapper::init_static();
// Check we can't find the non-shared file
$result = array_filter($rows, function($v) {
return $v->name == $this->no_access;
});
$this->assertEmpty($result, "Found the file we shouldn't have access to ({$this->no_access})");
// Check that we can find the shared file(s) in the form / nm list
// Don't test the no-access one (done above), and no good way to get the sub-dir file either,
// since nm only has top-level files and we can't switch the filter
$this->checkNextmatch($dir, array_diff($this->files, [$this->no_access, $dir."sub_dir/subdir_test_file.txt"]), $rows);
}
/**
* Check the nextmatch rows to see if all the expected files (in the given directory) are present
*
* @param $dir Current working directory, share target
* @param $check_files List of files that should be there
* @param $rows Nextmatch rows
*/
protected function checkNextmatch($dir, $check_files, $rows)
{
foreach($check_files as $file)
{
$relative_file = str_replace($dir,'',$file);
if($relative_file[strlen($relative_file)-1] == '/')
{
$relative_file = substr($relative_file, 0, -1);
}
$result = array_filter($rows, function($v) use ($relative_file) {
return $v->name == $relative_file;
});
$this->assertNotEmpty($result, "Couldn't find shared file '$file'");
}
}
/**
* Test that a share of a single file gives the file (uses WebDAV)
*/
public function testSingleFile()
{
$dir = Vfs::get_home_dir().'/';
// Plain text file
$file = $dir.'test_file.txt';
$content = 'Testing that sharing a single (non-editable) file gives us the file.';
$this->assertTrue(
file_put_contents(Vfs::PREFIX.$file, $content) !== FALSE,
'Unable to write test file "' . Vfs::PREFIX . $file .'" - check file permissions for CLI user'
);
$this->files[] = $file;
$mimetype = Vfs::mime_content_type($file);
// Create and use link
$extra = array();
$this->getShareExtra($file, Sharing::READONLY, $extra);
$share = $this->createShare($file, Sharing::READONLY, $extra);
$link = Vfs\Sharing::share2link($share);
// Re-init, since they look at user, fstab, etc.
// Also, further tests that access the filesystem fail if we don't
Vfs::clearstatcache();
Vfs::init_static();
Vfs\StreamWrapper::init_static();
// Log out & clear cache
LoggedInTest::tearDownAfterClass();
$this->checkSharedFile($link, $mimetype);
}
}

39
api/tests/Vfs/SharingTest.php → api/tests/Vfs/SharingBackendTest.php
View File

@ -23,7 +23,7 @@ use EGroupware\Api\LoggedInTest as LoggedInTest;
use EGroupware\Api\Vfs;
class SharingTest extends SharingBase
class SharingBackendTest extends SharingBase
{
/**
* Test to make sure a readonly link to home gives just readonly access,
@ -283,41 +283,4 @@ class SharingTest extends SharingBase
$this->assertEquals(Vfs::PREFIX . $target_file, $created_share['share_path']);
}
/**
* Test that a share of a single file gives the file (uses WebDAV)
*/
public function testSingleFile()
{
$dir = Vfs::get_home_dir().'/';
// Plain text file
$file = $dir.'test_file.txt';
$content = 'Testing that sharing a single (non-editable) file gives us the file.';
$this->assertTrue(
file_put_contents(Vfs::PREFIX.$file, $content) !== FALSE,
'Unable to write test file "' . Vfs::PREFIX . $file .'" - check file permissions for CLI user'
);
$this->files[] = $file;
$mimetype = Vfs::mime_content_type($file);
// Create and use link
$extra = array();
$this->getShareExtra($file, Sharing::READONLY, $extra);
$share = $this->createShare($file, Sharing::READONLY, $extra);
$link = Vfs\Sharing::share2link($share);
// Re-init, since they look at user, fstab, etc.
// Also, further tests that access the filesystem fail if we don't
Vfs::clearstatcache();
Vfs::init_static();
Vfs\StreamWrapper::init_static();
// Log out & clear cache
LoggedInTest::tearDownAfterClass();
$this->checkSharedFile($link, $mimetype);
}
}

47
api/tests/Vfs/SharingBase.php
View File

@ -610,6 +610,53 @@ class SharingBase extends LoggedInTest
$this->assertStringContainsString($mimetype, $indexed_headers['Content-Type'], 'Wrong file type');
}
/**
* Ask the server for the given share link. Returns the response.
*
* @param $link
* @param $data Data passed to the etemplate
* @param $keep_session = true Keep the current session, or access with new session as anonymous
*/
public function getShare($link, &$data, $keep_session = true)
{
// Set up curl
$curl = curl_init($link);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
if($keep_session)
{
curl_setopt($curl, CURLOPT_COOKIE, "XDEBUG_SESSION=PHPSTORM;".Api\Session::EGW_SESSION_NAME."={$GLOBALS['egw']->session->sessionid};kp3={$GLOBALS['egw']->session->kp3}");
}
$html = curl_exec($curl);
curl_close($curl);
if(!$html)
{
// No response - could mean something is terribly wrong, or it could
// mean we're running on Travis with no webserver to answer the
// request
return;
}
// Parse & check for nextmatch
$dom = new \DOMDocument();
@$dom->loadHTML($html);
$xpath = new \DOMXPath($dom);
$form = $xpath->query ('//form')->item(0);
if(!$form && static::LOG_LEVEL)
{
echo "Didn't find editor\n";
if(static::LOG_LEVEL > 1)
{
echo "Got this instead:\n".($form?$form:$html)."\n\n";
}
}
$this->assertNotNull($form, "Didn't find template in response");
$data = json_decode($form->getAttribute('data-etemplate'));
return $form;
}
protected function setup_info()
{
// Copied from share.php