upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
59684 commits 1030 branches 1221 tags 7.6 GiB
Commit graph

914 commits

Author SHA1 Message Date
Sijmen Schoon
071eda7baa Move query outside the loop and reduce chunk size to 1000 
This involved changing CacheQueryBuilder\whereParentIn to take a
parameter name, renaming the function accordingly.

Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
 2021-11-01 11:08:32 +00:00
Sijmen Schoon
ec3b1ccd91 Limit parameter count per query in Cache.removeChildren 
Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
 2021-11-01 11:08:31 +00:00
Carl Schwan
8993cf86f1
Merge pull request #29475 from nextcloud/backport/29115/stable22 
[stable22] Fix permissions when copying from ObjectStorage
 2021-10-30 11:20:07 +02:00
MichaIng
5bd6a4fd29
Merge pull request #29415 from nextcloud/backport/27440/stable22 
[stable22] Handle files with `is_file` instead of `file_exists`
 2021-10-30 00:19:28 +02:00
Carl Schwan
7bf4a45f49 Fix permissions when copying from ObjectStorage 
Make sure that when a user copy a file from a directory they don't have
all permissions to a directory where they have more permissions, the
permissions are correctly set to the one from the parent taget folder.

This was caused by the ObjectStoreStorage::copyFromStorage using
the jailed storage and cache entry instead of the unjailed one like other
storages (the local one).
Steps to reproduce

+ Use object storage
+ Create a groupfolder with one group having full permission and another one
  who can just read files.
+ With an user who is in the second group, copy a file from the groupfolder to
  the home folder of this user.
+ The file in the home folder of the user will be read only and can't be deleted
  even though it is in their home folder and they are the owner. In oc_filecache,
  the permissions stored for this file are 1 (READ)

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-30 00:18:26 +02:00
acsfer
3a5d1c1faf Handle files with is_file instead of file_exists 
Should fix things like `fread(): read of 8192 bytes failed with errno=21 Is a directory`
 2021-10-23 09:28:13 +00:00
Robin Appelman
5f438375a9 more reliable return value for Watcher::checkUpdate 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
a4a4097068 s3 external storage listing rework 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Carl Schwan
887f4ba2fb Fix security issues when copying groupfolder with advanced ACL 
Using advanced ACL, it is possible that an user has access to a
directory but not to a subdirectory, so the copying use
Common::copyFromStorage instead of Local::copyFromStorage.

Fix https://github.com/nextcloud/groupfolders/issues/1692

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-21 16:34:20 +00:00
acsfer
50791c61d3 Simplify :) 2021-10-18 07:59:00 +00:00
acsfer
269d9b5e0b Replace file_exists() method by is_file() 2021-10-18 07:58:59 +00:00
acsfer
698527d197 Get filesize() if file_exists() 
Should make sense.
 2021-10-18 07:58:59 +00:00
Julius Härtl
96abf31c3b
Merge pull request #29160 from nextcloud/backport/24185/stable22 2021-10-12 09:12:11 +02:00
Julius Härtl
9163894634
Merge pull request #29133 from nextcloud/backport/28907/stable22 2021-10-11 22:22:59 +02:00
Julius Härtl
3246eea0b6 Make sure that a empty directory can still be deleted when copied from another storage 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-11 08:01:10 +00:00
Daniel Kesselberg
15417f3824 explicitly close source stream on encryption storage 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-08 08:04:34 +00:00
Daniel Kesselberg
8ce2a320a1 explicitly close source stream on local storage 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-08 08:04:34 +00:00
Robin Appelman
d4fb676dd7 generate a better optimized query for path prefix search filters 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-07 15:19:58 +00:00
blizzz
9410141747
Merge pull request #28683 from nextcloud/backport/26463/stable22 
[stable22] Fix S3 ObjectStore proxy option
 2021-09-23 10:24:54 +02:00
Pauli Järvinen
11695164c6 Support seeking also from the end of file on S3 storage 
The PR https://github.com/nextcloud/server/pull/20033 added support
for `fseek` for  the S3 storage backend. However, the seek mode SEEK_END
was left out that time. This PR fills this gap.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2021-09-20 18:13:25 +00:00
Maxime Besson
d99a72b801 fix(proxy): use accessor 
Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
 2021-09-01 08:23:18 +00:00
