Commit Graph

14394 Commits

Author SHA1 Message Date
Arthur Schiwon 17c13e4436
Allow to skip data dir permission checks by config
Enables installation on services that don't allow/support permission
changes.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:55:29 +01:00
Morris Jobke 90feccf4be
Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-for-not-current-accesss
[stable12]  Only in case of $currentAccess the array uses the id as index
2017-11-28 20:16:32 +01:00
Joas Schilling 76a2fb0231
Only in case of $currentAccess the array uses the id as index
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883d

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:24:19 +01:00
Robin Appelman 6d8de960c9
Use the correct root for shared jail when the source storage is also a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-28 13:55:42 +01:00
Roeland Jago Douma 7e1ca611f8
Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
[stable12] CSSResourceLocator: handle SCSS in apps outside root
2017-11-27 10:08:27 +01:00
Morris Jobke b901f8b0c8
Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer-userid
[stable12] Fix accesslist when a user has an ID only containting 0-9
2017-11-23 13:54:46 +01:00
Joas Schilling 6978128b48
Fix accesslist when a user has an ID only containting 0-9
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-23 13:19:55 +01:00
Kyle Fazzari 7f8f3dc21b
CSSResourceLocator: handle SCSS in apps outside root
Currently static CSS files work fine in apps outside of the root.
However, as soon as an app uses SCSS, Nextcloud starts being unable to
find the web root.

Fix this problem by backporting select snippets from master
specifically targeting this issue, and add a test to ensure it doesn't
regress.

Fix #5289

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-22 21:41:40 -08:00
Joas Schilling 2c11d62adf
Allow migration from upcoming 10.0.4 ownCloud release
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-22 14:06:07 +01:00
Roeland Jago Douma 6bfeec049e
Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath
[stable12] {J,CS}SResourceLocator: account for symlinks in app path
2017-11-20 12:58:10 +01:00
Nextcloud bot 9583910104
[tx-robot] updated from transifex 2017-11-20 01:09:53 +00:00
Bjoern Schiessle 83ef3d2411
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-17 12:46:52 +01:00
Björn Schießle 031bde5c88
Merge pull request #7186 from nextcloud/s3-download-stream-fix-12
[12] Fix s3 download and touch
2017-11-17 12:44:40 +01:00
Nextcloud bot fec4e3947e
[tx-robot] updated from transifex 2017-11-16 01:10:03 +00:00
Robin Appelman e041c7a92f
Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:47 +01:00
Robin Appelman a21f2c2813
Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:43 +01:00
Kyle Fazzari 697774112f
{J,CS}SResourceLocator: account for symlinks in app path
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.

Use realpath when retrieving app path, and these issues go away.

