upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
42473 commits 951 branches 1208 tags 8.3 GiB
Commit graph

354 commits

Author SHA1 Message Date
Morris Jobke
7bf713edaf
Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13 
[13] Log lock state on conflict
 2018-05-07 16:29:42 +02:00
Robin Appelman
a6ea5eb1b5
remove unneeded locks in getCacheEntry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 15:06:39 +02:00
Robin Appelman
bc1a17a9e2
always log locking errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:35:26 +02:00
Morris Jobke
bb656750f5
Add more logging for the object storage during creation of the buckets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-05 17:29:44 +02:00
Roeland Jago Douma
5a74b9cb99
Fix proper permissions for multiple file access 
Fixes #8890

In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write

Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:02:37 +02:00
Bjoern Schiessle
d4f64b94f2
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-03 18:12:16 +02:00
Robin Appelman
a95ccf4248
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-08 13:09:02 +01:00
Roeland Jago Douma
9413f97b92
Hardening of SimpleFile getContent 
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-02 21:23:41 +01:00
Morris Jobke
197c97e242
Merge pull request #8102 from nextcloud/s3-uploader-13 
[13] Use S3Client::upload instead of splitting single/multipart upload ourselves
 2018-02-08 14:31:23 +01:00
Robin Appelman
6296c498b2
actually return stream from swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 08:10:08 +01:00
Roeland Jago Douma
b88aeb2166
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-05 12:42:47 +01:00
Robin Appelman
7ab3a7e2c3
Use S3Client::upload instead of splitting single/multipart upload ourselves 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-29 16:11:05 +01:00
Robin Appelman
3a1390fdb7
Support arbitrary number of arguments for d:or and d:and in search queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-16 13:27:52 +01:00
Robin Appelman
34ced4dd97
add option to use legacy v2 auth with s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-19 11:54:55 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 20:57:11 +01:00
Robin Appelman
4f0d03e172
additional debug logging on smb copy/rename failures 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-18 13:59:58 +01:00
Robin Appelman
05d2f61a59
handle not found mounts when cleaning avatars 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-11 16:56:10 +01:00
Roeland Jago Douma
e47137c7d4
Merge pull request #6682 from nextcloud/dav-mimetype-fallback 
Fallback to filename based detection if the remote dav server doesn't…
 2017-12-11 15:28:05 +01:00
Morris Jobke
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root 
delay calculating the shared cache root until it's used
 2017-12-06 15:14:48 +01:00
Robin Appelman
046eb0c635
add retry wrapper when reading files from swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 16:34:53 +01:00
Robin Appelman
c87d689253
delay calculating the shared cache root until it's used 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 15:16:39 +01:00
Morris Jobke
be4e921306
Use basename() instead of self implementation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 12:35:47 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root 
Use the correct root for shared jail when the source storage is also a jail
 2017-11-23 12:03:36 +01:00
Bjoern Schiessle
1ade6b0817
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:45:46 +01:00
Björn Schießle
c225bbd021
Merge pull request #7113 from nextcloud/s3-download-stream-fix 
Fix s3 download and touch
 2017-11-14 20:38:50 +01:00
Robin Appelman
56fd462718
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-10 17:03:27 +01:00
Morris Jobke
5d8421135e
Merge pull request #7014 from nextcloud/rename-locks 
Unlock files even if an exception occurs while renaming
 2017-11-09 09:47:36 +01:00
Lukas Reschke
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath 
Allow getting the filepath when getting cached mounts by fileid
 2017-11-09 00:04:25 +01:00
Robin Appelman
c566b2854b
Use non empty files for object store touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:51:02 +01:00
Robin Appelman
70a4860ccb
Fix contructing headers for s3 download 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:50:46 +01:00
Morris Jobke
19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance 
Improve performance of UserMountCache with external storage folders
 2017-11-07 17:32:06 +01:00
Morris Jobke
4866314ce0
Run updated license header updater 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-07 13:47:42 +01:00
Morris Jobke
31c5c2a592
Change @georgehrke's email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 20:38:59 +01:00
Morris Jobke
da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers 
Update license headers
 2017-11-06 18:48:04 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
8b763ea0f7
Better error message for invalid bucket names 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 09:48:41 +01:00
korelstar
c7482402b8 Unlock files even if an exception occurs 
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
 2017-11-03 18:29:04 +01:00
Roeland Jago Douma
687c92bfd3
Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage 
Fix seeking on object storage
 2017-11-02 14:56:51 +01:00
Dariusz Olszewski
07016a1e5b Improve performance of UserMountCache with external storage folders 2017-11-01 21:11:39 +01:00
Joas Schilling
3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage 
Improve mimetype detection for object storages
 2017-11-01 11:04:15 +01:00
Joas Schilling
defc4bf6a8
Merge pull request #6975 from nextcloud/s3-read-object-fopen 
use fopen directly when reading objects from s3
 2017-11-01 10:57:56 +01:00
Joas Schilling
94f3fc63bc
Use ::class and fix missing doc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-28 11:49:36 +02:00
Robin Appelman
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 14:35:34 +02:00
Robin Appelman
f9a7294807
use fopen directly when reading objects from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 12:58:19 +02:00
Morris Jobke
de912385e0
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-10-27 12:16:28 +02:00
Morris Jobke
405bbc1c61
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-10-26 16:31:59 +02:00
Julius Härtl
4cfa1c66b8
Doc: Fix phpDoc issues 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Robin Appelman
91b3536f45
propagate multipart upload exception when aborting upload 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-17 15:10:58 +02:00
Roeland Jago Douma
a5912cbe33 Merge pull request #6812 from nextcloud/upload-cache-path 
also use configured 'cache_path' for new chunking
 2017-10-15 21:42:41 +02:00
Robin Appelman
e393b3553e
set s3 part size to 500mb 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-11 15:59:53 +02:00