Merge pull request #18113 from nextcloud/bugfix/15967/webcal_cache_headers

Add refresh-interval to exported calendars

Merge pull request #18142 from nextcloud/fix/provisioning_api/users-typing

Fix provisioning_api getUsers types

Merge pull request #18062 from nextcloud/drop/php71

Drop php 7.1 support

Merge pull request #18133 from nextcloud/bugfix/13896/missing_from_information

Set common-name to user's displayname if none is set

Merge pull request #18135 from nextcloud/fix/trim-login-name

Trim the login name

Set common-name to user's displayname if none is set

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

[tx-robot] updated from transifex

Trim the login name

Otherwise we keep on using it with leading or trailing whitespaces for
app tokens and other logic. The reason this doesn't throw an error
immediately with local users is that (My)SQL compares strings regardless
of their padding by default. So we look up 'uid ' and get the row for
the user 'uid'.
Other back-ends will lead to a hard error, though, and the user is
unable to log out as all request fail.

Ref https://stackoverflow.com/a/10495807/2239067

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #18134 from nextcloud/enh/noid/flow-extend-scope

allow user flows when the acting user is legitimate, but not its owner

Fix provisioning_api getUsers types

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Merge pull request #18154 from nextcloud/tests/fix-tags-acceptance

Adjust tags acceptance tests to moved admin section

Merge pull request #18150 from nextcloud/docs/noid/files-api-exceptions

Properly annotate LockedException in files node api

Merge pull request #18153 from nextcloud/bugfix/revert-mimetypelist

Revert removed mimetypelist

Adjust tags acceptance tests to moved admin section

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Revert removed mimetypelist

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #18152 from nextcloud/bugfix/noid/direct-editing-postgres

Fix direct editing access check on Postgres

Check for boolean value

Signed-off-by: Julius Härtl <jus@bitgrid.net>

adjust unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Properly anotate LockedException in files node api

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Set fileInfo in the rule matcher

Signed-off-by: Julius Härtl <jus@bitgrid.net>

add convenience interfaces so entities can provide presentable details

the File entity starts with a display text (used by talk)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

expose user of running flows

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

allow user flows when the acting user is legitimate, but not its owner

for instance, when a sharee changes a file, the owner can act upon

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Merge pull request #18147 from nextcloud/fix/integration/7.3/redis

Bump integration to php7.3 with redis

Bump integration to php7.3 with redis

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Merge pull request #18143 from nextcloud/tests/direct-editing-phpunit8

Adjust DirectEditing test to PHPUnit8

Adjust DirectEditing test to PHPUnit8

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix integration

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Drop php 7.1 support

18 will be relased when php7.1 is EOL already. So lets kill it!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Merge pull request #17625 from nextcloud/enh/noid/direct-editing

Direct editing API to allow file editing using a one-time token

Merge pull request #17725 from nextcloud/enh/share_exp_internal

Allow internal shares to have a default expiration date

Merge pull request #18064 from nextcloud/feature/php74

Add php7.4 support

Merge pull request #18141 from nextcloud/design/noid/personal-info-icon

Use person icon for personal settings

[tx-robot] updated from transifex

Use person icon for personal settings

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Only expose link to info endpoint in capabilties

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Expose editor id for creators

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add mimetype to creators

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code style fixes and cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix external storagestests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Bump memcached image

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

REVERT LATER: disable phan for now

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

remove test case

Because we test very naively we matched also on def in default...

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

TO REVERT LATER: disable decimaltest from LegacyDBTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

TO REVERT LATER: disable some DbHandlerTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

TO REVERT LATER: disable some tests in UserTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

TO REVERT LATER: disable tests in LargeFileHelperGetFileSizeTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

TO REVERT LATER: fix UserHooksTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Mode to modern phpunit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Add refresh-interval to exported calendars

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Compile assets

Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Move editor list to capabilities

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Direct editing token tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add background job for token cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

encapsulate templates

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Direct editing API to allow file editing using a one-time token for
mobile apps

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add capabilities

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Add settings front and split sharing entry config

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Expose internal expiration dates to JS

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Actualy return data

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

My first stupid attempt at expanding the admin interface

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Allow internal shares to have a default expiration date

* Needs admin UI
* Needs more checks
* Basics seem to work

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Improve etag handling

Check if values exist before using them

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix lockprivider test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix more tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix logger test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix SynserviceTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix fileplugintest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix signCoretests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

SignApp fixes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

More fixes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

More fixes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Fix more tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Sensitive values handling

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Skip redis if not configured

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Update drone

* Run 7.4 tests (nodb + sqlite)
* Update older images to newer phpunit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Make phpunit8 compatible

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Allow php7.4

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #18019 from nextcloud/enhancement/password-policy-events

Add typed events for password_policy

Merge pull request #17834 from nextcloud/enh/noid/generic-event-replacement-tk2

Public API's GenericEvent replacement (take 2)

Add typed events for password_policy

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #17997 from nextcloud/enh/workflow-frontend

More workflow frontend polishing

[tx-robot] updated from transifex

Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix wording

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Rename to flow

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add cancel button to restore previously saved rule

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add hint about developer docs

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Move systemtags to general settings

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Small fixes for workflow frontend

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #18058 from nextcloud/enh/shareinfo/permissionmask

Apply share permission mask to all files obtained via shareinfo

Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handling

Handle token insert conflicts

Merge pull request #18123 from nextcloud/fixbug/18053/summary_not_aligned

fix summary elements alignment

fix summary elements alignment

Signed-off-by: Greta Doci <gretadoci@gmail.com>

Merge pull request #17995 from nextcloud/fix/sharing/federation-order

Sort users and groups first in sharing input

Files first to use own GenericEvent

* those are added to 18 only anyway :)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Merge pull request #17948 from nextcloud/enh/check-if-property-is-bool

Make isXXX available for bool properties only

Sort users and groups first in sharing input

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Handle token insert conflicts

Env-based SAML uses the "Apache auth" mechanism to log users in. In this
code path, we first delete all existin auth tokens from the database,
before a new one is inserted. This is problematic for concurrent
requests as they might reach the same code at the same time, hence both
trying to insert a new row wit the same token (the session ID). This
also bubbles up and disables user_saml.

As the token might still be OK (both request will insert the same data),
we can actually just check if the UIDs of the conflict row is the same
as the one we want to insert right now. In that case let's just use the
existing entry and carry on.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>