Commit Graph

40552 Commits

Author SHA1 Message Date
Nextcloud bot 877bae5fdb
[tx-robot] updated from transifex 2018-06-08 00:13:36 +00:00
Morris Jobke 42d3169e27
Merge pull request #9779 from nextcloud/version/noid/12.0.8
12.0.8
2018-06-07 11:52:24 +02:00
Morris Jobke 9414f401e4
12.0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-07 11:26:25 +02:00
Nextcloud bot 09cdf936d3
[tx-robot] updated from transifex 2018-06-07 00:13:26 +00:00
Nextcloud bot 7f3bc2bae3
[tx-robot] updated from transifex 2018-06-06 00:13:18 +00:00
Nextcloud bot 8ac01bb037
[tx-robot] updated from transifex 2018-06-04 00:13:08 +00:00
Nextcloud bot 785ed869b3
[tx-robot] updated from transifex 2018-06-03 00:13:30 +00:00
Nextcloud bot 78a494027a
[tx-robot] updated from transifex 2018-06-02 00:13:11 +00:00
Morris Jobke 13920ec3df
Merge pull request #9702 from nextcloud/version/noid/12.0.8RC1
12.0.8 RC 1
2018-06-01 14:08:32 +02:00
Morris Jobke b383c61eba
Ping mysql version in CI
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-01 13:47:13 +02:00
Morris Jobke 1e5f1bb6a3
12.0.8 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-01 12:38:02 +02:00
Morris Jobke da21b2a7ab
Merge pull request #9611 from nextcloud/bugfix-stable12/3830/invitations_for_shared_calendars
[stable12] send invitations for shared calendars
2018-06-01 12:37:37 +02:00
Morris Jobke a55241cfe6
Merge pull request #9695 from nextcloud/backport/9692/stable12
[stable12] Make sure the log doesn't try to read from PUT if it can't
2018-06-01 12:17:23 +02:00
Nextcloud bot 3742d927ec
[tx-robot] updated from transifex 2018-06-01 00:13:10 +00:00
Nextcloud bot 44524eeb13
[tx-robot] updated from transifex 2018-05-31 00:13:27 +00:00
Roeland Jago Douma c27722520c
Make sure the log doesn't try to read from PUT if it can't
If a PUT request comes in that is not JSON or from encoded. Then we can
only read it (exactly) once. If that is the case we must assume no
shared secret is set.

If we don't then we either are the first to read it, thus causing the
real read of the data to fail.

Or we are later and then it throws an exception (also failing the
request).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 20:27:30 +02:00
Morris Jobke 475d9e15b6
Merge pull request #9660 from nextcloud/backport/9653/stable12
[stable12] The OAuth endpoint needs to support Basic Auth
2018-05-30 15:03:54 +02:00
Morris Jobke a98bfa8d87
Merge pull request #9669 from nextcloud/backport/9666/stable12
[stable12] Make sure the file is readable before attempting to create a preview
2018-05-30 11:42:24 +02:00
Morris Jobke 752b5d589b
Merge pull request #9671 from nextcloud/drone-mysqlmb4-fix-stable12
[stable12] Fix drone mysqlmb4 tests
2018-05-30 09:14:28 +02:00
John Molakvoæ (skjnldsv) 9fde163fb5
Fix drone mysqlmb4 tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-30 08:58:18 +02:00
Nextcloud bot 158c577749
[tx-robot] updated from transifex 2018-05-30 00:12:51 +00:00
Roeland Jago Douma 8d596461d5
Make sure the file is readable before attempting to create a preview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 22:04:17 +02:00
Roeland Jago Douma e824973786
The OAuth endpoint needs to support Basic Auth
* Add test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 16:02:26 +02:00
Nextcloud bot 9fe202a811
[tx-robot] updated from transifex 2018-05-29 00:13:01 +00:00
Roeland Jago Douma 46a694513f
Merge pull request #9630 from nextcloud/backport/9627/stable12
[stable12] Limit Sinon version to 5.0.7 at most
2018-05-28 13:28:13 +02:00
Daniel Calviño Sánchez f2385ae038
Limit Sinon version to 5.0.7 at most
When using fake servers with Sinon.JS, the JavaScript test framework,
the XHR objects are also fake. In Sinon 5.0.8 the "setRequestHeader" of
XMLHttpRequest was modified to normalize the header values (as requested
by the spec), but since then only string values are accepted; null or
integer values can no longer be passed to "setRequestHeader", as it
expects the "replace" function to be available in the object. However,
in the tests null and integer values are passed to "setRequestHeader",
which causes them to fail.

