Commit Graph

924 Commits

Author SHA1 Message Date
Robin Appelman 817f2f8f49
adjust swift external storage to new openstack sdk
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-19 19:41:16 +01:00
Roeland Jago Douma 7ad1e13961
Merge pull request #8158 from nextcloud/s3-minio
Use a more widely available method to test s3 settings
2018-02-19 17:09:36 +01:00
Morris Jobke d3d045dd5c
Remove unused import statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Roland Tapken 8e251e5d5a Make SMB module more fault-tolerant
Ignore unavailable files when fetching the share's mtime
or reading directory listings. This can happen on servers using a
distributed file system (DFS) with unavailable destinations, for example
when the remote server is offline.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-02-09 17:40:00 +01:00
Morris Jobke 12c9bad5b2
Merge pull request #8100 from nextcloud/s3-folder-delete
Fix deleting folders when using s3 external storage
2018-02-08 14:11:12 +01:00
Robin Appelman 48ea714341
Use a more widely available method to test s3 settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 09:34:05 +01:00
Robin Appelman 84bd2b6bc9
fix invalidating folder cache for s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-29 15:09:15 +01:00
Robin Appelman 7afd77604e
adjust s3 bulk delete to new sdk syntax
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-29 15:06:10 +01:00
Morris Jobke eb51f06a3b
Use ::class statement instead of string
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
Morris Jobke a661f043e1
Remove unneeded semicolon and parentheses
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +01:00
Morris Jobke 4c38d1ed01
Merge pull request #8054 from nextcloud/substr-use-index
Use index based string access for substr with length of 1
2018-01-26 15:40:44 +01:00
Morris Jobke 9ff51aafc5
Use index based string access for substr with length of 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 13:38:34 +01:00
Morris Jobke 6bbea33133
Simplify ternary operator statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 12:36:25 +01:00
Joas Schilling c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value
Return value immediately instead of assigning to a one-time variable
2018-01-26 10:15:39 +01:00
Morris Jobke 0a56d2185e
Return value immediately instead of assigning to a one-time variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +01:00
Morris Jobke 16a558871c
Use proper code flow instead of not needed else branch
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 23:01:03 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
Roeland Jago Douma 05f75f803a
[files_external] OCS endpoint to proper OCSController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-18 11:15:03 +01:00
Roeland Jago Douma dffa922c0b
Remove deprecated functions for OCP\Util
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 19:41:34 +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 b01d20c0d7
Merge pull request #7556 from nextcloud/smb-stat-exception
handle exceptions in SMB::stat
2017-12-18 22:31:05 +01:00
Robin Appelman 3fa13b48fc
handle exceptions in SMB::stat
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 15:55:46 +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 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
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Roeland Jago Douma 87e10f9e6a
OC_OCS_Response is deprecated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:00 +02:00
Robin Appelman c83232adae
Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-19 17:18:04 +02:00
Robin Appelman 91f44f5309
fix undefined constants
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman 9154b27943
disable part files for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman cc9dd4280f
add stat cache for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman d5678201b4
more efficient is_dir
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman 4bbc1cdc79
more efficient permissions for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman 9b5accf9f3
more efficient write only fopen
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman d70607104e
reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman dad18baec8
update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman e9a58f8579
show storage as unavailable in the file list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-04 11:54:13 +02:00
Robin Appelman 68ee79b595
set the exception for failedstorage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-04 11:54:13 +02:00
Morris Jobke 442d4ed24a
Use the FailedStorage instead
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 11:54:13 +02:00
Vincent Petry 5df5b9c8b1
Handle invalid ext storage backend to keep mount point visible
Keep mount point visible and also ext storage config visible when
dealing with configs relating to storage backends or auth mechanisms
that were provided by an app that is currently disabled.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 11:54:08 +02:00
Vincent Petry 2cb3461146 Move GDrive external storage to a separate repo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-21 09:59:10 +02:00
Vincent Petry 653610559d Bye bye Dropbox v1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-16 11:03:25 +02:00
Lukas Reschke f698aa11e7 Merge pull request #6101 from cbartz/patch-1
Missing array assignment in Swift.php
2017-08-15 18:17:58 +02:00
Christopher Bartz bbd8797f1e Remove tmpFiles Array in Swift.php
tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.
2017-08-14 17:35:04 +02:00
Robin Appelman ca3aef0486 Merge pull request #5872 from nextcloud/swift-filter-dot
Filter magic dot object when swift directory
2017-08-14 15:11:53 +02:00
Robin Appelman 578e4f9903
Filter magic dot object when swift directory
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-01 14:57:33 +02:00
Joas Schilling 7a62fbd205 Fix comparisons in the files external app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Roeland Jago Douma ede15f0988
Fix L10N::t
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma fd465d4e49
[files_external] Fix phpdoc
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma 19b039e6e0
[files_external] fix commands
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Roeland Jago Douma b7c8e9ed88
[files_external] Fix phpdoc
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Lukas Reschke dfd8125aeb
Replace wrong PHPDocs
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Joas Schilling 28290d8691 Allow to enable the external storage app via the web ui
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-26 14:30:21 +02:00
Lukas Reschke 3d2600b039
Add Phan plugin to check for SQL injections
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.

As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.