Fix #6028

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-14 09:22:33 -08:00
Nextcloud bot faabc3594d
[tx-robot] updated from transifex 2017-11-12 01:10:15 +00:00
korelstar f907cdc09d Unlock files even if an exception occurs
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-11 13:25:28 +01:00
Nextcloud bot 097e8a4994
[tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
blizzz 14986e0f5c
Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
[stable12] Improve text: 'you have now' -> 'you now have'
2017-11-10 15:48:37 +01:00
Nextcloud bot 5e14b64c55
[tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Morris Jobke 20e5220103
Merge pull request #7120 from nextcloud/12-6988
[stable12] Improve performance of UserMountCache with external storage folders
2017-11-09 17:16:00 +01:00
Dariusz Olszewski b9898c5b87
Improve performance of UserMountCache with external storage folders
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:07:27 +01:00
Roeland Jago Douma 9cbb39511f
If for some reason the json can't be decoded it is not cached
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-09 09:50:57 +01:00
Morris Jobke d8cf19b258
Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:28:29 +01:00
Nextcloud bot 69e61b2892
[tx-robot] updated from transifex 2017-11-09 01:09:28 +00:00
Morris Jobke e97a58793d
Revert "[stable12] Only allow colons in db host for IPv6 addresses" 2017-11-08 00:42:34 +01:00
Nextcloud bot 0756fc0893
[tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Morris Jobke 3cc7c03ddb
Merge pull request #7082 from nextcloud/12-6974
[stable12] Fix seeking on object storage
2017-11-06 20:21:35 +01:00
Morris Jobke 8a8e76561b
Merge pull request #7081 from nextcloud/12-6958
[stable12] Improve mimetype detection for object storages
2017-11-06 18:45:32 +01:00
Morris Jobke d459351ce2
Fix seeking on object storage
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:28:39 +01:00
Morris Jobke 21b8399e88
Improve mimetype detection for object storages
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:23:35 +01:00
Robin Appelman 1ed9a25ae8
use fopen directly when reading objects from s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-06 10:39:52 +01:00
Nextcloud bot e873b1a3d1
[tx-robot] updated from transifex 2017-11-06 01:09:19 +00:00
Nextcloud bot 43341833fd
[tx-robot] updated from transifex 2017-11-03 01:09:18 +00:00
Nextcloud bot 52b31a09ef
[tx-robot] updated from transifex 2017-11-01 01:08:55 +00:00
Nextcloud bot 00ffed5a19
[tx-robot] updated from transifex 2017-10-31 01:08:41 +00:00
Nextcloud bot e20c4c6a71
[tx-robot] updated from transifex 2017-10-29 00:08:41 +00:00
Nextcloud bot 85f612c819
[tx-robot] updated from transifex 2017-10-27 00:08:39 +00:00
Nextcloud bot f7ac152a6c
[tx-robot] updated from transifex 2017-10-26 00:08:49 +00:00
Morris Jobke 9c3f6a7ca0 Merge pull request #6944 from nextcloud/12-6433
[stable12] Fix uninitialized variable $this->params
2017-10-25 14:33:49 +02:00
Nextcloud bot 5bd0bde89d
[tx-robot] updated from transifex 2017-10-25 00:08:56 +00:00
William Pain cfbc0c8141
Fix uninitialized variable $this->params
Signed-off-by: William Pain <pain.william@gmail.com>
2017-10-25 01:32:59 +02:00
Nextcloud bot 895336a3f3
[tx-robot] updated from transifex 2017-10-24 00:08:57 +00:00
dartcafe 58f900f380
Correction
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-22 07:46:18 +02:00
dartcafe 917e996dda
Fix future time spans
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-22 07:26:52 +02:00
Nextcloud bot bc19a8b193
[tx-robot] updated from transifex 2017-10-22 00:08:45 +00:00
Nextcloud bot 1c488aae8a
[tx-robot] updated from transifex 2017-10-21 00:08:36 +00:00
Nextcloud bot 5d2c6233a9
[tx-robot] updated from transifex 2017-10-20 00:08:44 +00:00
Nextcloud bot e8c217ed4f
[tx-robot] updated from transifex 2017-10-19 00:08:38 +00:00
Nextcloud bot 8b0842f020
[tx-robot] updated from transifex 2017-10-18 00:08:33 +00:00
Robin Appelman 74b43f1d7d
propagate multipart upload exception when aborting upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:19:40 +02:00
Nextcloud bot ea269db6d6
[tx-robot] updated from transifex 2017-10-17 00:08:33 +00:00
Roeland Jago Douma 51ed66fb26 Merge pull request #6814 from nextcloud/upload-cache-path-12
[12] also use configured 'cache_path' for new chunking
2017-10-15 21:43:03 +02:00
Roeland Jago Douma d57557774e Merge pull request #6815 from nextcloud/s3-multipart-upload-part-size-12
[12] set s3 part size to 500mb
2017-10-15 21:41:15 +02:00
Roeland Jago Douma 6e3ec7d911 Merge pull request #6774 from nextcloud/backport-6645-only-colons-for-ipv6
[stable12] Only allow colons in db host for IPv6 addresses
2017-10-15 21:40:04 +02:00
Nextcloud bot 95bd9d4c64
[tx-robot] updated from transifex 2017-10-14 02:29:15 +00:00
Robin Appelman e2a25d5caf
set s3 part size to 500mb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 16:01:04 +02:00
Robin Appelman 1c315a2a8a
also use configured 'cache_path' for new chunking
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:27:02 +02:00
Robin Appelman df2fa2fce2 Merge pull request #6737 from nextcloud/aws-sdk-12
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
Robin Appelman 239f561ab2
Add tests for multipart upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:44 +02:00
Robin Appelman 6fee4232ee
only do multipart upload for large files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:40 +02:00
Robin Appelman d3a57a7568
multipart upload for s3 object storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:34 +02:00
Nextcloud bot adea68e218
[tx-robot] updated from transifex 2017-10-07 00:08:40 +00:00
Joas Schilling 8f41e8ee60
Only allow colons in db host for IPv6 addresses
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-06 09:43:35 +02:00
Nextcloud bot 037376b4ce
[tx-robot] updated from transifex 2017-10-06 00:08:40 +00:00
Robin Appelman 6aa25b9f1e Merge pull request #6743 from nextcloud/invalid-path-repair-from11-12
[12] dont run invalid path repair step when upgrading from 11.0.5.2 and later
2017-10-04 15:08:34 +02:00
Nextcloud bot 1c30c72909
[tx-robot] updated from transifex 2017-10-04 00:08:37 +00:00
Robin Appelman 95dc9a89b3
dont run invalid path repair step when upgrading from 11.0.5.2 and later
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:28:54 +02:00
Robin Appelman 5b82e2e4d5
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:31 +02:00
Robin Appelman d26951beb4
fix path style
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:21 +02:00
Robin Appelman 474c8aff29
reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:10:57 +02:00
Robin Appelman f62e0a33f3
update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:09:59 +02:00
Nextcloud bot 4a21eb1c7d
[tx-robot] updated from transifex 2017-10-03 00:08:30 +00:00
Nextcloud bot 489fc55e1d
[tx-robot] updated from transifex 2017-09-30 00:08:35 +00:00
Nextcloud bot cae4a1956b
[tx-robot] updated from transifex 2017-09-29 00:08:31 +00:00
Nextcloud bot df00dc89d1
[tx-robot] updated from transifex 2017-09-28 00:08:46 +00:00
Arthur Schiwon 499da044b6
don't pass User object when uid string is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 17:51:22 +02:00
Morris Jobke f6ccc1e0a1 Merge pull request #6554 from nextcloud/stable12-contacts_menu_privacy
[Stable12] contacts menu privacy
2017-09-27 15:32:29 +02:00
John Molakvoæ (skjnldsv) 892a427807
Do not stop on scss compilation failure
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 08:35:02 +02:00
Nextcloud bot af923601b9
[tx-robot] updated from transifex 2017-09-27 00:08:33 +00:00
Morris Jobke 2062c2ada6 Merge pull request #6528 from nextcloud/fix_4654_3375-12
[stable12] Pass new value to triggerChange
2017-09-20 16:05:49 +02:00
Nextcloud bot db56ea3e70
[tx-robot] updated from transifex 2017-09-19 00:08:39 +00:00
Lukas Reschke 44ae66e7d2
Add filter for `shareapi_allow_share_dialog_user_enumeration`
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.

Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-18 17:28:07 +02:00
Tobia De Koninck 005cd8ae42
Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:51 +02:00
Tobia De Koninck 21e903cb31
Improve code style
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:47 +02:00
Tobia De Koninck 3409c364fe
Some code improvements
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:41 +02:00
Tobia De Koninck d2d6ed5c97
Add tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:33 +02:00
Tobia De Koninck 88ccbef546
Fix tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:28 +02:00
Tobia De Koninck 6f4976fd4d
Privacy enhancements for contacts menu
- Groups, which are excluded from sharing should not see local users at all
 - If sharing is restricted to users own groups, he should only see contacts from his groups:

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:24 +02:00
Nextcloud bot c854665b0c
[tx-robot] updated from transifex 2017-09-18 00:08:41 +00:00
Nextcloud bot bc88484e7f
[tx-robot] updated from transifex 2017-09-17 00:08:34 +00:00
Nextcloud bot 18a258c531
[tx-robot] updated from transifex 2017-09-16 00:08:34 +00:00
Roeland Jago Douma 71fdc43125
Pass new value to triggerChange
it is not used. but pass in the empty string (on delete) and the new
file (on create)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 20:23:45 +02:00
Nextcloud bot 99916a9bda
[tx-robot] updated from transifex 2017-09-15 00:08:17 +00:00
Nextcloud bot a7f3fadd37
[tx-robot] updated from transifex 2017-09-14 00:08:21 +00:00
Nextcloud bot 51c110dd66
[tx-robot] updated from transifex 2017-09-13 00:08:21 +00:00
Roeland Jago Douma ab50f0b1de
Fix AppPassword 2FA auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:35:16 +02:00
Leon Klingele 33ae6a4e9e
Improve text: 'you have now' -> 'you now have'
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-12 14:11:52 +02:00
Morris Jobke cb6178b828 Merge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative-to-files-on-theming-update
[stable12] Still throw a locked exception when the path is not relative to $user/files/
2017-09-12 10:03:29 +02:00
Morris Jobke 3aae3a54e5 Merge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language
[stable12] Use the language of the recipient for the share notification
2017-09-12 09:40:19 +02:00
Morris Jobke 0c43183ac9 Merge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without-content
[stable12] Ask the schema whether the table and column exist
2017-09-11 23:20:58 +02:00
Joas Schilling 2a6855a76d
Use the language of the recipient for the share notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:28:20 +02:00
Joas Schilling d25ea6ae1c
Don't lock in the appdata_ directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:18:56 +02:00
Joas Schilling 9cae892974
Still throw a locked exception when the path is not relative to $user/files/
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:18:47 +02:00
Joas Schilling e88a4a0b3d
Fix Nextcloud 12 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:14:33 +02:00
Joas Schilling 6fd01c3993
Ask the schema whether the table and column exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:08:58 +02:00
Christoph Wurst 55c7aa674c
Fix failing csp/nonce check due to timed out session
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-11 10:08:06 +02:00
Nextcloud bot 985cbc6b33
[tx-robot] updated from transifex 2017-09-10 00:08:33 +00:00
Nextcloud bot ac96dc80de
[tx-robot] updated from transifex 2017-09-08 00:08:25 +00:00
Joas Schilling 287ebb52d5
Don't log LDAP password when server is not available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-07 09:26:40 +02:00
Roeland Jago Douma ef1c81188b Merge pull request #6319 from nextcloud/improve_2fa-12
[stable12] Improve 2FA
2017-09-06 20:07:46 +02:00
Lukas Reschke ad96c58e8b Merge pull request #6368 from nextcloud/backport-5436-fix-group-check
[stable12] Fix group check on share provider
2017-09-06 17:19:15 +02:00
Roeland Jago Douma dbcd549e35
Fix login with basic auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-06 17:07:11 +02:00
Nextcloud bot ba71df12cc
[tx-robot] updated from transifex 2017-09-06 00:08:30 +00:00
Jan-Philipp Litza b35c039b77
Fix 500 Internal Server Error on writing
In some not yet completely determined configurations, the following error could occur while writing a file:

Error: Call to a member function getUsers() on null
    /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
    /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
    /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
    /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
    /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
    /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
    [...]

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
2017-09-05 17:31:39 +02:00
Joas Schilling 6e7c37cbd3
Merge setMetaData into constructor
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:09 +02:00
Nextcloud bot fe2f9ac7ce
[tx-robot] updated from transifex 2017-09-02 00:08:39 +00:00
Roeland Jago Douma faffebc718
Improve 2FA
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-31 10:54:10 +02:00
Nextcloud bot 0ba7914d0c
[tx-robot] updated from transifex 2017-08-31 00:08:40 +00:00
Bjoern Schiessle b53587cf8d
update autoloader
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:48 +02:00
Bjoern Schiessle 181c77ca87
move repair step to stable12
because we decided to backport it the repair step needs to be executed
already on stable12

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:47 +02:00
Bjoern Schiessle 3e6833f5a6
add prefix to user and system keys to avoid name collisions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Bjoern Schiessle 5f49398e13
extend the identity proof manager to allow system wide key pairs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Lukas Reschke 5755897712
Inject \OCP\IURLGenerator to make tests work
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:50 +02:00
Lukas Reschke 245080e647
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.

This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.

Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.

Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:46 +02:00
Nextcloud bot c13a06b7a5
[tx-robot] updated from transifex 2017-08-30 00:08:36 +00:00
Morris Jobke 7fd3068184
Add shareWith to email template metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:05:12 +02:00
Nextcloud bot a6ea872b1f
[tx-robot] updated from transifex 2017-08-29 00:08:37 +00:00
Morris Jobke 6f9c3ab8a6
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:47:51 +02:00
Joas Schilling 7df1ddcf2c
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:35 +02:00
Nextcloud bot eb71c1288d
[tx-robot] updated from transifex 2017-08-28 00:08:33 +00:00
Roeland Jago Douma f29384a057 Merge pull request #6243 from nextcloud/stable12-circles-token
using CircleProvider on token
2017-08-26 13:49:25 +02:00
Nextcloud bot 2c6bc236cb
[tx-robot] updated from transifex 2017-08-26 00:08:36 +00:00
Nextcloud bot 992c91e288
[tx-robot] updated from transifex 2017-08-25 00:09:08 +00:00
Nextcloud bot 9baf03d28c
[tx-robot] updated from transifex 2017-08-24 00:09:00 +00:00
Maxence Lange 0d4803e6dc using CircleProvider on token
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2017-08-23 16:58:32 +02:00
Roeland Jago Douma 9b3e70f554 Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error
[stable12] Catch exceptions on error of cloud id resolution
2017-08-23 15:59:33 +02:00
Roeland Jago Douma a62620feeb Merge pull request #6148 from nextcloud/backport-6047-select-indexed-columns
[stable12] Use indexed column path_hash to find the parent
2017-08-23 15:58:59 +02:00
Nextcloud bot 8f20b4566a
[tx-robot] updated from transifex 2017-08-23 00:09:04 +00:00
Roeland Jago Douma efdf1a4bb5 Merge pull request #6197 from nextcloud/stable12-check-encoding-log
[Stable12] check encoding log
2017-08-22 09:09:35 +02:00
Nextcloud bot 8e8af07e79
[tx-robot] updated from transifex 2017-08-22 00:08:29 +00:00
Lukas Reschke 179b850e4d
Ensure log message is UTF-8 encoded
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.

Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-21 10:21:54 +02:00
Nextcloud bot de8fe9cbd9
[tx-robot] updated from transifex 2017-08-21 00:08:22 +00:00
Nextcloud bot 6ea56593a7
[tx-robot] updated from transifex 2017-08-20 00:08:24 +00:00
Nextcloud bot 366c73a185
[tx-robot] updated from transifex 2017-08-19 00:08:36 +00:00
Nextcloud bot 7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Nextcloud bot 948d6742ce
[tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Joas Schilling 8f68e0a153
Document that it throws
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 13:57:45 +02:00