Both Firefox and Chromium accept passing non-string values to their
"setRequestHeader" implementation, and it is done, for example, in
davclient.js; it is not clear yet whether Sinon got too restrictive or
the code calling "setRequestHeader" was too loose. Given that
davclient.js is an external dependency, as a temporary measure Sinon
version is forced to be 5.0.7 at most until either Sinon or davclient.js
are updated.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-28 11:08:43 +02:00
Roeland Jago Douma 7a121f81b5
Merge pull request #9618 from nextcloud/backport/9515/stable12
[stable12] Regenerate session id after public share auth
2018-05-28 09:05:29 +02:00
Nextcloud bot fcabe26492
[tx-robot] updated from transifex 2018-05-28 00:13:23 +00:00
Nextcloud bot 550d100435
[tx-robot] updated from transifex 2018-05-27 00:13:51 +00:00
Roeland Jago Douma cb211f0434
Regenerate session id after public share auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-26 13:21:39 +02:00
Nextcloud bot 84988e4f89
[tx-robot] updated from transifex 2018-05-26 00:13:45 +00:00
Georg Ehrke cf3590f085
send invitations for shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-25 21:08:36 +02:00
Nextcloud bot 8cb7ce7b6e
[tx-robot] updated from transifex 2018-05-25 00:15:36 +00:00
Morris Jobke e10c13271c
Merge pull request #9580 from nextcloud/bugfix_stable12/noid/fix_force_language_html_attr
[stable12] make sure force language is reflected in html lang attribute
2018-05-24 18:00:39 +02:00
Roeland Jago Douma 4b8a9a37d6
Always set the request language to the force language
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-24 13:09:21 +02:00
Georg Ehrke 0dc1b3e741
make sure force language is reflected in html lang attribute
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-24 13:09:15 +02:00
Nextcloud bot b9584e1b25
[tx-robot] updated from transifex 2018-05-24 00:14:24 +00:00
Roeland Jago Douma 3ebed2b9e6
Merge pull request #9567 from nextcloud/backport/9395/stable12
[stable12] cleanup locks in scanner on error
2018-05-23 23:04:06 +02:00
Roeland Jago Douma 71bee1b3bd
Merge pull request #9493 from nextcloud/upgrade-from-oc-10.0.8
Allow upgrades from ownCloud 10.0.8
2018-05-23 20:30:52 +02:00
Robin Appelman 7c8e34f8fd
cleanup locks in scanner on error
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:06:34 +02:00
Morris Jobke 6b5fea40eb
Merge pull request #9546 from nextcloud/backport/9517/stable12
[stable12] Improve OAuth
2018-05-23 19:03:38 +02:00
Roeland Jago Douma 3e57666093
Properly set expires to NULL when creating a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma c2f09e4395
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 44735dedd1
Don't use special chars to avoid confusion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 335f4efa83
Rotate token
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma c2a21ea464
Authenticate the clients on requesting a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma aa78c30666
Fail if the response type is not properly set
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 1525cc286c
Set OAuth token expiration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma f2a3115157
Certain tokens can expire
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 0885bd4ee5
Allow the rotation of tokens
This for example will allow rotating the apptoken for oauth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00