upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-13 15:54:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
60742 commits 697 branches 1185 tags 6.5 GiB
Commit graph

19819 commits

Author SHA1 Message Date
Carl Schwan
003f2b59c9
Fix psalm warning related to registerEventListener 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-29 12:44:02 +01:00
John Molakvoæ
3ee9bcc4f7
Merge pull request #30814 from nextcloud/backport/30508/stable23 2022-01-27 20:06:29 +01:00
Carl Schwan
d69531ac8e
Fix psalm not running 
The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.

This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-27 17:20:00 +01:00
John Molakvoæ
37b49e615c
Merge pull request #30740 from nextcloud/backport23 2022-01-22 19:03:33 +01:00
Côme Chilliet
20c3f6d634 Always call flush() as getAllKeys() is broken 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-01-20 15:38:02 +00:00
John Molakvoæ
4466eb1f42
Merge pull request #30728 from nextcloud/backport/30614/stable23 2022-01-20 11:12:34 +01:00
John Molakvoæ
2645b6cd69
Merge pull request #29798 from nextcloud/stable23-disk 2022-01-20 10:36:40 +01:00
Joas Schilling
713342cd23 Log bruteforce throttle and blocking 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-19 11:51:43 +00:00
Christopher Ng
38221b8c68 Update autoload and ClassLoader 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-01-19 02:12:15 +00:00
acsfer
61509de933
[stable23] Increase email main buttons width for non-english languages 
Manual backport of https://github.com/nextcloud/server/pull/30653
 2022-01-18 16:01:26 +01:00
Julius Härtl
fb032ad04d
Add hashed attribute column for indexed job existence check 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-01-18 15:09:27 +01:00
Marek-Wojtowicz
10ae5acf64 Update Session.php 
The http headers according to rfc 2616 is iso-8859-1. This patch fixes the behavior when non-ascii characters are present in the header.

Signed-off-by: Marek Wójtowicz <Marek.Wojtowicz@agh.edu.pl>
 2022-01-17 23:23:17 +00:00
Carl Schwan
253d502471
Merge pull request #30684 from nextcloud/backport/30531/stable23 
[stable23] Optimize FileSystemTags workflow for groupfolder
 2022-01-17 10:15:26 +01:00
Jonas Meurer
9da4620ff8 updateEncryptedVersion: cleanup on target if cache already got renamed 
When moving a file to trash with encryption enabled, the cache gets
moved before the actual file. According to @icewind1991 this is in order
to not break object storage.

When moving a file from an unencrypted storage (e.g. a collectives
storage) to the encrypted trashbin storage, this causes errors, see

This commit fixes it by doing `updateEncryptedVersion()` on the target
cache entry *if* the source cache entry doesn't exist anymore, but the
corresponding target cache entry does exist already.

Fixes: #26544

Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2022-01-14 21:41:10 +00:00
Carl Schwan
61624c2213 Fix psalm issues 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-14 14:17:11 +00:00
Carl Schwan
c3fcb2c199 Add helper method in Wrapper 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-14 14:17:06 +00:00
Julius Härtl
1938c41ace
Merge pull request #30659 from nextcloud/backport/29622/stable23 2022-01-14 10:41:46 +01:00
John Molakvoæ
05a13d3dc6
Implement multibucket shift for ObjectStore 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-01-14 08:31:38 +01:00
Carl Schwan
2b2d23ce21
Fix idn emails not working in shares 
And add check before sending email that email address is valid

Fix #30595

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-13 17:10:43 +01:00
MichaIng
0323ced93a
Merge pull request #30621 from nextcloud/backport/30358/stable23 
[stable23] Reset job disabling timer on adding the job again
 2022-01-12 16:01:56 +01:00
Joas Schilling
b89e743976
Merge pull request #30611 from nextcloud/backport/30588/stable23 
[stable23] Fix undefined/unset scope in account properties
 2022-01-12 13:51:07 +01:00
Julius Härtl
d7cb3d0643 Reset job disabling timer on adding the job again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-01-12 10:52:51 +00:00
Joas Schilling
8fde21460f Fix undefined/unset scope in account properties 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-11 18:44:52 +00:00
Joachim Bauch
cebac86ecd 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:49:08 +00:00
Vincent Petry
9eeaed0051 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>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-01-11 08:20:41 +00:00
Christopher Ng
c699f1bec2 Fix email verification 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-01-07 10:52:36 +00:00
Joas Schilling
551e1a799a
Merge pull request #30486 from nextcloud/backport/29780/stable23 
[stable23] Run migrations fully when reenabling an app
 2022-01-07 08:43:14 +01:00
Joas Schilling
e69d0b0a65 Run migrations fully when reenabling an app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-04 16:19:35 +00:00
MichaIng
022d0058ca [stable23] 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-04 03:06:55 +01:00
Joas Schilling
b947bf3765
Merge pull request #30026 from nextcloud/backport/30013/stable23 
[stable23] Don't query the bruteforce attempts when we just deleted them
 2021-12-21 09:38:20 +01:00
Azul
26886d753d fix translation source in directEditing templates 
The 'Empty file' string is translated in `lib` - not in `core`.

Signed-off-by: Azul <azul@riseup.net>
 2021-12-16 18:23:12 +00:00
Christopher Ng
7479edbc1e Migrate profile_config id column to bigint 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-12-15 19:30:15 +00:00
MichaIng
a31ee8d9f3
Merge pull request #30236 from nextcloud/backport/30200/stable23 
[stable23] Don't check the configvalue for lastLogin which is never null
 2021-12-13 15:20:40 +01:00
Joas Schilling
dd2c1c6fb8
Make psalm more happy 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 13:49:15 +01:00
Joas Schilling
39d6624ab3
Fix docs to make Psalm happier 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 13:49:09 +01:00
Joas Schilling
955c0d4885
Convert strict_search to wildcard property and add psalm docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 13:49:03 +01:00
Joas Schilling
898c11c3b4
Limit more contact searches 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 13:48:55 +01:00
Joas Schilling
daad1ce010
Only limit search in the system address book 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 13:48:47 +01:00
Joas Schilling
b5d78d0b7c
Only wildcard search if enumeration is allowed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 13:48:41 +01:00
Joas Schilling
995b45bb62 Don't check the configvalue for lastLogin which is never null 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 08:43:13 +00:00
Vincent Petry
1fc27e771c
Merge pull request #30180 from nextcloud/backport/30160/stable23 
[stable23] Check resource before closing in encryption wrapper
 2021-12-10 08:55:50 +01:00
Vincent Petry
1291abc130 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:03:08 +00:00
Christopher Ng
3600b84e6e Fix relation "user_id" already exists migration error 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-12-09 23:07:30 +00:00
Côme Chilliet
f889b251b1 Avoid assignment in if clause 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-06 14:22:05 +00:00
Côme Chilliet
3fe20bfbbb Fix typing problems in OC_Image 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-06 14:22:05 +00:00
Côme Chilliet
11b51ddbbe 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-06 14:22:05 +00:00
Christoph Wurst
f88f57612b
Merge pull request #30025 from nextcloud/backport/30012/stable23 
[stable23] Only check the twofactor state once per request
 2021-12-06 14:49:45 +01:00
blizzz
76fa257789
Merge pull request #30036 from nextcloud/backport/30011/stable23 
[stable23] Allow to log queries to db, ldap and redis
 2021-12-03 11:53:59 +01:00
Robin Appelman
349555478f code checker fixes for instanceOfStorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-12-02 17:47:06 +00:00
Robin Appelman
c9db02a921 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 17:47:05 +00:00