Commit Graph

56534 Commits

Author SHA1 Message Date
Christoph Wurst a82d72e5ce Only perform login check during ownership transfer for encryption
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-05-03 11:37:59 +00:00
Nextcloud bot cb58b11f19
[tx-robot] updated from transifex 2021-05-03 02:25:55 +00:00
Nextcloud bot 0ca700e916
[tx-robot] updated from transifex 2021-05-02 02:25:43 +00:00
Nextcloud bot a27a241d25
[tx-robot] updated from transifex 2021-05-01 02:26:54 +00:00
Roeland Jago Douma f2f15a7b42
Merge pull request #26836 from nextcloud/version/20.0.10/final
20.0.10 RC1
2021-04-30 12:47:19 +02:00
Roeland Jago Douma 12ed9c5cda Update bundle
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-30 12:17:11 +02:00
Roeland Jago Douma 31b6443091
Merge pull request #26542 from nextcloud/stable20-26433
[stable20] Limit size of properties to 2048 characters
2021-04-30 09:27:45 +02:00
Nextcloud bot 3b1ac61331
[tx-robot] updated from transifex 2021-04-30 02:28:11 +00:00
Roeland Jago Douma f8985dcd7c 20.0.10 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-29 20:56:12 +02:00
Roeland Jago Douma f902adf188
Merge pull request #25973 from nextcloud/backport/25417/stable20-fix-account-data-visibility-after-disabling-public-addressbook-upload
[stable20] Fix account data visibility after disabling public addressbook upload
2021-04-29 20:52:38 +02:00
Lukas Reschke 4ec4a99869 Limit size of properties to 2048 characters
It is unreasonable to expect that one of these fields would be longer
than 2048 characters. Whilst some have definitely lower limits (such as
for phone numbers or domain names), a upper bound as sanity check makes
sense.

Backport of https://github.com/nextcloud/server/pull/26433

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2021-04-29 20:45:11 +02:00
Morris Jobke c8374de7eb
Merge pull request #26824 from nextcloud/backport/26811/stable20
[stable20] Do not try to contact lookup server if not needed
2021-04-29 15:50:18 +02:00
Roeland Jago Douma 02001520e0 Do not try to contact lookup server if not needed
In some cases (for example you never send data to the lookup server)
there is no need for this job to even try.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-29 09:23:02 +02:00
Nextcloud bot eb93e0dd29
[tx-robot] updated from transifex 2021-04-29 02:26:50 +00:00
Julius Härtl 82b93f1cf0
Merge pull request #26809 from nextcloud/backport/26647/stable20
[stable20] Fail when creating new files with an empty path
2021-04-28 15:56:49 -01:00
Julius Härtl 4f8c89f8a5 Fail when creating new files with an empty path
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-04-28 10:06:03 +00:00
Julius Härtl b5574db974
Merge pull request #26798 from nextcloud/backport/26785/stable20
[stable20] LDAP: do not bother to search after the last page
2021-04-28 08:46:08 -01:00
Joas Schilling f8f32d79d7
Merge pull request #26788 from nextcloud/backport/26718/stable20
[stable20] Fix ratelimit template
2021-04-28 09:54:14 +02:00
Nextcloud bot c5ac15925b
[tx-robot] updated from transifex 2021-04-28 02:26:07 +00:00
Arthur Schiwon 46ae746379 do not try to search after the last page
- saves an LDAP requests in these cases
- prevents a Protocol Error logged on < 7.3 API (for backports)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-04-27 17:41:58 +00:00
Joas Schilling 498ac1c6f5 Do not allow to overwrite some variables
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-27 13:39:53 +00:00
Joas Schilling 2b0fd23ecf Fix ratelimit template
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-27 13:39:52 +00:00
Morris Jobke f369fdaf94
Merge pull request #26779 from nextcloud/backport/26765/stable20
[stable20] No longer add trusted servers on federated share creation
2021-04-27 14:47:05 +02:00
Julius Härtl 2774ae508c
Merge pull request #26705 from nextcloud/backport/26627/stable20
[stable20] update icewind/smb to 3.4.1
2021-04-27 05:51:19 -01:00
Roeland Jago Douma 42a6ac89bb No longer add trusted servers on federated share creation
It was disabled by default for ages. And often resulted in unwanted
behavior. If admins want trusted servers they just have to do it
manually.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-27 06:11:01 +00:00
Nextcloud bot b8fc36c6be
[tx-robot] updated from transifex 2021-04-27 02:25:56 +00:00
Roeland Jago Douma 68fde88909
Merge pull request #26771 from nextcloud/backport/26763/stable20
[stable20] Improve federated permission handling
2021-04-26 20:51:49 +02:00
Julius Härtl 0f0c8debd9
Merge pull request #26767 from nextcloud/backport/26762/stable20 2021-04-26 16:16:17 -01:00
Roeland Jago Douma 9501514055 Improve federated permission handling
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-26 15:27:05 +00:00
Joas Schilling bcf9c14047 Log deprecation only as debug
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-26 15:14:55 +00:00
Joas Schilling 56d7b1a382 Respect the error level when logging
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-26 15:14:53 +00:00
Roeland Jago Douma 0cb66c5ca0
Merge pull request #26753 from nextcloud/backport/26721/stable20
[stable20] private cannot be final
2021-04-26 10:28:43 +02:00
Maxence Lange 0145fd0b5c private cannot be final
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2021-04-26 07:08:14 +00:00
Nextcloud bot 07b94975d4
[tx-robot] updated from transifex 2021-04-26 02:24:59 +00:00
Nextcloud bot 09c8c985e1
[tx-robot] updated from transifex 2021-04-25 02:25:15 +00:00
Nextcloud bot 1c784b1bf2
[tx-robot] updated from transifex 2021-04-24 02:26:59 +00:00
Daniel Calviño Sánchez 546be0ea63 Handle corrupted scope values
Due to a bug (fixed some commits ago) in the UsersController of the
settings app the scope of the properties can be null (for example, if
lookup server upload was disabled and the user then changed the display
name in the profile information). In that case now the scope menu icon
shows an error to inform the user.

