Commit Graph

53764 Commits

Author SHA1 Message Date
Daniel Calviño Sánchez 8e5aa03834 Fix enabling send password by Talk with same password in mail shares
When "send password by Talk" is enabled in a mail share a new password
must be also set. However, when the passwords of the original and the
new share were compared it was not taken into account that the original
password is now hashed, while the new one is not (unless no new password
was sent, in which case the password of the original share was set in
the new share by the controller, but that was already prevented due to
both passwords being literally the same), so it was possible to set the
same password again.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 11:37:43 +00:00
Daniel Calviño Sánchez 9df3ea94b8 Fix enabling send password by Talk with empty password in link shares
When "send password by Talk" is enabled in a link share now a non empty
password is enforced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 11:37:43 +00:00
Daniel Calviño Sánchez 9a5b51d43c Fix creating a mail share with a password
When a mail share was created with a password the given password was not
hashed, so it was not possible to open the share with that password.
Moreover, if passwords were enforced the given password was ignored and
a new one was set (although in this case it was hashed so it worked as
expected). Now the given password is properly hashed and not overriden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 11:37:43 +00:00
Daniel Calviño Sánchez 5de6eb07c0 Extend mail shares unit tests to check the password and mail template
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 11:37:42 +00:00
Roeland Jago Douma bed5c21b5a
Merge pull request #21148 from nextcloud/backport/21146/stable19
[stable19] Fix reference to wrong class name
2020-05-29 10:12:30 +02:00
Daniel Calviño Sánchez e9ccb802e8 Fix reference to wrong class name
\OCP\IShare does not exist; the right name is \OCP\Share\IShare,
although it is already imported as IShare.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 06:48:00 +00:00
Roeland Jago Douma 89f0785c1d
Merge pull request #21135 from nextcloud/backport/21065/stable19
[stable19] Clear the statscache before fetching the metadata
2020-05-28 19:44:35 +02:00
Roeland Jago Douma d12e379c96
Merge pull request #21128 from nextcloud/backport/21123/stable19
[stable19] simplify getGroups, fixing wrong chunking logic
2020-05-28 14:59:50 +02:00
Roeland Jago Douma 9d2d3c4809 Clear the statscache before fetching the metadata
Else if a lot of writes happen. It might happen that an old stat result
is used. Resulting in a wrong file size for the file. For example the
text app when a lot of people edit at the same time.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-28 10:30:35 +00:00
Christoph Wurst bdb9f31cf1
Merge pull request #21126 from nextcloud/fix/make-translation-sanitization-optional-stable19
[stable19] Make the translation sanitization optional
2020-05-28 09:40:20 +02:00
Roeland Jago Douma e33055a318
Merge pull request #21131 from nextcloud/backport/20933/stable19
[stable19] Move the password confirmation form template to post
2020-05-28 08:17:15 +02:00
Roeland Jago Douma 3ce43c7d71 Move the password confirmation form template to post
I know we use JS for this. But it triggers some false positives on
testing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-27 17:58:04 +00:00
Arthur Schiwon 1e5295138a simplify getGroups, fixing wrong chunking logic
pagination is taken care of properly in the search logic in Access class

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-05-27 17:38:45 +00:00
Christoph Wurst 14b618bcaf
Fix devices & sessions sanitization
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-05-27 15:57:18 +02:00
Christoph Wurst 539e46a07e
Make the translation sanitization optional
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-05-27 15:55:40 +02:00
blizzz 03a1932b15 Merge pull request #21114 from nextcloud/backport/21106/stable19
[stable19] use the loginname to verify the old password in user password changes
2020-05-27 10:19:22 +02:00
Arthur Schiwon 557a3754c1 use the loginname to verify the old password in user password changes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-05-26 19:20:42 +00:00
Morris Jobke 1d1a9ba5a0
Merge pull request #21111 from nextcloud/backport/21108/stable19
[stable19] fixes infinitely repeating LDPA search results with PHP <= 7.2
2020-05-26 15:41:17 +02:00
Arthur Schiwon d0559a4871 fixes infinitely repeating LDPA search results with PHP <= 7.2
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-05-26 09:56:10 +00:00
Roeland Jago Douma 24e97c1a7c
Merge pull request #21095 from nextcloud/backport/21090/stable19
[stable19] Do not read certificate bundle from data dir by default
2020-05-26 11:43:46 +02:00
Morris Jobke 3bf0285840
Merge pull request #21068 from nextcloud/backport/20776/stable19
[stable19] Improve group queries
2020-05-26 10:38:17 +02:00
Roeland Jago Douma 9c63433cde
Merge pull request #21060 from nextcloud/version/19/final
19 Final
2020-05-26 10:04:27 +02:00
Roeland Jago Douma a283200dcb
Merge pull request #21105 from nextcloud/backport/21092/stable19
Update recommended apps
2020-05-26 10:01:23 +02:00
Julius Härtl abecd5696b Update hub bundle and add proxy rule to htaccess
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-25 19:52:22 +00:00
Morris Jobke ebbdd2de33 Do not read certificate bundle from data dir by default
Before the resources/config/ca-bundle.crt was only used when the list of custom
certificates was empty and the instance was not installed. But it should also
be used when the list is empty and the instance is installed.

