upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
56026 commits 985 branches 1211 tags 9.7 GiB
Commit graph

10676 commits

Author SHA1 Message Date
Roeland Jago Douma
cb958df63a Catch throwable instead of exception 
The error that gets thrown can also be a type error etc. So we should
properly catch the Throwable.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-07 14:25:15 +00:00
Morris Jobke
fb0067a777
Merge pull request #24592 from nextcloud/backport/23912/stable20 
[stable20] use in objectstore copy
 2021-01-07 13:28:10 +01:00
Roeland Jago Douma
0f395d8527
Merge pull request #24976 from nextcloud/backport/24961/stable20 
[stable20] Fix unreliable ViewTest
 2021-01-07 13:17:29 +01:00
Roeland Jago Douma
82fab4d621 Set the JSCombiner cache if needed 
Found while debugging a customer setup. They had to flush their Redis.
Hence the info was no longer there. Since they also used S3 this meant
requesting the files over and over on template render. Which on S3 is
not cheap.

Now we just write it back if we can't get it from the cache in the first
place. So that the next run has it cached properly again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-07 07:43:25 +00:00
Julius Härtl
8d9fa73371
Properly handle result when copying with failure and throw in tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-05 16:57:51 +01:00
Julius Härtl
3666754be7
Show unique displayname context in the sharing input 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-05 10:05:52 +01:00
Roeland Jago Douma
6762e616f5 Avoid huge exception argument logging 
In some cases it might happen that you have an argument that deep down
somewhere has an array with a lot of entries (think thousands). Now
before we would just happily print them all. Which would fill the log.

Now it will just print the first 5. And add a line that there are N
more.

