Add Jail and PermissionsMask storage wrappers #12426
Conversation
| /** | ||
| * find a folder in the cache which has not been fully scanned | ||
| * | ||
| * If multiply incomplete folders are in the cache, the one with the highest id will be returned, |
There was a problem hiding this comment.
"multiple" (I've seen this typo before in other classes 😄)
|
@icewind1991 same failing unit test as in #12420 (comment) - possible fix: 5d4b7e0 - THX |
|
@icewind1991 Fix is in master. Maybe rebase ;) |
icewind1991
force-pushed
the
jail-mask-wrappers
branch
2 times, most recently
from
3fa9389 to
bf838cb
Compare
| } | ||
|
|
||
| public function isUpdatable($path) { | ||
| return $this->checkMask(\OCP\PERMISSION_UPDATE) and parent::isUpdatable($path); |
There was a problem hiding this comment.
deprecated as of #12421 please use \OCP\Constants::PERMISSION_* instead
icewind1991
force-pushed
the
jail-mask-wrappers
branch
from
bf838cb to
0446fb0
Compare
|
Updated the permissions constants |
| public function setUp() { | ||
| $this->sourceStorage = new \OC\Files\Storage\Temporary(array()); | ||
| $this->instance = $this->getMaskedStorage(Constants::PERMISSION_ALL); | ||
| } |
There was a problem hiding this comment.
please call parent setUp() and tearDown() !
icewind1991
force-pushed
the
jail-mask-wrappers
branch
from
0446fb0 to
7605cd6
Compare
|
@owncloud-bot retest this please |
|
🚀 Test PASSed. 🚀 |
|
@nickvergessen @DeepDiver1975 @MorrisJobke can this be merged? |
| /** | ||
| * Mask the permissions of a storage | ||
| * | ||
| * Note that the read permissions cant be masked |
There was a problem hiding this comment.
Can you explain the masking a little bit more ?
|
Please add a better explanation for the PermissionsMask, then it will be good to go from my point of view 👍 |
|
Will run tests on windows in a bit |
|
No new failing tests on windows |
icewind1991
force-pushed
the
jail-mask-wrappers
branch
from
7605cd6 to
33b6486
Compare
|
A new inspection was created. |
|
Extended phpdocs |
|
💣 Test FAILed. 💣 Build result: FAILURE[...truncated 18 lines...] > git rev-parse origin/pr/12426/merge^{commit} # timeout=10Checking out Revision f8ef5c812777fcd34621cd40aad7bbbb81ad6b99 (detached) > git config core.sparsecheckout # timeout=10 > git checkout -f f8ef5c812777fcd34621cd40aad7bbbb81ad6b99 > git rev-list bf383df9f1e066833f6db9761c0c32d7ea853fde # timeout=10First time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveCleaning workspace > git rev-parse --verify HEAD # timeout=10Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10Triggering pull-request-analyser-ng-simple » vm-slave-02pull-request-analyser-ng-simple » vm-slave-02 completed with result FAILUREStarted calculate disk usage of buildFinished Calculation of disk usage of build in 0 secondsStarted calculate disk usage of workspaceFinished Calculation of disk usage of workspace in 7 second💣 Test FAILed. 💣 |
|
Jenkins messing up again, only did doc changes since last success -> merging |
Add Jail and PermissionsMask storage wrappers
Extracted from #12086
Moved to a separate PR to reduce the size of the indivual PR and makes them easier to review/merge and because @PVince81's metadata work could use the cache wrapper stuff introduced here.
cc @PVince81 @DeepDiver1975