upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-21 17:01:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
58657 commits 680 branches 1186 tags 6.7 GiB
Commit graph

19317 commits

Author SHA1 Message Date
Nextcloud bot
bbdc84ef1c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-13 02:26:53 +00:00
Joas Schilling
6c9fa27850
Merge pull request #30601 from nextcloud/backport/30291/stable21 
[stable21] Prevent loading images that would require too much memory.
 2022-01-12 13:50:22 +01:00
Nextcloud bot
b7f3c7c8d6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-12 02:27:17 +00:00
Joachim Bauch
3ad763cf18 Prevent loading images that would require too much memory. 
For most image formats, the header specifies the width/height.
PHP allocates an image object from that size, even if the actual
image data is much smaller. This image object size is not limited
by the limit configured in PHP.

The memory limit can be configured through "config.php" setting
"preview_max_memory" and defaults to 128 MBytes which should be
enough for most images without filling up all memory.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
 2022-01-11 14:48:27 +00:00
Vincent Petry
79d26e4d7f Fix fail when keys/files folder already exists 
Fixes an issue with transfer ownership in move mode where the folder
"files_encryption/keys/files" already exists.

Instead of failing, its existence is checked before calling mkdir.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-01-11 10:15:40 +00:00
Nextcloud bot
be642889ec
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-11 02:27:25 +00:00
Nextcloud bot
ea94d34845
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-10 02:26:52 +00:00
Nextcloud bot
0621eb9f60
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-09 02:26:41 +00:00
Nextcloud bot
ea96a9e7e0
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-08 02:26:44 +00:00
John Molakvoæ
cf46808a7f
Merge pull request #30488 from nextcloud/backport/29780/stable21 2022-01-07 13:11:26 +01:00
MichaIng
768bf3c59a [stable22] Remove iconv from dependencies and tests 
which is not used anymore since: https://github.com/nextcloud/server/pull/29470

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-01-07 10:19:13 +01:00
Joas Schilling
67a43a6ad4
Run migrations fully when reenabling an app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-07 08:50:31 +01:00
John Molakvoæ
dbdc814e81
Merge pull request #29963 from nextcloud/backport/29951/stable21 2022-01-07 08:48:20 +01:00
John Molakvoæ
064f2615d7
Merge pull request #29325 from nextcloud/backport/28541/stable21 2022-01-07 08:46:22 +01:00
Nextcloud bot
513589f3f9
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-07 02:28:22 +00:00
Nextcloud bot
ebb3fbb509
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-06 02:28:41 +00:00
Nextcloud bot
ed88cd1c95
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-03 02:27:59 +00:00
Nextcloud bot
e2dd2ecfde
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-25 02:27:39 +00:00
MichaIng
92744f3047
Merge pull request #30248 from nextcloud/backport/30245/stable21 
[stable21] Only wildcard search if enumeration is allowed
 2021-12-20 18:41:53 +01:00
Robin Appelman
f6024a895c
also use case sensitive like when searching in a folder 
this case was missed from https://github.com/nextcloud/server/pull/29080

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-12-14 17:49:48 +01:00
Côme Chilliet
e34ec33199
Avoid assignment in if clause 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-14 11:20:13 +01:00
Côme Chilliet
07997131d3
Fix typing problems in OC_Image 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-14 11:20:13 +01:00
Côme Chilliet
3f10cf8996
Avoid calling image* methods on boolean 
This avoids fatal errors on PHP>=8, and warnings on older versions.
Log should also be clearer.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-14 11:20:13 +01:00
Louis Chemineau
565da24b4f Fix backport 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-12-13 15:36:45 +01:00
Joas Schilling
846929b90d Make psalm more happy 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:26:22 +00:00
Joas Schilling
9da9a53166 Fix docs to make Psalm happier 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:26:22 +00:00
Joas Schilling
ae068fb47a Convert strict_search to wildcard property and add psalm docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:26:22 +00:00
Joas Schilling
749935e91b Limit more contact searches 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:26:22 +00:00
Joas Schilling
448ee8e30d Only limit search in the system address book 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:26:22 +00:00
Joas Schilling
18e665364a Only wildcard search if enumeration is allowed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:26:21 +00:00
Nextcloud bot
cc65c84f01
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-12 02:28:37 +00:00
Vincent Petry
4df4e6ea4d
Merge pull request #30182 from nextcloud/backport/30160/stable21 
[stable21] Check resource before closing in encryption wrapper
 2021-12-10 08:56:26 +01:00
Nextcloud bot
8697d25412
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-10 02:27:38 +00:00
Vincent Petry
65d4d30251 Check resource before closing in encryption wrapper 
In case of error there is no guarantee that $source or $target is set or
is a resource when handling an error.

Without this fix, there's a risk that fclose will fail and the actual
exception will not be thrown, making it impossible to find out about the
root cause.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-12-10 00:10:44 +00:00
Nextcloud bot
80ff47e829
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-09 02:29:49 +00:00
Louis
f41c1fffff
Merge pull request #30056 from nextcloud/backport/29735/stable21 
[stable21] find users for background scan one by one
 2021-12-08 18:06:00 +01:00
Nextcloud bot
c6b705dde6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-08 02:29:04 +00:00
Nextcloud bot
e653cd2d7b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-07 02:40:16 +00:00
John Molakvoæ
fda86f8c8c
Merge pull request #29834 from nextcloud/carl/bugfix/file-search-21 2021-12-06 14:51:55 +01:00
Nextcloud bot
d9e5960aff
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-06 02:30:47 +00:00
Nextcloud bot
92b5bcfbfb
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-05 02:30:41 +00:00
Robin Appelman
f70f9cf1be code checker fixes for instanceOfStorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-12-02 20:00:45 +00:00
Robin Appelman
bd677f6741 background scan the source storage when a background scan on a storage jail is triggered 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-12-02 20:00:45 +00:00
Robin Appelman
016f99276b teach psalm about Storage::instanceOfStorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-12-02 20:00:45 +00:00
Joas Schilling
cabc6eaec6 Fix log_query config flag 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-02 09:41:33 +00:00
Arthur Schiwon
26c66d210d ensure that factoryClass exisits before instantiation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-12-01 08:27:56 +00:00
Christoph Wurst
56fb21769f Include previous execption for repair steps that don't exist 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-11-30 12:03:51 +00:00
Christoph Wurst
bb91d5bd69 Let repair step query exceptions bubble up 
And hide the type error caused by a constructor call with missing
arguments.

`new $repairStep();` only works for the rare case that no arguments are
required. Anything else will throw. Then we previously hid the trace of
the more important query exception.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-11-30 12:03:51 +00:00
Nextcloud bot
46a264b2a2
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-30 02:26:45 +00:00
Christoph Wurst
603d623d54 Interpolate the log message also for logged exceptions 
According to PSR-3 the log message can have placeholders that are
replaced from the context object. Our logger implementation did that for
all PSR-3 logger methods. The only exception was our custom `logException`.

Since PsrLoggerAdapter calls logException when an exception key is
present in the context object, log messages were no longer interpolated.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-11-29 15:55:00 +00:00