upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38
57952 commits 679 branches 1186 tags 6.6 GiB
Commit graph

842 commits

Author SHA1 Message Date
John Molakvoæ
218a96ebf9
Revert "[stable21] better cleanup of filecache when deleting an external storage" 2021-07-27 15:51:10 +02:00
John Molakvoæ
606b5fe154
Merge pull request #27205 from nextcloud/backport/26936/stable21 
[stable21] better cleanup of filecache when deleting an external storage
 2021-07-27 14:04:25 +02:00
Robin Appelman
feb640cd64
better cleanup of filecache when deleting an external storage 
this way it can delete the cache entries even with per-user credentials

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-13 08:54:30 +02:00
Julius Härtl
c16d5b1077 Reset checksum when writing files to object store 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-01 15:36:07 +00:00
Julius Härtl
420d395947
Merge pull request #27415 from nextcloud/backport/26494/stable21 2021-06-14 09:48:41 +02:00
Julius Härtl
6e190b1a55
Merge pull request #27303 from nextcloud/backport/27062/stable21 
[stable21] properly use limit and offset for search in Jail wrapper
 2021-06-09 08:07:49 +02:00
Richard de Boer
9f3824b884 Check whether output buffering is active before turning it off 
Before we just turned it off and @suppressed the error if ob was not active.
In PHP 8 this error is no longer suppressed, so try to not cause it at all.

Signed-off-by: Richard de Boer <git@tubul.net>
 2021-06-07 21:33:53 +00:00
Richard de Boer
7e9d459fea Fix functions taking optional parameters before required ones 
PHP 8 shows deprecation warnings about this, see #25806
Removes the "default" values, as they actually are required parameters anyway.

Signed-off-by: Richard de Boer <git@tubul.net>
 2021-06-07 21:33:52 +00:00
Robin Appelman
287edf0e61
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-06-04 15:43:16 +02:00
Robin Appelman
a21eb8d6d2 properly use limit and offset for search in Jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-05-31 12:28:12 +00:00
Florent
ede67149ea Avoid reading ~/.aws/config when using S3 provider 
When using S3 storage, we sometimes have open_basedir errors due to aws-sdk-php trying to read ~/.aws/config which is out of open_basedir restrictions.
Christoph Wurst already added csm=false config in #21406 but it wasn't enough, we also need to set use_arn_region=false, added in this commit.

Signed-off-by: Florent <florent@coppint.com>
 2021-05-25 08:59:03 +00:00
Julius Härtl
80cda3b174 Fix log error when creating files from an empty template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-05-19 07:03:27 +00:00
Julius Härtl
e2fffcda44 Fail when creating new files with an empty path 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-04-28 10:06:03 +00:00
Julius Härtl
dc8e819915 Properly handle creating the template directory in a subfolder (fixes #25787) 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-04-01 13:31:55 +00:00
Julius Härtl
89a19a338e Get the parent directory before creating a file from a template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-04-01 13:31:55 +00:00
Julius Härtl
fc2e09b667 Properly end iterating over the file once the target has been reached 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-03-30 19:22:47 +00:00
Roeland Jago Douma
d65ce19f6e
Merge pull request #26291 from nextcloud/backport/21484/stable21 
[stable21] show better error messages when a file with a forbidden path is encountered
 2021-03-26 10:44:43 +01:00
Morris Jobke
cf8be87e47 Log when a storage is marked as unavailable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-03-25 16:10:28 +00:00
Robin Appelman
fdf7eb10a2 show better error messages when a file with a forbidden path is encountered 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-25 10:56:59 +00:00
Morris Jobke
ffb7c51ca6
Merge pull request #26257 from nextcloud/backport/26198/stable21 
[stable21] Handle limit offset and sorting in files search
 2021-03-24 17:32:36 +01:00
John Molakvoæ (skjnldsv)
e9fafce71b Catch invalid cache source storage path 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-03-24 11:03:30 +00:00
Robin Appelman
d4381c0eac handle ordering in folder search 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:18 +00:00
Robin Appelman
8551ee079d folder filtering in sql 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:16 +00:00
Robin Appelman
277c0039f6 cleanup fileinfo creation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:13 +00:00
Robin Appelman
c8679885f6 format 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:12 +00:00
Robin Appelman
423e1581e0 handle limit and offset in folder file search 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:12 +00:00
Robin Appelman
2500d296c5 only require user to be set in a query that handles tags 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:11 +00:00
Robin Appelman
d2245734d4 unify handling of Folder::search methods into "new" query objects 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-23 13:41:11 +00:00
Vincent Petry
0e5379a7b3
Merge pull request #26119 from nextcloud/backport/26003/stable21 
[stable21] Add getID function to the simplefile implementation
 2021-03-19 13:59:00 +01:00
Morris Jobke
c1c377f609
Merge pull request #26090 from nextcloud/backport/25722/stable21 
[stable21] apply object store copy optimization when 'cross storage' copy is wit…
 2021-03-17 20:09:50 +01:00
Morris Jobke
95ebe5e819
Merge pull request #26146 from nextcloud/backport/26013/stable21 
[stable21] Return the fileid from `copyFromCache` and use it instead of doing an extra query
 2021-03-17 20:03:58 +01:00
Morris Jobke
4b3684fbc4
Merge pull request #25943 from nextcloud/backport/25659/stable21 
[stable21] catch notfound and forbidden exception in smb::getmetadata
 2021-03-17 13:50:39 +01:00
Robin Appelman
0532f64aa8 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-17 09:36:02 +00:00
Robin Appelman
44d4957548 verify that cache entry is valid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-16 16:17:59 +00:00
Robin Appelman
f6f92e8bc6 also implement for FailedCache and NullCache 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-16 16:17:58 +00:00
Robin Appelman
719db4cee9 use returned file id for object store copy 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-16 16:17:57 +00:00
Robin Appelman
bb180a95bb add ICopyFromCache trait to expose existing implementation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-16 16:17:56 +00:00
Robin Appelman
c727879073 adjust tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-15 17:51:34 +00:00
Robin Appelman
ec0985ba68 fix search in nested jails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-15 17:51:33 +00:00
Robin Appelman
eb56b1d0bd fix cachjail searching for root 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-15 17:51:32 +00:00
Robin Appelman
046638abeb do cachejail search filtering in sql 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-15 17:51:32 +00:00
Roeland Jago Douma
7059b0b21f 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-15 13:44:45 +00:00
Robin Appelman
6308267aff 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-12 16:16:01 +00:00
Robin Appelman
67d62a820c catch notfound and forbidden exception in smb::getmetadata 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-05 07:51:47 +00:00
James Letendre
74d90d0165 Fix failing tests 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2021-02-02 20:52:20 +00:00
James Letendre
b65b2bbf55 Add web identity provider to S3 connection chain 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2021-02-02 20:52:18 +00:00
James Letendre
5750d79181 Replace defaultProvider with explicit calls to exclude user home directory lookup 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2021-02-02 20:52:16 +00:00
James Letendre
c9a724829a Resolves #24699, Support ES2 and ECS instance providers for S3 buckets 
Signed-off-by: James Letendre <james.letendre@gmail.com>
 2021-02-02 20:52:13 +00: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