Commit Graph

56347 Commits

Author SHA1 Message Date
Morris Jobke 939db1f466
Merge pull request #26190 from nextcloud/backport/25331/stable20
[stable20] Fix valid storages removed when cleaning remote storages
2021-03-18 13:09:22 +01:00
Vincent Petry 7dfb3afdac
Merge pull request #26088 from nextcloud/backport/26049/stable20
[stable20] limit constructing of result objects in file search
2021-03-18 11:22:53 +01:00
Daniel Calviño Sánchez ec454e7c2b Fix valid storages removed when cleaning remote storages
The remote URL of a share is always stored in the database with a
trailing slash. However, when a cloud ID is generated trailing slashes
are removed.

The ID of a remote storage is generated from the cloud ID, but the
"cleanup-remote-storage" command directly used the remote URL stored in
the database. Due to this, even if the remote storage was valid, its ID
did not match the ID of the remote share generated by the command and
ended being removed.

Now the command generates the ID of remote shares using the cloud ID
instead, just like done by the remote storage, so there is no longer a
mismatch.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-03-18 07:59:45 +00:00
Daniel Calviño Sánchez 92daa942b0 Add integration tests for "sharing:cleanup-remote-storages" OCC command
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-03-18 07:59:45 +00:00
Robin Appelman e36e4a571e
implement PagedProvider for file search
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-18 08:22:34 +01:00
Robin Appelman 57042ab107
limit constructing of result objects in file search
even thought we currently have no proper way of limiting the search itself, we can at least limit the construction of the result objects.

this saves about 40% of the time spend in the search request in my local testing

Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-18 08:22:31 +01:00
Nextcloud bot a50f4a42bc
[tx-robot] updated from transifex 2021-03-18 02:25:22 +00:00
Morris Jobke d3b279d98d
Merge pull request #26052 from nextcloud/backport/26048/stable20
[stable20] cache baseurl in url generator
2021-03-17 20:14:05 +01:00
Morris Jobke 4f18ff9815
Merge pull request #25944 from nextcloud/backport/25659/stable20
[stable20] catch notfound and forbidden exception in smb::getmetadata
2021-03-17 20:13:57 +01:00
Morris Jobke 71b793f8a1
Merge pull request #26091 from nextcloud/backport/25722/stable20
[stable20] apply object store copy optimization when 'cross storage' copy is wit…
2021-03-17 20:09:56 +01:00
Morris Jobke c4da8d4e55
Merge pull request #26152 from nextcloud/backport/26137/stable20
[stable20] dont allow creating users with __groupfolders as uid
2021-03-17 20:06:56 +01:00
Morris Jobke 2982fa346b
Merge pull request #26181 from nextcloud/backport/26003/stable20
[stable20] Add getID function to the simplefile implementation
2021-03-17 20:06:15 +01:00
Morris Jobke fe3b3a9cec
Merge pull request #26147 from nextcloud/backport/26013/stable20
[stable20] Return the fileid from `copyFromCache` and use it instead of doing an extra query
2021-03-17 20:04:11 +01:00
Roeland Jago Douma 147134fc31 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-17 16:15:46 +00:00
Morris Jobke 3c1402c2d9
Merge pull request #25876 from nextcloud/psalm/stable20/update
[stable20] Update psalm baseline
2021-03-17 14:17:20 +01:00
Morris Jobke fd53468d7b
Merge pull request #26163 from nextcloud/backport/26153/stable20
[stable20] Use correct exception type hint in catch statement
2021-03-17 13:50:13 +01:00
Morris Jobke 94c47eddea
Merge pull request #26168 from nextcloud/backport/26072/stable20
[stable20] remove explicit fclose from S3->writeStream
2021-03-17 13:46:48 +01:00
Vincent Petry 67e0b194b6
Update and fix baseline
Backported some bits of stable21 to make Psalm happy.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-03-17 12:04:08 +01:00
Robin Appelman 534a935433 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:11 +00:00
Vincent Petry f80f7a33e8
Fix baseline further
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-03-17 10:31:09 +01:00
Roeland Jago Douma 7bb7f4d936
Update psalm baseline
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-03-17 10:06:06 +01:00
Morris Jobke 9749514649 Use correct exception type hint in catch statement
Found by psalm update 4.6.2 to 4.6.3 in #26111

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-03-17 08:47:07 +00:00
Nextcloud bot fdabe1172b
[tx-robot] updated from transifex 2021-03-17 02:24:39 +00:00
Robin Appelman 279f0d72f3 dont allow creating users with __groupfolders as uid
Fixes https://github.com/nextcloud/groupfolders/issues/338

Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 18:51:58 +00:00
Robin Appelman 436cd31bd2 verify that cache entry is valid
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 16:18:04 +00:00
Robin Appelman 9bb73574c3 also implement for FailedCache and NullCache
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 16:18:03 +00:00
Robin Appelman 20ab946c3f use returned file id for object store copy
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 16:18:01 +00:00
Robin Appelman aaa4c071ed add ICopyFromCache trait to expose existing implementation
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 16:18:01 +00:00
Morris Jobke 2e14150889
Merge pull request #26134 from nextcloud/backport/25136/stable20
[stable20] do cachejail search filtering in sql
2021-03-16 17:00:29 +01:00
Robin Appelman bdd7f28fa6
only use share cacheentry when available
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:23 +01:00
Robin Appelman f500e2396e
adjust tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:23 +01:00
Robin Appelman 7fd53b91c3
fix search in nested jails
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:22 +01:00
Robin Appelman a20eb9a229
fix cachjail searching for root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:22 +01:00
Robin Appelman 5d08beb3d2
do cachejail search filtering in sql
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:22 +01:00
Christoph Wurst a6357ebcba
Merge pull request #26130 from nextcloud/backport/26115/stable20
[stable20] Log exceptions when creating share
2021-03-16 11:09:44 +01:00
Nextcloud bot 7332b6f75e
[tx-robot] updated from transifex 2021-03-16 02:25:00 +00:00
Vincent Petry 20ebdf4fe0 Log exceptions when creating share
Because the exceptions don't always contain a useful message for the UI,
but also because in some cases we need to find out what went wrong.