This is inverting the logic to stop if the instance is not installed to use the
default bundle. And it also does this when the list is empty.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-05-25 17:51:03 +00:00
Roeland Jago Douma 444b28adf6 Improve group queries
Before we'd also get the diplayname for each group in the backend. In a
separate query. This is of course not ideal as this information is
obtained on each and every query. Now this is queried once and properly
cached.

Also added more caching to the manager.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-22 12:22:03 +00:00
Roeland Jago Douma 13e6a0db2c
19 Final
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-21 09:32:28 +02:00
Roeland Jago Douma 33b06cfa0c
Merge pull request #20964 from nextcloud/version/19/rc3
19 RC3
2020-05-20 19:53:56 +02:00
Morris Jobke 138eddc0f1
Merge pull request #21028 from nextcloud/backport/20629/stable19
[stable19] Don't load text file preview when text app is available (Fixes: #20615)
2020-05-20 13:54:17 +02:00
Morris Jobke 703d8f2adc
Merge pull request #21052 from nextcloud/backport/21050/stable19
[stable19] Caching and compression for app store requests
2020-05-20 13:23:00 +02:00
Morris Jobke 745667e426 Compress the appstore requests by default
In test it reduced the transfered data from 5 MB to 2 MB. This should reduce the load on the appstore significantly.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-05-20 09:07:35 +00:00
Morris Jobke 5c0f06b259 Cache appstore requests for 60 instead of 5 minutes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-05-20 09:07:35 +00:00
Roeland Jago Douma 5763ce2761
Merge pull request #21047 from nextcloud/backport/21041/stable19
[stable19] Copy over the ETag and LastModified when formatting a Dataresponse
2020-05-19 20:40:47 +02:00
Roeland Jago Douma b9cb5a74cc Copy over the ETag and LastModified when formatting a Dataresponse
This way the ETag checks etc are all working.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-19 12:51:06 +00:00
Roeland Jago Douma 822d3f0e8b
Merge pull request #21029 from nextcloud/backport/21003/stable19
[stable19] Remove entries from locales.json incompatible with punic
2020-05-19 12:05:06 +02:00
Roeland Jago Douma e003fcd806
Merge pull request #21032 from nextcloud/backport/20846/stable19
[stable19] Link permissions
2020-05-19 11:57:15 +02:00
Julius Härtl dd15780edd Fix share update test
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-05-18 13:47:39 +00:00
Roeland Jago Douma 214221574b Update public link share permission code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-18 13:47:39 +00:00
Roeland Jago Douma aac0dd1f20 Have share permissions on link shares if it is enabled
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-18 13:47:38 +00:00
Daniel Kesselberg b0cfa3ed22 Remove entries from locales.json incompatible with punic
As reported at https://github.com/nextcloud/server/issues/20999 the list contains en_US_POSIX as locale but punic is unable to parse such a locale. If you select that locale everyone is confused.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-05-18 09:53:47 +00:00
Morris Jobke 231eaf6ffd
Merge pull request #20991 from nextcloud/backport/20941/stable19
[stable19] update icewind/smb to 3.2.4
2020-05-18 11:03:39 +02:00
Jonas Meurer be37ca1776 Don't load text file preview when text app is available (Fixes: #20615)
When opening a shared text document, the files_sharing app uses
internal preview support in case no other app to open the text file is
available.

So far, it only checks for the old files_texteditor app, not for the new
new text app. This commit fixes this by checking for both.

Signed-off-by: Jonas Meurer <jonas@freesources.org>
2020-05-18 08:59:53 +00:00
Robin Appelman ffc3b48a40 update icewind/smb to 3.2.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-05-15 12:35:22 +00:00
Roeland Jago Douma 9d7198f31e
Merge pull request #20963 from nextcloud/backport/20947/stable19
[stable19] Bump yargs-parser
2020-05-14 11:51:07 +02:00
Roeland Jago Douma c4b2b1ec7d
19 RC3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-14 08:45:14 +02:00
Christoph Wurst 1310836edd Bump yargs-parser
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-05-14 06:43:30 +00:00
Roeland Jago Douma b0a7ff1a99
Merge pull request #20850 from nextcloud/version/19/rc2
19 RC2
2020-05-14 08:14:25 +02:00
Roeland Jago Douma 321551a94f
19 RC2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-14 08:11:00 +02:00
Roeland Jago Douma 60fd1a30b2
Merge pull request #20960 from nextcloud/backport/20952/stable19
[stable19] Respect exit code of lint run - changed from -exec to xargs as this e…
2020-05-14 08:09:04 +02:00
Roeland Jago Douma 3d201d70ba
Merge pull request #20961 from nextcloud/backport/20958/stable19
[stable19] Allow links to conversations
2020-05-14 08:08:50 +02:00