If you are on debug level we will still print them all.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-29 10:46:56 +00:00
Roeland Jago Douma
1935993e47
Merge pull request #24709 from nextcloud/backport/24683/stable20 
[stable20] [Fix #24682]: ensure federation cloud id is retruned if FN property not found
 2020-12-28 11:24:29 +01:00
J0WI
d749f515de Fix IPv6 localhost regex 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2020-12-22 20:55:55 +00:00
Guillaume Virlet
a8f60c82e4 [Fix #24682]: ensure federation cloud id is retruned if FN property not found 
Signed-off-by: Guillaume Virlet <github@virlet.org>
 2020-12-21 22:59:43 +01:00
Roeland Jago Douma
34b8e42bf0 Actually set the TTL on redis set 
Else well the keys remain for ever and ever.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-21 13:51:18 +00:00
Roeland Jago Douma
98c235a436
Merge pull request #24751 from nextcloud/backport/24737/stable20 
[stable20] Also unset the other possible unused paramters
 2020-12-21 11:43:49 +01:00
Daniel Kesselberg
d22ff8624b Limit getIncomplete query to one row 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-12-21 08:17:46 +00:00
Roeland Jago Douma
5de0c3c5f7 Also unset the other possible unused paramters 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-18 07:41:00 +00:00
Julius Härtl
55d7848384 Do not include non-required scripts on the upgrade page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-15 20:42:07 +00:00
Roeland Jago Douma
9305a00414
Merge pull request #24546 from nextcloud/backport/24543/stable20 
[stable20] Don't log params of imagecreatefromstring
 2020-12-15 16:36:00 +01:00
Christoph Wurst
0ae5c8dd3b Check php compatibility of app store app releases 
Apps might increase the minimum php version requirement, in which case
an update could break the app or even the whole instance. We must not
install those releases, or better, don't even show them for
update/installation. This extends the app fetcher code to filter out the
releases that are not installable.

The filter respects minimum and maximum requirements. E.g. apps that are
still only released for php7.3 won't show up for php7.4 instances. This
behavior is new but if an app lists an explicit version requirement,
then we ought to repect that.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-14 17:22:10 +00:00
Julius Härtl
b84bdb1080
Make sure the migrations table schema is always checked 
Signed-off-by: Julius Härtl <jus@bitgrid.net>

Revert "Make sure the migrations table schema is always checked"

This reverts commit 258955ef738a52d9da2ac2fe59466e6093d7e9bc.

Set current vendor during upgrade and perform migrations table change if needed

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:12:52 +01:00
Julius Härtl
368dac3ba3
Properly migrate from new owncloud avatar location 
as the files are not scanned we cannot use the OCP\Files api

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:12:52 +01:00
Julius Härtl
7ce95a4fcb
Readd repair steps that are relevant when migrating from ownCloud 
This reverts commit d9b1492e03.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:12:52 +01:00
Julius Härtl
ab40a7c585
Allow major/minor match for owncloud version 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:12:50 +01:00
Julius Härtl
934f8a17f9
Avoid checking for brute force protection capabilities when upgrading 
This might happen a releases that doesn't have this table yet

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:12:50 +01:00
Julius Härtl
5d2988e3bd
Drop fk constraints on locks table 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:12:49 +01:00
Robin Appelman
694032c54c use in objectstore copy 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-12-07 16:07:21 +00:00
Morris Jobke
607e902070 Fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-12-04 15:56:29 +00:00
Roeland Jago Douma
e6947bd6ca Remember me is not an app_password 
While technically they are stored the same. This session variable is
used to indicate that a user is using an app password to authenticate.
Like from a client. Or when having it generated automatically.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-04 15:56:24 +00:00
Roeland Jago Douma
233d4164a6
Merge pull request #24553 from nextcloud/backport/24550/stable20 
[stable20] Generate a new session id if the decrypting the session data fails
 2020-12-04 16:09:52 +01:00
Morris Jobke
b1e9752169
Revert "Do not read certificate bundle from data dir by default" 
This reverts commit 18b0d753f2.
 2020-12-04 13:37:10 +01:00
Roeland Jago Douma
f52337e8be Generate a new session id if the decrypting the session data fails 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-04 11:55:31 +00:00
Vincent Petry
d4d009fc8e Don't log params of imagecreatefromstring 
To prevent flooding the log with actual image data.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2020-12-04 09:45:29 +00:00
Roeland Jago Douma
ce953d1571
Merge pull request #24532 from nextcloud/backport/24409/stable20 
[stable20] Also run repair steps when encryption is disabled but a legacy key is present
 2020-12-03 12:22:41 +01:00
Morris Jobke
1a041f7ac7
Merge pull request #24530 from nextcloud/fix/stable20-nextcloud-log-normalizer 
[stable20] Replace abandoned log normalizer with our fork
 2020-12-03 11:14:46 +01:00
Julius Härtl
14d95cb2e3 Also handle legacy cipher support when encryption is disabled but an old master key is present 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-03 09:56:59 +00:00
Christoph Wurst
67e5af58ed
Replace abandoned log normalizer with our fork 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-03 09:50:10 +01:00
Roeland Jago Douma
428f0ec151 Fix vsprint parameter 
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-03 08:20:04 +00:00
Roeland Jago Douma
bdbb60a67b
Merge pull request #24509 from nextcloud/backport/23257/stable20 
[stable20] Fix file size computation on 32bit platforms
 2020-12-02 20:03:24 +01:00
Morris Jobke
a8780debd3 Add notification for user limit 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-12-02 17:24:44 +00:00
Morris Jobke
d2fd49c461 Allow subscription to indicate that a userlimit is reached 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-12-02 17:24:42 +00:00
aler9
dc7eb53a8f Fix file size computation on 32bit platforms 
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
 2020-12-02 15:27:30 +00:00
Morris Jobke
86da5013c8
Merge pull request #24325 from nextcloud/backport/24103/stable20 
[stable20] Only check path for being accessible when the storage is a object home
 2020-12-01 11:04:22 +01:00
Roeland Jago Douma
2003995e32
Merge pull request #24353 from nextcloud/backport/24162/stable20 
[stable20] set the display name of federated sharees from addressbook
 2020-11-25 16:18:23 +01:00
Arthur Schiwon
4e6f0df777
send expected format of cloud id 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-11-25 14:16:08 +01:00
Arthur Schiwon
c9814c716a
set the display name of federated sharees from addressbook 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-11-24 22:52:31 +01:00
Christoph Wurst
4b9d8c75ec Fix the config key on the sharing expire checkbox 
We don't use `shareapi_internal_enforce_expire_date` anywhere.
`shareapi_enforce_internal_expire_date` is the one we want.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-11-24 14:54:02 +00:00
Julius Härtl
866e273599 Only check path for being accessible when the storage is a object home 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-24 09:14:39 +00:00
Morris Jobke
347aaf23b2
Merge pull request #24249 from nextcloud/backport/24241/stable20 
[stable20] Harden EncryptionLegacyCipher a bit
 2020-11-20 22:42:17 +01:00
Carlos Ferreira
a8ba2df8e6 Simple typo in comments 2020-11-20 19:45:23 +00:00
Morris Jobke
e0e3334fc2
Merge pull request #24230 from nextcloud/backport/24007/stable20 
[stable20] allow selecting multiple columns with SELECT DISTINCT
 2020-11-20 14:27:27 +01:00
Morris Jobke
7fa352b28c
Merge pull request #24228 from nextcloud/backport/24135/stable20 
[stable20] Fix nextcloud logo in email notifications misalignment
 2020-11-20 14:23:00 +01:00
Roeland Jago Douma
06286f8c0e Harden EncryptionLegacyCipher a bit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-20 13:18:25 +00:00