Skip to content

Fix propagating changes within jail wrapper #5685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jul 12, 2017
Merged

Fix propagating changes within jail wrapper #5685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,18 +376,6 @@ public function getScanner($path = '', $storage = null) {
return new \OCA\Files_Sharing\Scanner($storage);
}

public function getPropagator($storage = null) {
if (isset($this->propagator)) {
return $this->propagator;
}

if (!$storage) {
$storage = $this;
}
$this->propagator = new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection());
return $this->propagator;
}

public function getOwner($path) {
return $this->superShare->getShareOwner();
}
Expand Down
28 changes: 14 additions & 14 deletions apps/files_sharing/lib/SharedPropagator.php → ...te/Files/Cache/Wrapper/JailPropagator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
*
* @author Robin Appelman <robin@icewind.nl>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @license GNU AGPL version 3 or any later version
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\Files_Sharing;
namespace OC\Files\Cache\Wrapper;


use OC\Files\Cache\Propagator;
use OC\Files\Storage\Wrapper\Jail;

class SharedPropagator extends Propagator {
class JailPropagator extends Propagator {
/**
* @var \OCA\Files_Sharing\SharedStorage
* @var Jail
*/
protected $storage;

Expand Down
13 changes: 13 additions & 0 deletions lib/private/Files/Storage/Wrapper/Jail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
namespace OC\Files\Storage\Wrapper;

use OC\Files\Cache\Wrapper\CacheJail;
use OC\Files\Cache\Wrapper\JailPropagator;
use OCP\Lock\ILockingProvider;

/**
Expand Down Expand Up @@ -488,4 +489,16 @@ public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
}
return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath));
}

public function getPropagator($storage = null) {
if (isset($this->propagator)) {
return $this->propagator;
}

if (!$storage) {
$storage = $this;
}
$this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection());
return $this->propagator;
}
}