Commit Graph

42972 Commits

Author SHA1 Message Date
Roeland Jago Douma bea70d4ad3
Merge pull request #12562 from nextcloud/backport/12544/stable13
[13] Handle permission in update of share better
2018-11-21 08:57:55 +01:00
Nextcloud bot f627754965
[tx-robot] updated from transifex 2018-11-21 01:12:34 +00:00
Roeland Jago Douma 7b2a7f695f
Handle permission in update of share better
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 19:38:46 +01:00
Julius Härtl d268a97d21
Merge pull request #12546 from nextcloud/backport/12543/stable13
[stable13] Bearer tokens are app token
2018-11-20 15:21:43 +01:00
Roeland Jago Douma 1794c3fdea Bearer tokens are app token
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 10:51:07 +00:00
Morris Jobke 9939540ce4
Merge pull request #12532 from nextcloud/version/noid/13.0.8rc2
13.0.8 RC 2
2018-11-20 09:25:47 +01:00
Nextcloud bot 0cb7c03132
[tx-robot] updated from transifex 2018-11-20 01:12:57 +00:00
Morris Jobke 77e72c7b0e
13.0.8 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-19 15:43:35 +01:00
Morris Jobke 59b4643c72
Merge pull request #12503 from nextcloud/swift-object-not-found-13
[13] forward object not found error in swift as dav 404
2018-11-19 15:32:27 +01:00
Robin Appelman 5261edb61a
forward object not found error in swift as dav 404
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-19 11:37:12 +01:00
Nextcloud bot c85d6b3d69
[tx-robot] updated from transifex 2018-11-19 01:12:23 +00:00
Nextcloud bot 98c7accec8
[tx-robot] updated from transifex 2018-11-18 01:13:17 +00:00
Nextcloud bot a6c58d74dd
[tx-robot] updated from transifex 2018-11-17 01:13:08 +00:00
Nextcloud bot 24a04fae3d
[tx-robot] updated from transifex 2018-11-16 01:12:34 +00:00
Morris Jobke 03ea80edde
Merge pull request #12437 from nextcloud/version/noid/13.0.8RC1
13.0.8 RC 1
2018-11-15 15:36:01 +01:00
Morris Jobke 1085cae542
13.0.8 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 13:48:12 +01:00
Morris Jobke 4a71b80b74
Merge pull request #12460 from nextcloud/bugfix-stable13/dav_shares_hickup
[stable13] fixes dav share issue with owner
2018-11-15 13:41:08 +01:00
Georg Ehrke 2a31d842ea
fix caldav tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-15 13:01:40 +01:00
Nextcloud bot c2000c295c
[tx-robot] updated from transifex 2018-11-15 01:12:32 +00:00
Georg Ehrke d9b5726455
fixes dav share issue with owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-14 21:52:08 +01:00
Nextcloud bot 6e07165bc2
[tx-robot] updated from transifex 2018-11-14 01:12:30 +00:00
Roeland Jago Douma b89996483d
Merge pull request #12376 from nextcloud/backport/12284/stable13
[13] Properly search the root of a shared external storage
2018-11-13 15:59:01 +01:00
Morris Jobke 204466c714
Merge pull request #12434 from nextcloud/backport/12411-12413/unique-constraint-fix-13
[stable13] Unique contraint and deadlock fixes for filecache and file_locks
2018-11-13 15:03:51 +01:00
Morris Jobke 243516d785
Fix UniqueConstraintViolationException while insert into oc_file_locks
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-13 14:05:16 +01:00
Morris Jobke 0737a6fbe4
Fix UniqueConstraintViolationException while insert into oc_filecache
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-13 14:05:13 +01:00
Nextcloud bot 413121dea1
[tx-robot] updated from transifex 2018-11-13 01:13:02 +00:00
Nextcloud bot 357bbe1b79
[tx-robot] updated from transifex 2018-11-12 01:13:06 +00:00
Nextcloud bot 5534193d3e
[tx-robot] updated from transifex 2018-11-11 01:13:26 +00:00
Nextcloud bot 3d34f6b29c
[tx-robot] updated from transifex 2018-11-10 01:12:44 +00:00
Roeland Jago Douma 8b03bf7d5a
Properly search the root of a shared external storage
Fixes #1020

When an external storage is shared with you in full the root is ''
(empty). This adds an extra check for an empty jail basically.

Because if the jail is on the empty string. It matches all paths.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 13:23:52 +01:00
Nextcloud bot 9c7f09d2ac
[tx-robot] updated from transifex 2018-11-09 01:12:47 +00:00
Nextcloud bot 7afee0e583
[tx-robot] updated from transifex 2018-11-08 01:12:37 +00:00
Nextcloud bot af858c257a
[tx-robot] updated from transifex 2018-11-07 01:12:49 +00:00
Morris Jobke 1cac241318
Merge pull request #12298 from nextcloud/backport/12127/stable13
[13] A folder should get a folder mimetype
2018-11-06 18:13:45 +01:00
Roeland Jago Douma fc49fa1620
A folder should get a folder mimetype
If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.

If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:02:48 +01:00
Nextcloud bot 450b9e2a20
[tx-robot] updated from transifex 2018-11-06 01:12:56 +00:00
Nextcloud bot 30666be2f0
[tx-robot] updated from transifex 2018-11-05 01:12:55 +00:00
Nextcloud bot 374bfbeaca
[tx-robot] updated from transifex 2018-11-04 01:14:21 +00:00
Nextcloud bot 0e125b810a
[tx-robot] updated from transifex 2018-11-03 01:12:58 +00:00
Morris Jobke afed9ae664
Merge pull request #12212 from nextcloud/backport/12140/stable13
[13] Expired tokens should not trigger bruteforce protection
2018-11-02 12:33:31 +01:00
Roeland Jago Douma 40d1202076
Error out early on an expired token
Fixes #12131

If we hit an expired token there is no need to continue checking. Since
we know it is a token.

We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 11:41:00 +01:00
Roeland Jago Douma 04617a28d4
Move ExpiredTokenException to the correct namespace
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 11:39:42 +01:00
Roeland Jago Douma 3aaeaf1316
Merge pull request #12208 from nextcloud/backport/12130/stable13
[13] Reset bruteforce on token refresh OAuth
2018-11-02 11:38:13 +01:00
Roeland Jago Douma 6971ecef9d
Reset bruteforce on token refresh OAuth
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 10:54:50 +01:00
Nextcloud bot 4708a2529e
[tx-robot] updated from transifex 2018-11-02 01:13:56 +00:00
Nextcloud bot 68c17136dd
[tx-robot] updated from transifex 2018-11-01 01:13:22 +00:00
Nextcloud bot ea7f80206b
[tx-robot] updated from transifex 2018-10-31 01:13:13 +00:00
Roeland Jago Douma aa6f50aa91
Merge pull request #12142 from nextcloud/backport/12054/stable13
[stable13] LDAP: announce display name changes so that addressbook picks it up
2018-10-30 16:28:27 +01:00
Arthur Schiwon 82bb002eaa
adjust tests to 13 codebase
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 14:10:35 +01:00
Arthur Schiwon 908e6be07e
Backport of #12054 to stable13
only write when the displayname differs, but then announce it

refs #5212 and fixes #9112

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

do not run into UniqueConstraintViolationException

… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 14:10:21 +01:00