The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-20 22:48:13 +02:00
Lukas Reschke d8ec399454
Run phan over code base
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
Morris Jobke 711d861d8b Merge pull request #5556 from nextcloud/files_external_sftp_2048_4096
[Files external] Add support for 2048 and 4096 bit RSA key generation
2017-07-04 17:37:25 +02:00
Roeland Jago Douma e3127b8899
Remove unused member
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-06-30 09:13:36 +02:00
Roeland Jago Douma 25e08bc8a0
Allow 2048 and 4096 bit SFTP keys
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-06-29 09:32:24 +02:00
Robin Appelman 0dcce5a835
move personal external storage settings to it's own section
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
Robin Appelman 0baeec170e
use the correct param type when getting external storages for groups
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-22 17:39:56 +02:00
Morris Jobke 3eba37ac14 Merge pull request #4527 from nextcloud/downstream-27504
Adjust SMB permissions on the root
2017-05-01 12:53:49 -03:00
Robin Appelman ab9a36e872
allow apps to set custom mount types
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
Robin Appelman acb0903514
remove duplicate method
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-26 16:45:04 +02:00
Robin Appelman 43970b93d1
remove excessive logging
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-26 16:41:48 +02:00
Juan Pablo Villafáñez 71012b3432
Adjust SMB permissions on the root 2017-04-26 16:23:52 +02:00
Morris Jobke 4c2c08f376 Merge pull request #4416 from gvmura/avoid-duplicate-files-google
Avoid duplicate files in google with the same name
2017-04-26 01:26:04 -03:00
Morris Jobke c54a59d51e
Remove unused use statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
gvmura 0d063c316a avoid duplicate files in google with the same name
Signed-off-by: gvmura <gvmura@uniss.it>
2017-04-21 11:30:02 +02:00
Morris Jobke 8a743e0359 Merge pull request #4404 from Ardinis/master
Remove json handling for files_external:config
2017-04-20 17:59:35 -05:00
Ardinis 71118214f9 reviewed 2017-04-20 11:31:04 +02:00
Joas Schilling 1c0bffe87f
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Ardinis 3db84ed90a Remove json handling for files_external:config
#4347
2017-04-14 15:42:45 +02:00
Björn Schießle 49d8716eaa Merge pull request #4312 from nextcloud/cleanup-name
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
Morris Jobke 83864d465e
[files_external] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:45:19 -05:00
Morris Jobke 1729e4471f
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Arthur Schiwon 30c95b51fb
fix fseek against string not resource by removing append support
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-04 20:25:59 +02:00
Roeland Jago Douma 57020a0c36 Merge pull request #3438 from nextcloud/external-storage-user-folder
Allow using '/' as external storage mountpoint
2017-03-31 15:07:39 +02:00
Robin Appelman 76d8699c0f
Allow using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 14:03:22 +01:00
Jörn Friedrich Dreyer 9eca1da1dd
allow configuring authType for DAV backend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:13:42 -06:00
Martin 718d1f3f15
fix typo in sftp public key
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:44:09 -06:00
Robin Appelman 5acebb911b
fix self test for non leading slash
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 18:04:59 +01:00
Robin Appelman d9a6353bc1
Make the notify self test for subfolders more reliable
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 17:38:29 +01:00
Morris Jobke 5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store
Login credential store
2017-01-30 19:30:04 -06:00
Morris Jobke 687e38c409 Merge pull request #2970 from nextcloud/notify-self-test
Add self-test for files_external:notify
2017-01-30 17:15:57 -06:00
blizzz 64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
Robin Appelman d14ff70050
add unit tests for smb notify backend
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:45 +01:00
Robin Appelman 72eeb8fd22
add notify self test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:41 +01:00
Robin Appelman c7536f7877
switch occ files_external:notify to new notify mechanism
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:37 +01:00
Robin Appelman 269747985e
Add a more powerful notify mechanism
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:33 +01:00
Morris Jobke a4ad8af6e3
Add proper default value for datadir
* better safe than sorry
* fixes #3091

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:49:41 -06:00
Joas Schilling 17a7eaabcd
Add the icons for shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:22 +01:00
Christoph Wurst 6f74ecd94a
use login hook credentials as fallback
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst e4abb9cb6e
migrate 'password::sessioncredentials' extern storage auth to credential store
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Robin Appelman 5774d3e82c
replace close:// streamwrapper with CallBackWrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
Robin Appelman 8429687788
Update icewind/smb to 2.0.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-05 09:16:03 +01:00
Lukas Reschke 00b4dedef5 Merge pull request #2550 from nextcloud/smb-notify-rename
Fix order of parameters when getting notified of smb renames
2016-12-16 16:11:39 +01:00
Lukas Reschke 511056dd3f Merge pull request #1678 from nextcloud/smb-stat-root
Fix mtimes for share root
2016-12-16 13:41:33 +01:00
Robin Appelman b5401adc00
Fix order of parameters when getting notified of smb renames
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-07 16:25:10 +01:00
Robin Appelman 0a246f9852
split off s3 connection logic
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:30:36 +01:00
Robin Appelman 85bd5589cb
Fix mtimes for share root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-11 11:09:05 +02:00
Robin Appelman e8e950a4d2
more efficient querying of numeric storage ids 2016-09-07 17:22:40 +02:00