mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
58,683 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

56 Commits

Author SHA1 Message Date
Lukas Reschke 4b4971ab52
Merge pull request #24966 from nextcloud/jknockaert-patch-1 
avoid fread on directories and unencrypted files
 2021-04-06 13:45:10 +02:00
Robin Appelman e5dc1a8085
Set umask before operations that create local files 
this solves issues where "other php stuff" is messing with the umask

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 14:52:31 +01:00
dependabot-preview[bot] eb502c02ff
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0 
Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/nextcloud/coding-standard/releases)
- [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/coding-standard/compare/v0.3.0...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-02-18 13:31:24 +01:00
Joas Schilling 645f83121e
Cache the user backend info for 300s 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-02-15 10:36:08 +01:00
Jasper Knockaert 261966ace5
Update EncryptionTest.php 2021-01-05 21:45:50 +01:00
Jasper Knockaert 664e74a82e
2nd attempt to fix tests 2021-01-05 20:41:02 +01:00
Jasper Knockaert 87c640193b
attemtp to fix test 2021-01-05 19:09:16 +01:00
Morris Jobke e6fca0a519
Fix code style 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-09-09 17:36:58 +02:00
Julius Härtl 74747163d6
Make sure tests cover the new mkdir behaviour on 0 quota 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-09-08 11:35:32 +02:00
Morris Jobke 234b510652
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-12 13:55:19 +02:00
Robin Appelman 4e6d3d1880
Fix getDirectoryContent implementation for Jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-30 15:27:09 +02:00
Christoph Wurst 28f8eb5dba
Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
Christoph Wurst 1584c9ae9c
Add visibility to all methods and position of static keyword 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:51:06 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst afbd9c4e6e
Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst b80ebc9674
Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Christoph Wurst 2ee65f177e
Use the shorter phpunit syntax for mocked return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:21:27 +01:00
Christoph Wurst cc80339b39
Add typed create user events 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-03 08:03:57 +01:00
Roeland Jago Douma 3a7cf40aaa
Mode to modern phpunit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:18 +01:00
Roeland Jago Douma ef4b59d341
More fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma c007ca624f
Make phpunit8 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma 68748d4f85
Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Roeland Jago Douma cc6874df19
Merge pull request #17264 from nextcloud/move-from-storage-wrappers 
handle moveFromStorage within the same storage even when storage wrap…
 2019-09-26 15:48:59 +02:00
Robin Appelman 35f317df7b
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage 
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 19:17:06 +02:00
Arthur Schiwon 4bd83c9a28
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-26 13:47:35 +02:00
Julius Härtl 67dd4b018a
Check for free space on touch 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-05-28 13:06:59 +02:00
Julius Härtl 6ee7286b41
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-01 20:57:01 +01:00
Robin Appelman 9b3cc72f7c
fix writeStream for jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-31 21:10:57 +01:00
Christoph Wurst 3f2cd13beb
Remove HHVM check 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 10:12:15 +02:00
Roeland Jago Douma 0ff83f7230
Do not allow folder creation with quota of 0 
Fixes #4577

Users with a quota of 0 are a special case. Since they can't (ever)
create files on their own storage. Therefor it makes no real that they
can create folders (and possible share those etc).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 11:31:23 +02:00
Roeland Jago Douma 73e6eea57e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:50:54 +02:00
Bjoern Schiessle a0923d9ffb
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-03 18:01:23 +02:00
Joas Schilling bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
Joas Schilling 870023365c
Fix "Undefined method setExpectedException()" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 18:10:16 +01:00
Morris Jobke c733cdaa65
Use ::class in test mocks of encryption app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 13:56:56 +02:00
Morris Jobke 43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Roeland Jago Douma 8b0051eb40
Fix encryption test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:08 +02:00
Robin Appelman 03f27b4c2c
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:29:04 +02:00
Bjoern Schiessle b43f6d295e
update file system tests to take the master key into account 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:12 +02:00
Robin Appelman 1f1e1b0d00
use unmasked permissions during scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-18 16:38:54 +02:00
Joas Schilling ec2f2b75be
Make sure we use a new encryption module all the time 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:48:14 +02:00
Joas Schilling 30817fa319
Simplify the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 13:23:55 +02:00
Piotr M dc78f1251e
Optimize put - Dont try to fetch filecache for not existing filecache in encription 2017-04-12 12:54:20 +02:00
Robin Appelman a7c611039d
Dont use the permissions mask while scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 15:19:21 +02:00
Vincent Petry 4744dce4df
Nuke the legacy storage fallback from orbit 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-23 12:49:46 +01:00
Morris Jobke 1253d1008a Merge pull request #2411 from nextcloud/fix-encryption-home-storage 
check if the file should really be encrypted before we update the file cache
 2016-12-05 15:38:12 +01:00
Robin Appelman 1a379b0fdc
update test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 18:04:21 +01:00
Bjoern Schiessle 0f8fe77b3a
check if the file should really be encrypted before we update the file cache 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-29 20:34:45 +01:00
Roeland Jago Douma f722640a32
Proper DI of config 
* Fixed comments

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 10:13:35 +02:00
Roeland Jago Douma d277053f22
Fix getMock QuotaTest 2016-09-13 09:09:52 +02:00