Commit Graph

60105 Commits

Author SHA1 Message Date
Christoph Wurst
7dd7256cfe
Prevent duplicate auth token activity updates
The auth token activity logic works as follows
* Read auth token
* Compare last activity time stamp to current time
* Update auth token activity if it's older than x seconds

This works fine in isolation but with concurrency that means that
occasionally the same token is read simultaneously by two processes and
both of these processes will trigger an update of the same row.
Affectively the second update doesn't add much value. It might set the
time stamp to the exact same time stamp or one a few seconds later. But
the last activity is no precise science, we don't need this accuracy.

This patch changes the UPDATE query to include the expected value in a
comparison with the current data. This results in an affected row when
the data in the DB still has an old time stamp, but won't affect a row
if the time stamp is (nearly) up to date.

This is a micro optimization and will possibly not show any significant
performance improvement. Yet in setups with a DB cluster it means that
the write node has to send fewer changes to the read nodes due to the
lower number of actual changes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-22 09:32:22 +02:00
Julien Veyssier
0bef570fe9
Merge pull request #29256 from nextcloud/fix/noid/harmonize-appstoreenabled-check
Fix appstoreenabled check
2021-10-21 12:42:14 +02:00
Louis
c5405befcf
Merge pull request #29346 from nextcloud/fix/biography-resize
Allow resize of Biography/About box
2021-10-21 10:57:49 +02:00
Louis
23582089f0
Merge pull request #29351 from nextcloud/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2021-10-21 10:53:49 +02:00
Joas Schilling
f24e8212c3
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-21 09:27:12 +02:00
nextcloud-command
bd95a77f25 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2021-10-21 04:11:44 +00:00
Nextcloud bot
732a057167
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2021-10-21 02:24:14 +00:00
blizzz
5f95a0636a
Merge pull request #29342 from nextcloud/fix/noid/upgrade-22.2-to-23
allow upgrading from 22.2.x
2021-10-20 19:28:00 +02:00
Christopher Ng
3afe3916cd Allow textarea resize
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2021-10-20 17:15:38 +00:00
John Molakvoæ
4dc226ee91
Merge pull request #27196 from nextcloud/fix/ApiControllerTest-testShowHiddenFiles 2021-10-20 18:48:04 +02:00
blizzz
07863f3de3
Merge pull request #29330 from nextcloud/fix/missing-profile-config-defaults
Populate missing profile config defaults
2021-10-20 18:26:25 +02:00
Arthur Schiwon
ed9199495e
allow upgrading from 22.2.x
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-10-20 18:01:43 +02:00
John Molakvoæ
49e727fe6a
Merge pull request #29334 from nextcloud/fix/dav-availability-settings-duplicate-slots 2021-10-20 17:38:23 +02:00
Christoph Wurst
1021c89454
Merge pull request #28314 from nextcloud/sharing-ibootstrap
move files_sharing to IBootStrap
2021-10-20 17:32:10 +02:00
Christoph Wurst
b98f3f31de
Merge pull request #29320 from nextcloud/bugfix/28261/fix-basic-auth-for-oauth-token-endpoint
Fix basic auth for OAuth token endpoint
2021-10-20 17:31:43 +02:00
Joas Schilling
0e951eb9dc
Merge pull request #29269 from nextcloud/feature/28751/provide-contactsmenu-as-ocs-simple
Add an OCS endpoint for the hovercard contact actions
2021-10-20 16:25:07 +02:00
Carl Schwan
cf6bac8d6e
Merge pull request #29313 from nextcloud/fix/status-menu-update
Fix status menu item not listening to status change events
2021-10-20 16:00:38 +02:00
Joas Schilling
7f1dc52a66
Change origin field to appId
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-20 14:47:28 +02:00
Joas Schilling
8ae93a7baf
Merge pull request #29260 from nextcloud/fix/user_status_enumeration2
Respect user enumeration settings in user status lists
2021-10-20 12:27:55 +02:00
blizzz
7aeec25960
Merge pull request #29255 from nextcloud/updateAppstoreCrl
update CRL after revocation of twofactor_rcdevsopenotp.crt
2021-10-20 12:22:33 +02:00
Christoph Wurst
e23a38e486
Prevent duplicate CalDAV availability slots for recurring slots
If there is the same time slot for more than one day, then we wrote two
recurring AVAILABILITY components before. With this patch equal blocks
are combined into one recurring component. This makes the generated
rules more compact and easier to work with.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-20 12:15:56 +02:00
John Molakvoæ
5e23800a95
Do not remove current user on findOne
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2021-10-20 11:53:45 +02:00
John Molakvoæ
873e8e219c
Add appName to contactsmenu action API
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2021-10-20 11:53:45 +02:00
Jonas Meurer
65cfe9df46
Add integration tests for user_status API
Signed-off-by: Jonas Meurer <jonas@freesources.org>
2021-10-20 11:33:37 +02:00
Jonas Meurer
3fe267b772
Respect user enumeration settings in user status lists
So far, the functions to find user statuses listed didn't respect user
enumeration settings (`shareapi_allow_share_dialog_user_enumeration`
and `shareapi_restrict_user_enumeration_to_group` core app settings).

