upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
59544 commits 884 branches 1195 tags 8.3 GiB
Commit graph

904 commits

Author SHA1 Message Date
Robin Appelman
ed2d02d5f1
better cleanup of user files on user deletion 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-04-27 20:29:51 +02:00
Robin Appelman
effb7dc8ba
set mimetype for objects uploaded to object storages 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-04-21 15:25:58 +02:00
Robin Appelman
0d5f4edc22
adjust tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-04-21 14:09:07 +02:00
Robin Appelman
e8221303e9
use search query for Folder::getRecent 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-04-21 13:56:04 +02:00
Julius Härtl
8398762d78
Fail when creating new files with an empty path 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-04-20 11:20:20 +02:00
Maxime Besson
547438527d fix(proxy): reaching s3 storage behind some http proxy 
Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
 2021-04-09 10:15:57 +02:00
Samuel
03fe74b95e fix(proxy): reaching s3 storage behind some http proxy 
Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
 2021-04-09 10:15:57 +02:00
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
J0WI
0c9b8ad051 Return early if path is root 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-04-05 17:19:34 +02:00
Julius Härtl
6fd571461c
Properly handle creating the template directory in a subfolder (fixes #25787) 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-04-01 13:48:21 +02:00
Julius Härtl
37591f05dc
Get the parent directory before creating a file from a template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-04-01 13:48:21 +02:00
Roeland Jago Douma
f3738eeff7
Merge pull request #25280 from nextcloud/explicit-file-permissions 
Set umask before operations that create local files
 2021-03-30 21:55:50 +02:00
Roeland Jago Douma
7c30d1aa2d
Merge pull request #26219 from nextcloud/relative-path-null 
getRelativePath can return null
 2021-03-30 21:10:05 +02:00
Robin Appelman
c8736e7a23
fix return value of Root::get 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-26 21:29:24 +01:00
Morris Jobke
81fef4ddee
Log when a storage is marked as unavailable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-03-25 16:19:08 +01:00
Robin Appelman
aee4caed07
show better error messages when a file with a forbidden path is encountered 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-24 17:13:09 +01:00
Robin Appelman
8a92229485
getStorage can also return null 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-24 14:56:40 +01:00
Robin Appelman
f842608c95
getRelativePath can return null 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-24 14:30:29 +01:00
John Molakvoæ (skjnldsv)
2074d87d0c
Catch invalid cache source storage path 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-03-24 10:36:51 +01: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
Robin Appelman
bfe3712372
handle ordering in folder search 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-19 16:07:54 +01:00
Robin Appelman
feed42dd6d
folder filtering in sql 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-19 13:41:00 +01:00
Robin Appelman
de713967c0
cleanup fileinfo creation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-19 13:35:37 +01:00
Robin Appelman
a428f7d1e0
format 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-18 17:44:30 +01:00
Robin Appelman
bd229e7548
handle limit and offset in folder file search 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-18 17:38:31 +01:00
Robin Appelman
50e374c12f
only require user to be set in a query that handles tags 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-18 17:16:28 +01:00
Robin Appelman
f8bca545df
unify handling of Folder::search methods into "new" query objects 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-18 16:35:41 +01:00
Robin Appelman
f1e2fb426e
Merge pull request #26013 from nextcloud/object-store-copy-cache-id 
Return the fileid from `copyFromCache` and use it instead of doing an extra query
 2021-03-16 16:11:17 +00:00
Vincent Petry
e559afb8d4
Merge pull request #25136 from nextcloud/cachejail-search-filter 
do cachejail search filtering in sql
 2021-03-15 17:45:30 +01:00
Morris Jobke
f512705f8f
Merge pull request #26003 from nextcloud/enh/simplefile/getid 
Add getID function to the simplefile implementation
 2021-03-15 14:41:15 +01:00
Robin Appelman
d7748e2b4d
verify that cache entry is valid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-12 17:23:02 +01:00
Robin Appelman
c2fc3195dd
also implement for FailedCache and NullCache 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-12 17:22:43 +01:00
Robin Appelman
ad636ae12d
use returned file id for object store copy 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-12 17:22:40 +01:00
Robin Appelman
d2bcb57a54
add ICopyFromCache trait to expose existing implementation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-12 17:22:36 +01:00
Robin Appelman
32551b9ff7
Merge pull request #25722 from nextcloud/objectstore-copy-cross 
apply object store copy optimization when 'cross storage' copy is wit…
 2021-03-12 16:10:18 +00:00
Robin Appelman
3eb764e65d
remove explicit fclose from S3->writeStream 
streams get closed automatically when dropped, and in some cases the stream seems to be already closed by the S3 library, in which case trying to close it again will raise an error

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-11 18:05:04 +01:00
Robin Appelman
f98fed3f8a
reuse usermanager instance when processing search results 
saves some time when processing large search results

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-10 19:35:13 +01:00
Robin Appelman
c87b1a50d9 apply object store copy optimization when 'cross storage' copy is within the same object store 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-09 20:31:27 +01:00
Roeland Jago Douma
618805b14f Fix RedundantPropertyInitializationCheck 
For #25839

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-09 09:49:45 +01:00
Roeland Jago Douma
cc2beee872 Add getID function to the simplefile implementation 
Sometimes it is useful to get the actual fileid

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-08 14:59:36 +01:00
Roeland Jago Douma
e6ef096e52
Merge pull request #25659 from nextcloud/smb-getmetadata-catch 
catch notfound and forbidden exception in smb::getmetadata
 2021-03-05 08:49:23 +01:00
Robin Appelman
b844293536 catch notfound and forbidden exception in smb::getmetadata 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-04 21:34:54 +01:00
Roeland Jago Douma
c3f1eb4f7f Remove Redundantcasts 
For #25839

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-04 14:44:04 +01:00
Julius Härtl
19eb48b8a3
Properly end iterating over the file once the target has been reached 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-02-26 11:29:01 +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
Robin Appelman
0363af3790
move AbstractCacheEvent into OCP 
otherwise we have concrete cache events in OCP extending non OCP classes

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-02-15 19:12:30 +01:00
Christoph Wurst
aabd73912e
Type the service registration 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-02-10 09:44:24 +01:00
Roeland Jago Douma
137636b651
Merge pull request #24700 from Imajie/s3-creds 
Resolves #24699, Support ES2 and ECS instance providers for S3 buckets
 2021-02-02 21:48:22 +01:00
Julius Härtl
18e2e86b95
Avoid template creators being registered multiple times 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-02-02 19:36:31 +01:00
Julius Härtl
222d8e6c1a
Use proper path for scanner 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-29 09:40:46 +01:00
Julius Härtl
0d384dedaa
Obtain the user language from the passed in user id 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-29 08:56:32 +01:00
Julius Härtl
39a4b1c401
Normalize compared path to avoid renaming to the same directory 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-29 08:43:17 +01:00
Julius Härtl
6c1b357973
Move TemplateProvider registration to boot context and make template type registration lazy 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-28 12:00:21 +01:00
Julius Härtl
0111381529
Only create template directory if it is present in the default skeleton 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-28 12:00:20 +01:00
John Molakvoæ (skjnldsv)
4f90766ba3
Skip template picker if none available 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-01-28 12:00:20 +01:00
Julius Härtl
7e6d69d166
Add templatedirectory config value to let admins have their custom templates by default 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-28 12:00:20 +01:00
John Molakvoæ (skjnldsv)
78e114ed72
Add template picker 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-01-28 12:00:18 +01:00
Julius Härtl
4974404774
files: Create files from template API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-28 11:59:46 +01:00
Robin Appelman
e511a539b7
adjust tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-26 15:55:38 +01:00
Robin Appelman
5ae0be08b4
fix search in nested jails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-26 15:30:54 +01:00
Robin Appelman
27f9df2e87
fix cachjail searching for root 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-26 15:30:50 +01:00
Robin Appelman
a44aab11f7
do cachejail search filtering in sql 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-26 15:30:46 +01:00
Robin Appelman
d182043e83
explicitly set permissions on newly created folders 
this works around any `umask` that might be set and limiting the folder permissions

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-20 17:15:57 +01:00
Jasper Knockaert
40fde94b4d
fix even more brackets 
Signed-off-by: Jasper Knockaert jasper@knockaert.nl
 2021-01-16 14:49:53 +01:00
Jasper Knockaert
252d1ae512
fix brakcets 2021-01-16 14:38:19 +01:00
Jasper Knockaert
f9a0380eb1
consolidation of boolean expression 2021-01-16 14:33:44 +01:00
Johannes Leuker
ac88bcbd5f Add 'allow Symlinks' as an option to config.php 
Signed-off-by: Johannes Leuker <j.leuker@hosting.de>
 2021-01-12 10:38:39 +01:00
Morris Jobke
24d436cb60
Remove unneeded casts that were found by Psalm 
In preparation of the update of Psalm from 4.2.1 to 4.3.1+ (see https://github.com/nextcloud/server/pull/24521)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-11 13:14:41 +01:00
Christoph Wurst
8b64e92b92
Bump doctrine/dbal from 2.12.0 to 3.0.0 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-08 11:45:19 +01:00
Robin Appelman
205386b24e
ignore files that have no read permissions during scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-06 17:27:31 +01:00
Jasper Knockaert
81e3ae4753
avoid fread on directories and unencrypted files 
Reworking the logic in order to first check the filecache and only then reading the fileheader.
This in order to solve #21578.
 2021-01-05 11:14:49 +01:00
Julius Härtl
98560c80ea
Properly handle result when copying with failure and throw in tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-05 09:20:35 +01:00
Christoph Wurst
9ce3ea3368
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-30 14:07:05 +01:00
Christoph Wurst
73c7d0dc81
Bump icewind/streams from 0.7.1 to 0.7.2 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-29 09:07:36 +01:00
Roeland Jago Douma
adc4f1a811
Merge pull request #22916 from J0WI/unifiy-links-to-php.net 
Unify links to php.net
 2020-12-22 09:53:31 +01:00
Julius Härtl
5094e29ebd
Merge pull request #24594 from kofemann/dcache 2020-12-22 09:26:07 +01:00
Tigran Mkrtchyan
4f2dc18f58 storage: update IStorage#file_put_contents docs to match usage 
The current phpdoc of IStorage#file_put_contents doesnt corresponds to
it's actual usage in code, e.g.

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2020-12-21 19:04:18 +01:00
Roeland Jago Douma
4973f9b952
Merge pull request #24715 from nextcloud/bug/noid/limit-get-incomplete-to-1 
Limit getIncomplete query to one row
 2020-12-21 09:15:10 +01:00
Christoph Wurst
d89a75be0b
Update all license headers for Nextcloud 21 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-16 18:48:22 +01:00
James Letendre
45a02ee30c Fix failing tests 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2020-12-15 19:06:06 -05:00
James Letendre
ad95e51cbe Add web identity provider to S3 connection chain 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2020-12-15 16:37:46 -05:00
Daniel Kesselberg
e0e76bb784
Limit getIncomplete query to one row 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-12-15 21:42:26 +01:00
James Letendre
5b756a9fb0 Replace defaultProvider with explicit calls to exclude user home directory lookup 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2020-12-14 16:22:41 -05:00
James Letendre
85aa77539b Resolves #24699, Support ES2 and ECS instance providers for S3 buckets 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2020-12-14 12:55:46 -05:00
Tigran Mkrtchyan
f3513f3fe4 files: Local#writeStream should use it's own file_put_contents 
The OC\Files\Storage\Local#writeStream use system provided file_put_contents.
However, it overrides file_put_contents, thus expects that the default behaviour
can be different.

Use Local#file_put_contents in writeStream to benefit from class specific functionality.

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2020-12-07 18:11:40 +01:00
Roeland Jago Douma
6f4d3edb5e
Merge pull request #24113 from nextcloud/extend-cache-events 
extend cache events
 2020-12-02 19:48:20 +01:00
Robin Appelman
aef1cdba03
code style and dispatchTyped 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-12-02 16:15:02 +01:00
aler9
ac0c7a8fe0 Fix file size computation on 32bit platforms 
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
 2020-12-02 12:05:14 +01:00
Robin Appelman
88f35d52d2
rename cache event to follow new naming standards 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-11-26 15:39:46 +01:00
Robin Appelman
23fb497ff5
extend cache events 
- adds cache remove event
- expose storage id in event
- emit events during cache move

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-11-26 15:22:03 +01:00
Robin Appelman
9d4848e863
use in objectstore copy 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-11-24 15:16:58 +01:00
Joas Schilling
cffad62771
Empty string is returned as null, but empty string in file cache is the root and exists 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-10 15:35:43 +01:00
Joas Schilling
8027dcbc6f
Don't leave cursors open when tests fail 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-09 12:28:17 +01:00
John Molakvoæ
72545ffd07
Merge pull request #23937 from nextcloud/bugfix/noid/files-ocdb 
Use query builder instead of OC_DB in OC\Files\*
 2020-11-09 11:58:36 +01:00
Morris Jobke
28464f71a2
Merge pull request #23982 from nextcloud/fix/quota-storage-getsize 
Make sure root storage is valid before checking its size
 2020-11-09 11:03:25 +01:00
Morris Jobke
005a132938
Merge pull request #23741 from Ashod/lock-leak 
Unlock when promoting to exclusive lock fails
 2020-11-09 11:00:46 +01:00
Joas Schilling
c07720de77
Use query builder instead of OC_DB in OC\Files\* 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-09 09:05:15 +01:00
John Molakvoæ (skjnldsv)
6a453ac184
Make sure root storage is valid before checking its size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-11-09 08:49:30 +01:00
Roeland Jago Douma
a5fa9604ba
Merge pull request #23923 from nextcloud/bugfix/oci/fix-greatest-order-for-oracle 
Fix greatest/least order for oracle
 2020-11-07 16:55:13 +01:00
Ashod Nakashian
a66fb45c0b Unlock when promoting to exclusive lock fails 
In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).

To avoid this case, we catch the LockedException
and unlock before re-throwing.

Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
 2020-11-07 10:31:26 -05:00