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
Roeland Jago Douma
86de5d9265
Explicitly check hex2bin input
...
For #23197
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-22 14:01:25 +02:00
Morris Jobke
3c9b923eb1
Merge pull request #26684 from nextcloud/backport/26474/stable20
...
[stable20] Mention MariaDB in MySQL support warning
2021-04-22 09:47:45 +02:00
Nextcloud bot
bef596de06
[tx-robot] updated from transifex
2021-04-22 02:26:44 +00:00
Claas Augner
3082777bfd
Mention MariaDB in MySQL support warning
2021-04-21 14:45:41 +00:00
Christoph Wurst
98472c2f85
Merge pull request #26640 from nextcloud/backport/26625/stable20
...
[stable20] Fix empty password check for mail shares
2021-04-21 15:43:30 +02:00
Morris Jobke
adf259d6c7
Merge pull request #26678 from nextcloud/backport/26658/stable20
...
[stable20] Do not stop directory listing when ACL is blocking access
2021-04-21 14:21:11 +02:00
Julius Härtl
0a24fcfc34
Continue iterating over diretory contents and just hide file if denied by acl
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-04-21 07:24:25 +00:00
Vincent Petry
6bd49e256b
Fix empty password check for mail shares
...
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-04-21 08:00:29 +02:00
Nextcloud bot
80d93acff0
[tx-robot] updated from transifex
2021-04-21 02:26:25 +00:00
Morris Jobke
72857fe0b1
Merge pull request #26656 from nextcloud/psalm/noid/update-psalm-baseline/stable20
...
[stable20] Update psalm baseline
2021-04-20 17:50:48 +02:00
Vincent Petry
cea228ef50
Update psalm baseline
...
And backport error suppression from stable21 in SFTP class.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-04-20 17:13:31 +02:00
Roeland Jago Douma
fc118f1291
Merge pull request #26642 from nextcloud/backport/26639/stable20
...
[stable20] ensure redis returns bool for hasKey
2021-04-20 16:25:32 +02:00
Roeland Jago Douma
bf7eafcda3
Merge pull request #26620 from nextcloud/backport/26614/stable20
...
[stable20] Update root.crl due to revoked news.crt
2021-04-20 15:09:54 +02:00
Morris Jobke
342a6f51d2
Merge pull request #26643 from nextcloud/backport/26633/stable20
...
[stable20] Make lookup search explicit
2021-04-20 14:28:24 +02:00
Roeland Jago Douma
e5edc58d11
Make lookup search explicit
...
Speedsup sharee lookup quite a bit.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-20 08:37:48 +00:00
Arthur Schiwon
89960468ae
ensure redis returns bool for hasKey
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-04-20 08:36:55 +00:00
Morris Jobke
bd16ddd675
Merge pull request #26637 from nextcloud/backport/26615/stable20
...
[stable20] Require read permissions for federated shares
2021-04-20 09:06:40 +02:00
Nextcloud bot
a4c55e4601
[tx-robot] updated from transifex
2021-04-20 02:26:21 +00:00
Roeland Jago Douma
0324e078f8
Require read permissions for federated shares
...
Else they end up as weird shares that can't be properly utilized by
other parties anyway.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-19 19:54:24 +00:00
Morris Jobke
db87149a47
Merge pull request #26622 from nextcloud/backport/26613/stable20
...
[stable20] Do not allow adding file drop shares to your own cloud
2021-04-19 21:48:52 +02:00
Roeland Jago Douma
12504d4ab7
Do not allow adding file drop shares to your own cloud
...
There is no reason for this and you can't create such shares normally
anyway.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-19 13:01:05 +00:00
Morris Jobke
d42540fe8d
Update root.crl due to revoked news.crt
...
See https://github.com/nextcloud/app-certificate-requests/pull/382
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-04-19 12:13:56 +00:00
Roeland Jago Douma
70d625fb50
Merge pull request #26602 from nextcloud/dependabot/npm_and_yarn/stable20/ssri-6.0.2
...
[Security] Bump ssri from 6.0.1 to 6.0.2
2021-04-19 12:46:12 +02:00
Nextcloud bot
ed5f446ec1
[tx-robot] updated from transifex
2021-04-19 02:26:26 +00:00
Nextcloud bot
90ea283913
[tx-robot] updated from transifex
2021-04-18 02:24:30 +00:00
Nextcloud bot
36a16bcf63
[tx-robot] updated from transifex
2021-04-17 02:24:25 +00:00
dependabot-preview[bot]
8e4a93fc53
[Security] Bump ssri from 6.0.1 to 6.0.2
...
Bumps [ssri](https://github.com/npm/ssri ) from 6.0.1 to 6.0.2. **This update includes a security fix.**
- [Release notes](https://github.com/npm/ssri/releases )
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md )
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-16 22:06:01 +00:00
Nextcloud bot
e57f65cdfe
[tx-robot] updated from transifex
2021-04-16 02:26:13 +00:00
Nextcloud bot
36d2bb05cf
[tx-robot] updated from transifex
2021-04-15 02:25:32 +00:00
Nextcloud bot
d35011b3f7
[tx-robot] updated from transifex
2021-04-14 02:27:12 +00:00
Nextcloud bot
bb6dc44afb
[tx-robot] updated from transifex
2021-04-13 02:25:18 +00:00
Roeland Jago Douma
e5f30d010d
Merge pull request #26515 from nextcloud/backport/26439/stable20
...
[stable20] Increase subnet matcher
2021-04-12 13:32:14 +02:00
Lukas Reschke
61545e7a89
Increase subnet matcher
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2021-04-12 10:36:26 +00:00
Roeland Jago Douma
5517ce19ce
Merge pull request #26509 from nextcloud/backport/26230/stable20
...
[stable20] l10n: Add word user in FederatedShareProvider.php
2021-04-12 10:17:57 +02:00
Valdnet
1e4fc523fe
l10n: Add word user in FederatedShareProvider.php
...
Standardizing text strings with other Nextcloud applications.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-12 06:43:54 +00:00
Nextcloud bot
0cdfea022d
[tx-robot] updated from transifex
2021-04-12 02:25:16 +00:00
Nextcloud bot
7faa8e697b
[tx-robot] updated from transifex
2021-04-11 02:25:03 +00:00
Nextcloud bot
ff2a0b3126
[tx-robot] updated from transifex
2021-04-10 02:31:32 +00:00
Nextcloud bot
e78e509618
[tx-robot] updated from transifex
2021-04-09 02:25:30 +00:00
Roeland Jago Douma
7022222ac2
Merge pull request #26454 from nextcloud/version/20.0.9/final
...
20.0.9 final
2021-04-08 14:39:29 +02:00
Roeland Jago Douma
bb0966f1c7
Merge pull request #26449 from nextcloud/3rdparty/stable20/phpseclib-2.0.31
...
[3rdparty][stable20] phpseclib-2.0.31
2021-04-08 14:37:17 +02:00
Roeland Jago Douma
a23bed0386
[3rdparty][stable20] phpseclib-2.0.31
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-08 11:47:56 +02:00