Commit Graph

40535 Commits

Author SHA1 Message Date
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
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
Nextcloud bot 9e657d0577
[tx-robot] updated from transifex 2018-05-23 00:16:27 +00:00
Morris Jobke 2c64557629
Merge pull request #9549 from remyj38/stable12
[stable12] Fix translation bug on lost password page
2018-05-22 21:58:27 +02:00
Rémy Jacquin 4130f279b2
Fix translation bug on lost password page
Fix nextcloud/password_policy#26

Signed-off-by: Rémy Jacquin <remy@remyj.fr>
2018-05-22 18:47:16 +02:00
Nextcloud bot dc585de355
[tx-robot] updated from transifex 2018-05-22 00:14:15 +00:00
Nextcloud bot 114dc57233
[tx-robot] updated from transifex 2018-05-21 00:14:27 +00:00
Nextcloud bot 5a9e54ad59
[tx-robot] updated from transifex 2018-05-20 00:14:07 +00:00
Nextcloud bot d71fe374d3
[tx-robot] updated from transifex 2018-05-19 00:14:25 +00:00
Nextcloud bot 1bb9d3386a
[tx-robot] updated from transifex 2018-05-18 00:14:33 +00:00
Nextcloud bot 1ee313e495
[tx-robot] updated from transifex 2018-05-17 00:14:31 +00:00
Morris Jobke cd303d8f05
Allow upgrades from ownCloud 10.0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-16 14:42:00 +02:00
Nextcloud bot ecef73b273
[tx-robot] updated from transifex 2018-05-14 00:14:12 +00:00
Nextcloud bot ce60ec91ff
[tx-robot] updated from transifex 2018-05-13 00:13:45 +00:00
Nextcloud bot f777018ee7
[tx-robot] updated from transifex 2018-05-12 00:13:49 +00:00
Nextcloud bot b1d2ac5930
[tx-robot] updated from transifex 2018-05-11 00:13:45 +00:00
Nextcloud bot 5cfba894a2
[tx-robot] updated from transifex 2018-05-10 00:13:52 +00:00
Morris Jobke 7197e9f3b6
Merge pull request #9431 from nextcloud/stable12-9407
[12] Fix jsunit tests
2018-05-09 09:14:08 +02:00
Julius Härtl 32f24d5911
Fix jsunit tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-09 08:21:50 +02:00