Maxime Besson
956bccc1c0 fix(proxy): reaching s3 storage behind some http proxy 
Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
 2021-09-01 08:23:18 +00:00
Samuel
4c9e7e2d39 fix(proxy): reaching s3 storage behind some http proxy 
Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
 2021-09-01 08:23:18 +00:00
Vincent Petry
eada9eaace
Unregister enc stream wrapper for any exception 
This prevents side effects in tests by properly cleaning up
even with expected exceptions.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-26 14:17:12 +02:00
Lukas Reschke
34b5d979ff
Merge pull request #28583 from nextcloud/backport/28566/stable22 
[stable22] use getGetUnjailedRoot to determine if jailed search needs the path filter
 2021-08-25 13:21:41 +02:00
Robin Appelman
9e5440abc3 use getGetUnjailedRoot to determine if jailed search needs the path filter 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-08-24 12:52:27 +00:00
Robin Appelman
5444db1ebf use case insensitive like when limiting search to jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-08-24 07:02:22 +00:00
Robin Appelman
8a6e3e6aca fix Folder->getById() when a single storage is mounted multiple times 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-08-09 17:29:40 +00:00
Robin Appelman
1534b24e38 dont apply jail search filter is on the root 
the extra '/' breaks things and the filter wouldn't do anything anyway except making the databases job harder

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-29 07:30:21 +00:00
John Molakvoæ
c73070c19d
Merge pull request #27752 from nextcloud/backport/27586/stable22 
[stable22] Reset checksum when writing files to object store
 2021-07-05 17:27:07 +02:00
Robin Appelman
cb0e76105e dont include folder being search in in the results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-02 15:52:17 +00:00
Julius Härtl
226e0c4107 Reset checksum when writing files to object store 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-01 15:33:47 +00:00
Pytal
9ed379da22
Merge pull request #27635 from nextcloud/fix/datetime-constants 
Fix usage of DateTime constants
 2021-06-23 09:56:28 -07:00
Christoph Wurst
6d5cfe0c66
Move DateTime::RFC2822 to DateTimeInterface::2822 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-23 15:30:43 +02:00
Lukas Reschke
a70fd1bad1
Merge pull request #26344 from J0WI/fs-early-root 
Return early if path is root
 2021-06-23 15:21:56 +02:00
Robin Appelman
8520717b4f
handle case where storage can't be created in getStorageRootId 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-17 14:32:38 +02:00
Robin Appelman
362cb2a11f
inject SearchBuilder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:23:08 +02:00
Robin Appelman
66e10718c6
split of query building bits from searchhelper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:40 +02:00
Robin Appelman
f938daa6e4
update tests and fix some edge cases around new search 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:36 +02:00
Robin Appelman
27e50b24aa
some cleanup and documentation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:32 +02:00
Robin Appelman
5d1d53c42e
perform file search in a single query 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:29 +02:00
Robin Appelman
9774fb1573
use searchoperation for storage filter instead of db expression 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:25 +02:00
Robin Appelman
e198dc1b20
rework search api to allow searching on multiple caches at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-14 16:11:22 +02:00
Robin Appelman
581cbdc20c
[3rdparty] streams-0.7.4 
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-10 07:58:32 +02:00
Morris Jobke
2ae60b42ab
Merge pull request #26494 from rigrig/fix-php8-deprecations 
Fix some php 8 warnings
 2021-06-07 23:30:59 +02:00
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
John Molakvoæ
d0cf20cc51
Merge pull request #26792 from nextcloud/user-delete-cleanup-files 
better cleanup of user files on user deletion
 2021-06-02 17:02:00 +02:00
Richard de Boer
7990f95558 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-05-29 14:14:52 +02:00
Richard de Boer
f23d057ad9 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-05-29 14:14:52 +02:00
Vincent Petry
0815be1ca8
Merge pull request #27062 from nextcloud/search-limit-offset-jail 
properly use limit and offset for search in Jail wrapper
 2021-05-25 15:47:09 +02:00