Fix this privacy issue by returning an empty list in case
`shareapi_allow_share_dialog_user_enumeration` is unset or
`shareapi_restrict_user_enumeration_to_group` is set.

In the long run, we might want to return users from common groups if
`shareapi_restrict_user_enumeration_to_group` is set. It's complicated
to implement this in a way that scales, though. See the discussion at
https://github.com/nextcloud/server/pull/27879#pullrequestreview-753655308
for details.

Also, don't register the user_status dashboard widget at all if
`shareapi_allow_share_dialog_user_enumeration` is unset or
`shareapi_restrict_user_enumeration_to_group` is set.

Fixes: #27122

Signed-off-by: Jonas Meurer <jonas@freesources.org>
2021-10-20 11:33:23 +02:00
Joas Schilling
3ce3c0f117
Add an OCS endpoint for the hovercard contact actions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-20 10:22:40 +02:00
Carl Schwan
89112e5df9
Fix status menu item not listening to status change events
This makes it so that the status menu item listens to user_status:status.updated
events even when they are triggered outside of the user status modal.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2021-10-20 10:21:23 +02:00
Louis
2083e1ede2
Merge pull request #29331 from nextcloud/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2021-10-20 09:41:36 +02:00
nextcloud-command
c7be7cfd02 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2021-10-20 04:11:07 +00:00
Nextcloud bot
1d1010de2f
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2021-10-20 02:43:00 +00:00
Nextcloud bot
981d839806
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2021-10-20 02:23:10 +00:00
Christopher Ng
bff02f5e51 Populate defaults into exising profile config
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-20 01:07:38 +00:00
Christopher Ng
f5bdf02695 Cleanup
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-20 00:17:22 +00:00
Robin Appelman
5155f2b0c5
Merge pull request #28541 from nextcloud/path-prefix-index2
add a prefix index to filecache.path, attempt 2
2021-10-19 14:41:23 +00:00
Joas Schilling
03936d7762
Fix basic auth for OAuth token endpoint
Don't try to login when a client is trying to get a OAuth token.
OAuth needs to support basic auth too, so the login is not valid
inside Nextcloud and the Login exception would ruin it.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-19 13:03:23 +02:00
Robin Appelman
033a83b0ac
fix federated sharing
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-19 11:32:15 +02:00
Robin Appelman
ef93d2ea1c
update tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-19 11:31:08 +02:00
Robin Appelman
7345de78c5
use the correct navigation manager for the shares
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-19 11:31:08 +02:00
Robin Appelman
4b82d8d20c
call setupSharingMenus again
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-19 11:31:07 +02:00
Robin Appelman
ab275c5e38
move files_sharing to IBootStrap
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-19 11:31:07 +02:00
John Molakvoæ
1b16a136eb
Merge pull request #29202 from nextcloud/release/23.0.0beta1 2021-10-19 10:46:00 +02:00
John Molakvoæ
52bff6af47
Merge branch 'master' into release/23.0.0beta1 2021-10-19 10:42:11 +02:00
Julius Härtl
f3d5f2717f
Merge pull request #29295 from nextcloud/fix/button-clip 2021-10-19 10:20:56 +02:00
Christoph Wurst
0882e2bbbb
Merge pull request #29310 from nextcloud/fix/dav-availability-settings-trailing-commas
Add missing trailing commas in DAV availability settings
2021-10-19 10:14:08 +02:00
Christoph Wurst
227045ae63
Add missing trailing commas in DAV availability settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-19 09:44:19 +02:00
Christoph Wurst
6788c7dea5
Merge pull request #29308 from nextcloud/bugfix/noid/fix-missing-app-version-increment
Fix missing app version increment to trigger migrations
2021-10-19 09:36:41 +02:00
Joas Schilling
93e67020ec
Fix missing app version increment to trigger migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-19 08:40:53 +02:00
Pytal
f7b3d521f8
Merge pull request #28751 from nextcloud/feat/28139/profile-page 2021-10-18 23:03:58 -07:00
Christopher Ng
3be9d3ca8f Profile frontend
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2021-10-19 04:59:36 +00:00
Christopher Ng
309354852f Profile backend
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-19 04:59:35 +00:00