ff59905b12
Merge pull request #12540 from nextcloud/backport/12450/stable14
...
[stable14] Throw exception if decryption fails
2018-11-22 14:54:02 +01:00
adf1488e4e
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:50:21 +00:00
40a3937877
Throw exception if decryption fails
...
For #11868
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-19 21:26:01 +00:00
f43cfd9275
forward object not found error in swift as dav 404
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-19 11:36:33 +01:00
cd196f31a0
[tx-robot] updated from transifex
2018-11-16 01:12:25 +00:00
9070de4753
Update autoloader dump
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 13:49:19 +01:00
659e4746db
[tx-robot] updated from transifex
2018-11-15 01:12:24 +00:00
db9e1b90f9
Merge pull request #12375 from nextcloud/backport/12284/stable14
...
[14] Properly search the root of a shared external storage
2018-11-13 15:09:24 +01:00
ec5c11d284
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 13:59:24 +01:00
442680024f
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 13:59:15 +01:00
655b7f047c
[tx-robot] updated from transifex
2018-11-13 01:12:52 +00:00
13eae29509
[tx-robot] updated from transifex
2018-11-12 01:12:58 +00:00
d476fc9d25
[tx-robot] updated from transifex
2018-11-11 01:13:19 +00:00
b71bc1289b
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:21:45 +01:00
f48f43818e
Fix default types of activity event member variables
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 14:14:01 +01:00
288991a610
[tx-robot] updated from transifex
2018-11-06 01:12:48 +00:00
f962a43388
[tx-robot] updated from transifex
2018-11-05 01:12:47 +00:00
d829b158f6
[tx-robot] updated from transifex
2018-11-04 01:14:13 +00:00
a46ca94723
Merge pull request #12197 from nextcloud/backport/12188/revert-wait-for-cron
...
[stable14] Revert "Wait for cron to finish before running upgrade command"
2018-11-02 08:21:05 +01:00
fd39fba5f7
Merge pull request #12202 from brad2014/stable14
...
Fix bug #12151 : fix list formatting by correcting malformed html
2018-11-02 08:20:31 +01:00
98dd7c1075
Fix bug #12151 : fix list formatting by correcting malformed html
...
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2018-11-01 15:30:03 -07:00
b292f919c6
Revert "Wait for cron to finish before running upgrade command"
...
This reverts commit 18e9631810
2018-11-01 22:09:45 +01:00
aa92a00129
Merge pull request #12184 from nextcloud/add-gss-to-excluded-backends-stable14
...
[stable14] add global site selector as user back-end which doesn't support password confirmation
2018-11-01 11:00:50 +01:00
c47d634837
add global site selector as user back-end which doesn't support password confirmation
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-01 10:07:12 +01:00
e3f3212fbc
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-10-31 10:54:17 +01:00
f171378837
Move ExpiredTokenException to the correct namespace
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 10:54:17 +01:00
71d2d3ca00
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-10-31 10:54:17 +01:00
1ec92c0497
Merge pull request #12040 from nextcloud/backport/12022/stable14
...
[14] Allow chunked uploads even if your quota is not sufficient
2018-10-30 12:33:13 +01:00
48b57d1284
[tx-robot] updated from transifex
2018-10-29 01:13:18 +00:00
67895ffac7
[tx-robot] updated from transifex
2018-10-27 00:12:46 +00:00
7e7d3ce357
[tx-robot] updated from transifex
2018-10-26 00:12:59 +00:00
6f3328a9cd
skip already decrypted files on decrypt all command
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-25 17:52:51 +02:00
d91380d138
Allow chunked uploads even if your quota is not sufficient
...
Fixes #11485
This allows uploads to shared folders.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-25 13:53:52 +02:00
4abae96298
Catch more occurences where ExpiredTokenException can be thrown
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-25 10:59:07 +02:00
49e992c1da
Expired PK tokens should not fall back to legacy tokens
...
Fixes #11919
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-25 10:59:07 +02:00
e5814bd948
Merge pull request #11800 from nextcloud/lookupserver-and-global-scale-stable14
...
[stable14] always query the lookup server in a global scale setup
2018-10-24 14:44:05 +02:00
7894c40f54
[tx-robot] updated from transifex
2018-10-23 14:54:39 +00:00
d9c080120e
Merge pull request #11976 from nextcloud/bugfix-stable14/9326/make_sure_usermanager_getByEmail_only_returns_IUser
...
[stable14] filter null values for UserManager::getByEmail
2018-10-23 15:15:23 +02:00
9ea758758e
Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
...
Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-23 10:22:47 +02:00
554c80b403
filter null values for UserManager::getByEmail
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-22 15:51:57 +02:00
61fe59795f
Merge pull request #11929 from nextcloud/backport/11870/proper-column-name-escaping
...
[stable14] Properly escape column name in "createFunction" call
2018-10-19 15:48:41 +02:00
2885db8e9b
Merge pull request #11772 from nextcloud/stable14-pretty-urls-dont-work
...
[14] Allow overwrite.cli.url without trailing slash
2018-10-19 12:16:22 +02:00
f6cdab6b11
Properly escape column name in "createFunction" call
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 12:12:52 +02:00
e7d20cdb5e
Allow php7.3
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-12 12:21:19 +02:00
4f983b7565
Backport https://github.com/nextcloud/server/pull/11446
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-11 15:14:33 +02:00
18c35e6060
Normalize getUnjailedPath
...
Fixes #11637
If we do not normalize the unjailed path we might end up with a path
like files/user/folder/. which can break on objectstores
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-11 14:49:32 +02:00
84e39b522c
some small fixes and improvements
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-10 16:08:49 +02:00
cef454c280
[tx-robot] updated from transifex
2018-10-10 00:13:24 +00:00
7e608df598
adjust tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-09 18:32:09 +02:00
52c52f555d
always query the lookup server in a global scale setup and have a nicer label
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-09 17:48:15 +02:00
Morris Jobke
Roeland Jago Douma
Robin Appelman
Nextcloud bot
Joas Schilling
Roeland Jago Douma
brad2014
Bjoern Schiessle
Georg Ehrke
Daniel Kesselberg