Commit Graph

311 Commits

Author SHA1 Message Date
Robin Appelman 50162e619c
disable part files for object stores
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:37 +01:00
Morris Jobke 08a13dde4a
Merge pull request #8101 from nextcloud/s3-uploader-12
[12] Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:31:36 +01:00
Robin Appelman ce4f74bec2
actually return stream from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 08:12:51 +01:00
Roeland Jago Douma 10efe528ed
Do not try to get the jailed path if we can't find the id
Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 12:21:27 +01:00
Robin Appelman 8d5b86c159
Use S3Client::upload instead of splitting single/multipart upload ourselves
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-29 16:11:23 +01:00
Robin Appelman 4ec4a7df93
add option to use legacy v2 auth with s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-09 18:21:47 +01:00
Robin Appelman 3ec1bbbde8
Allow getting the filepath when getting cached mounts by fileid
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-12 14:11:40 +01:00
Roeland Jago Douma ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12
[12]add retry wrapper when reading files from swift
2017-12-08 09:26:41 +01:00
Morris Jobke 5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12
[12]Use the correct root for shared jail when the source storage is also a jail
2017-12-08 09:03:03 +01:00
Robin Appelman 0519ca5893
add retry wrapper when reading files from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-06 15:43:00 +01:00
Robin Appelman 4144580167
delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
Morris Jobke 1cd5ba3e90
Merge pull request #7144 from nextcloud/rename-locks-stable12
Unlock files even if an exception occurs (stable12)
2017-12-04 11:13: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
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
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
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
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
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
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
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
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
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 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
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
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
Roeland Jago Douma 745ad2f323
Fix copy from jailed storage
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 08:07:00 +02:00
Sebastian Kostka 09b120c6da [Stable 12] Removed cast to integer in getSize
Fixes - Wrong or no sizes of files/folders #5031 for 32-bit systems a direct cast to integer causes problems.
Backport from #5744

Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
2017-07-29 07:40:13 +02:00
Artem Kochnev 3d54cef078 Fix for mb strlen
Error with moving files with long names in UTF-8
2017-07-22 11:10:25 +02:00
Morris Jobke 816f1e63e9 Merge pull request #5757 from nextcloud/mount-rename-12
[12]  Fix renaming of non-renamble mounts
2017-07-21 23:30:42 +02:00
Robin Appelman 9c2dce34e9
Also repair storage id's when repairing invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-19 12:34:00 +02:00
Robin Appelman d7620e3970
non movable mounts can not be moved
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 15:40:45 +02:00
Morris Jobke 9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Robin Appelman 5804dfc078
Fix scan permissions with nested permissions masks
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:37:09 +02:00
Robin Appelman 996269cfdd
fix moving folders out of a cache jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Robin Appelman 2f7d0bbb18
Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Robin Appelman a277101133 improved logging of objectore errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-04 11:14:41 +02:00
Michael Munger 513401bdb6 Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071 2017-06-13 18:05:16 -05:00
Lukas Reschke 8c624bdef9 Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner
Make sure we use the passed-in storage when there is one
2017-05-19 00:49:58 +02:00
Robin Appelman 1f1e1b0d00
use unmasked permissions during scanning
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-18 16:38:54 +02:00