The scope value will not change when other properties are modified until
the user chooses an explicit value from the menu. Note that until a
scope is explicitly set the property will behave as if it is private.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:58 +02:00
Daniel Calviño Sánchez e929d16bbb Fix settings scope menu hidden when lookup server upload is disabled
When upload to the lookup server is disabled the scope menu was hidden
in the personal information settings. However, even if the lookup server
upload is disabled the personal information is still accesible from the
local server as well as trusted servers. Users should be able to still
set if their information is available to other users or if it is
private, so now the scope menu is always show (although the "Public"
option is hidden if the lookup server upload is disabled).

If the user set the information as public before the upload to the
lookup server was disabled the menu will also show the "Public" option
as active, although disabled. Setting the visibility to any of the other
options will hide the "Public" option from the menu (until the lookup
server upload is enabled again).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:58 +02:00
Daniel Calviño Sánchez 4e05a486a3 Add integration tests for searching users in contacts menu
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:57 +02:00
Daniel Calviño Sánchez 67b49edac4 Make possible to set body in requesttoken requests in integration tests
"sendingAToWithRequesttoken" needs to be used to test some non OCS
endpoints which require the request token to be sent in the request. Now
it is possible to specify the body (or, rather, additional contents
beside the cookies and the request token) for those requests, as it will
be needed for example to update the user profile.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:57 +02:00
Daniel Calviño Sánchez 77aba3df3c Fix deleting properties of user settings when not given explicitly
The controller can receive an optional subset of the properties of the
user settings; values not given are set to "null" by default. However,
those null values overwrote the previously existing values, so in
practice any value not given was deleted from the user settings. Now
only non null values overwrite the previous values.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:57 +02:00
Daniel Calviño Sánchez 0ddd892736 Fix TypeError when "email" is not given in the controller request
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:57 +02:00
Daniel Calviño Sánchez 0dfd0ec77a Respect additional user settings not covered by the controller
"AccountManager::updateUser()" wipes previous user data with whichever
user data is given (except for some adjustments, like resetting the
verified status when needed). As the controller overrode the properties
those properties would lose some of their attributes even if they are
not affected by the changes made by the controller. Now the controller
only modifies the attributes set ("value" and "scope") to prevent that.

Note that with this change the controller no longer removes the
"verified" status, but this is not a problem because, as mentioned,
"AccountManager::updateUser()" resets them when needed (for example,
when the value of the website property changes).

This change is a previous step to fix overwritting properties with null
values, and it will prevent the controller from making unexpected
changes if more attributes are added in the future.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:56 +02:00
Daniel Calviño Sánchez bedb97fd57 Add more unit tests for setting user settings
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:55 +02:00
Daniel Calviño Sánchez 1c8295610b Change default test data to values less similar to empty values
Right now it makes no difference, but this should make future tests
clearer, specially in case of failure.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:52 +02:00
Daniel Calviño Sánchez 91e06bc08a Extract default test data to a helper getter
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:49 +02:00
Daniel Calviño Sánchez 32fd379b66 Use constants from interface rather than class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 16:53:48 +02:00
Nextcloud bot a335ff969d
[tx-robot] updated from transifex 2021-04-23 02:26:35 +00:00
Morris Jobke 35189a914b
Merge pull request #26693 from nextcloud/backport/25714/stable20
[stable20] Explicitly check hex2bin input
2021-04-22 20:54:46 +02:00
Robin Appelman 9318f2d668 update icewind/smb to 3.4.1
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-04-22 18:01:54 +00:00