In some setups, a ShareNotFoundException might happen during creation
when we try to re-read the just written share. Usually related to Galera
Cluster where node syncing wait is not enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-03-15 15:06:43 +00:00
Robin Appelman 797645bc49 send share notification instead of erroring on duplicate share
when creating a share that already exists, instead of erroring, resend the notifications

Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-15 14:13:05 +00:00
Roeland Jago Douma ff64514bea Allow overwriting isAuthenticated
* Some implementations might check for different things
* IT will not change how the current ones work

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-03-15 13:59:10 +00:00
Christoph Wurst 3e18eca7a0
Merge pull request #26059 from nextcloud/backport/25911/stable20
[stable20] Only clear share password model when actually saved
2021-03-15 09:48:19 +01:00
Nextcloud bot 25f27569f5
[tx-robot] updated from transifex 2021-03-15 02:24:17 +00:00
Nextcloud bot 049895f3e7
[tx-robot] updated from transifex 2021-03-14 02:23:58 +00:00
Nextcloud bot b6af167c65
[tx-robot] updated from transifex 2021-03-13 02:23:14 +00:00
Robin Appelman 5827a156af 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:32 +00:00
Nextcloud bot 60756e8e3e
[tx-robot] updated from transifex 2021-03-12 02:23:01 +00:00
Vincent Petry 51ba0faeaf Only clear share password model when actually saved
Instead of always clearing the password in the share model, now only do
it when it was actually saved.

Fixes an issue where saving another field would clear the password too
early and prevent it to be saved when the dropdown closed.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2021-03-11 10:20:59 +00:00
Roeland Jago Douma b306b88a41
Merge pull request #26040 from nextcloud/backport/25916/stable20
[stable20] Remove trash items from other trash backends when deleting all
2021-03-11 10:34:32 +01:00
Nextcloud bot 28378720f1
[tx-robot] updated from transifex 2021-03-11 02:23:28 +00:00
Robin Appelman a1935d0f74 cache baseurl in url generator
Servers don't tend to change their url in the middle of a request

Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-10 19:38:41 +00:00
Roeland Jago Douma ae6c5f2af4
Merge pull request #26027 from nextcloud/backport/25933/stable20
[stable20] Hide expiration date field for remote shares
2021-03-10 15:46:53 +01:00