open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

load system wide configured mount points before accessing shared files

Browse Source
remotes/origin/stable5
Björn Schießle 12 years ago
parent 00ed2e87c9
commit 2499c24b8b
2 changed files with 57 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 101
      lib/filesystem.php
  2. 4
      lib/util.php

101
lib/filesystem.php
Unescape View File

@ -187,7 +187,8 @@ class OC_Filesystem{
$user = ltrim(substr($path, 0, strpos($path, '/', 1)), '/'); $user = ltrim(substr($path, 0, strpos($path, '/', 1)), '/');
// check mount points if file was shared from a different user // check mount points if file was shared from a different user
if ($user != OC_User::getUser()) { if ($user != OC_User::getUser()) {
OC_Util::loadMountPoints($user); OC_Util::loadUserMountPoints($user);
self::loadSystemMountPoints($user);
} }
$mountpoint=self::getMountPoint($path); $mountpoint=self::getMountPoint($path);
@ -200,6 +201,52 @@ class OC_Filesystem{
} }
} }
static private function loadSystemMountPoints($user) {
if(is_file(OC::$SERVERROOT.'/config/mount.php')) {
$mountConfig=include(OC::$SERVERROOT.'/config/mount.php');
if(isset($mountConfig['global'])) {
foreach($mountConfig['global'] as $mountPoint=>$options) {
self::mount($options['class'],$options['options'],$mountPoint);
}
}
if(isset($mountConfig['group'])) {
foreach($mountConfig['group'] as $group=>$mounts) {
if(OC_Group::inGroup($user,$group)) {
foreach($mounts as $mountPoint=>$options) {
$mountPoint=self::($mountPoint, $user);
foreach($options as &$option) {
$option=self::setUserVars($option, $user);
}
self::mount($options['class'],$options['options'],$mountPoint);
}
}
}
}
if(isset($mountConfig['user'])) {
foreach($mountConfig['user'] as $user=>$mounts) {
if($user==='all' or strtolower($user)===strtolower($user)) {
foreach($mounts as $mountPoint=>$options) {
$mountPoint=self::setUserVars($mountPoint, $user);
foreach($options as &$option) {
$option=self::setUserVars($option, $user);
}
self::mount($options['class'],$options['options'],$mountPoint);
}
}
}
}
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
$previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0);
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
OC_FileCache::triggerUpdate();
OC_Appconfig::setValue('files','mountconfigmtime',$mtime);
}
}
}
static public function init($root) { static public function init($root) {
if(self::$defaultInstance) { if(self::$defaultInstance) {
return false; return false;
@ -207,49 +254,7 @@ class OC_Filesystem{
self::$defaultInstance=new OC_FilesystemView($root); self::$defaultInstance=new OC_FilesystemView($root);
//load custom mount config //load custom mount config
if(is_file(OC::$SERVERROOT.'/config/mount.php')) { self::loadSystemMountPoints(OC_User::getUser());
$mountConfig=include(OC::$SERVERROOT.'/config/mount.php');
if(isset($mountConfig['global'])) {
foreach($mountConfig['global'] as $mountPoint=>$options) {
self::mount($options['class'],$options['options'],$mountPoint);
}
}
if(isset($mountConfig['group'])) {
foreach($mountConfig['group'] as $group=>$mounts) {
if(OC_Group::inGroup(OC_User::getUser(),$group)) {
foreach($mounts as $mountPoint=>$options) {
$mountPoint=self::setUserVars($mountPoint);
foreach($options as &$option) {
$option=self::setUserVars($option);
}
self::mount($options['class'],$options['options'],$mountPoint);
}
}
}
}
if(isset($mountConfig['user'])) {
foreach($mountConfig['user'] as $user=>$mounts) {
if($user==='all' or strtolower($user)===strtolower(OC_User::getUser())) {
foreach($mounts as $mountPoint=>$options) {
$mountPoint=self::setUserVars($mountPoint);
foreach($options as &$option) {
$option=self::setUserVars($option);
}
self::mount($options['class'],$options['options'],$mountPoint);
}
}
}
}
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
$previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0);
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
OC_FileCache::triggerUpdate();
OC_Appconfig::setValue('files','mountconfigmtime',$mtime);
}
}
self::$loaded=true; self::$loaded=true;
} }
@ -259,8 +264,12 @@ class OC_Filesystem{
* @param string intput * @param string intput
* @return string * @return string
*/ */
private static function setUserVars($input) { private static function setUserVars($input, $user) {
return str_replace('$user',OC_User::getUser(),$input); if (isset($user)) {
return str_replace('$user', $user,$input);
} else {
return str_replace('$user',OC_User::getUser(),$input);
}
} }
/** /**

4
lib/util.php
Unescape View File

@ -53,7 +53,7 @@ class OC_Util {
OC_FileProxy::register($quotaProxy); OC_FileProxy::register($quotaProxy);
OC_FileProxy::register($fileOperationProxy); OC_FileProxy::register($fileOperationProxy);
// Load personal mount config // Load personal mount config
self::loadMountPoints($user); self::loadUserMountPoints($user);
OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir)); OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir));
} }
} }
@ -63,7 +63,7 @@ class OC_Util {
self::$fsSetup=false; self::$fsSetup=false;
} }
public static function loadMountPoints($user) { public static function loadUserMountPoints($user) {
$user_dir = '/'.$user.'/files'; $user_dir = '/'.$user.'/files';
$user_root = OC_User::getHome($user); $user_root = OC_User::getHome($user);
$userdirectory = $user_root . '/files'; $userdirectory = $user_root . '/files';

Write Preview
Loading…
Cancel
Save