summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Apply changes from master's update to 3.1.3Joas Schilling2021-11-152-3/+3
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Allow NULL as well for limit, not integer onlyJoas Schilling2021-11-152-7/+16
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix updating with appsJoas Schilling2021-11-112-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #29520 from nextcloud/backport/29479/stable21Côme Chilliet2021-11-085-22/+25
|\ | | | | [stable21] Fix images on php 8.0
| * Merge branch 'stable21' into backport/29479/stable21Côme Chilliet2021-11-043-10/+54
| |\ | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Fix resource usages in OC_ImageCôme Chilliet2021-11-025-22/+25
| | | | | | | | | | | | | | | | | | This makes sure using resource or GdImage (PHP>=8) behaves the same. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | Revert "[21] tell mysql to ignore the sort index for search queries"John Molakvoæ2021-11-043-40/+4
| |/ |/|
* | Merge pull request #29322 from nextcloud/mysql-search-ignore-index-21John Molakvoæ2021-11-043-4/+40
|\ \
| * | tell mysql to ignore the sort index for search queriesRobin Appelman2021-10-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql really likes to pick an index for sorting if it can't fully satisfy the where filter with an index, since search queries pretty much never are fully filtered by index mysql often picks an index for sorting instead of the *much* more useful index for filtering. To bypass this, we tell mysql explicitly not to use the mtime (the default order field) index, so it will instead pick an index that is actually useful. Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | allow specifying index hints for mysql search queriesRobin Appelman2021-10-182-3/+33
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Move query outside the loop and reduce chunk size to 1000Sijmen Schoon2021-11-012-12/+14
| | | | | | | | | | | | | | | | | | | | | This involved changing CacheQueryBuilder\whereParentIn to take a parameter name, renaming the function accordingly. Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
* | | Limit parameter count per query in Cache.removeChildrenSijmen Schoon2021-11-011-8/+14
| |/ |/| | | | | Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
* | Merge pull request #29416 from nextcloud/backport/27440/stable21MichaIng2021-10-301-4/+4
|\ \ | | | | | | [stable21] Handle files with `is_file` instead of `file_exists`
| * | Handle files with is_file instead of file_existsacsfer2021-10-231-4/+4
| | | | | | | | | Should fix things like `fread(): read of 8192 bytes failed with errno=21 Is a directory`
* | | Fix permissions when copying from ObjectStorageCarl Schwan2021-10-282-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | more reliable return value for Watcher::checkUpdateRobin Appelman2021-10-261-1/+8
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | s3 external storage listing reworkRobin Appelman2021-10-261-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Make the route name error more helpfulChristoph Wurst2021-10-222-2/+2
|/ / | | | | | | | | | | | | | | As a developer I have no clue what "Invalid route name" means. If the exception gives me a hint I might find it easier to figure out why my route triggers this error. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix security issues when copying groupfolder with advanced ACLCarl Schwan2021-10-211-1/+4
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #29289 from nextcloud/backport/28768/stable21John Molakvoæ2021-10-211-1/+1
|\ \
| * | Simplify :)acsfer2021-10-181-1/+1
| | |
| * | Replace `file_exists()` method by `is_file()`acsfer2021-10-181-1/+1
| | |
| * | Get `filesize()` if `file_exists()`acsfer2021-10-181-1/+1
| |/ | | | | Should make sense.
* | Merge pull request #29182 from nextcloud/backport/29028/stable21John Molakvoæ2021-10-191-3/+13
|\ \
| * | add 'supported'-label to all supported apps, also if they are not downloaded yetBjoern Schiessle2021-10-121-3/+13
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Fix app upgradeJoas Schilling2021-10-191-8/+10
| |/ |/| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #29159 from nextcloud/backport/24185/stable21Daniel2021-10-151-0/+1
|\ \ | | | | | | [stable21] Properly handle folder deletion on external s3 storage
| * | Make sure that a empty directory can still be deleted when copied from ↵Julius Härtl2021-10-111-0/+1
| | | | | | | | | | | | | | | | | | another storage Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #29203 from nextcloud/backport/26688/stable21MichaIng2021-10-141-1/+1
|\ \ \ | | | | | | | | [stable21] Add proper message to created share not found
| * | | Add proper message to created share not foundJohn Molakvoæ (skjnldsv)2021-10-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #29197 from nextcloud/backport/29020/stable21Joas Schilling2021-10-132-5/+18
|\ \ \ \ | | | | | | | | | | [stable21] Keep group restrictions when reenabling apps after an update
| * | | | Keep group restrictions when reenabling apps after an updateJoas Schilling2021-10-132-5/+18
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / / Fix translated app detailsJoas Schilling2021-10-132-6/+5
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #29130 from nextcloud/backport/27886/stable21Vincent Petry2021-10-132-0/+10
|\ \ \ | | | | | | | | [stable21] Keep pw based auth tokens valid when pw-less login happens
| * | | add spaces around operatorsTobias Assmann2021-10-082-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
| * | | draft to prevent the invalidation of pw based authn tokens on a pw less loginTobias Assmann2021-10-082-0/+10
| | | | | | | | | | | | | | | | Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
* | | | Merge pull request #29080 from nextcloud/path-prefix-filter-21Vincent Petry2021-10-132-26/+24
|\ \ \ \ | |_|_|/ |/| | | [21] generate a better optimized query for path prefix search filters
| * | | [21] generate a better optimized query for path prefix search filtersRobin Appelman2021-10-122-26/+24
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #29037 from Hinyka/stable21Vincent Petry2021-10-124-5/+9
|\ \ \ \ | | | | | | | | | | [stable21] Fix Lots of Error: file_exists(): open_basedir restriction in effect
| * | | | backport of #28263Karel Hink2021-10-024-5/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Karel Hink <info@karelhink.cz>
* | | | | Merge pull request #29134 from nextcloud/backport/28907/stable21Julius Härtl2021-10-112-3/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | explicitly close source stream on encryption storageDaniel Kesselberg2021-10-081-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | explicitly close source stream on local storageDaniel Kesselberg2021-10-081-1/+4
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #29164 from nextcloud/backport/29062/stable21MichaIng2021-10-111-0/+5
|\ \ \ \ | | | | | | | | | | [stable21] Don't further setup disabled users when logging in with apache
| * | | | Don't further setup disabled users when logging in with apacheJoas Schilling2021-10-111-0/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / / Tokens without password should not trigger changed password invalidationJulius Härtl2021-10-111-1/+1
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | / Fix psalm issue in Encryption streamVincent Petry2021-10-081-1/+1
| |/ |/| | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | consider some config keys under 'objectstore_multibucket' as sensitiveJulien Veyssier2021-10-061-0/+21
| | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | Fix path of file_get_contentsacsfer2021-10-041-1/+1
| |
* | handle case where storage can't be created in getStorageRootIdRobin Appelman2021-09-301-1/+7
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>