Commit Graph

856 Commits

Author SHA1 Message Date
Robin Appelman e34ee9099d add files_external:notify command 2016-07-14 16:00:57 +02:00
Robin Appelman e1fa314b18 add notify support to smb storage 2016-07-14 14:46:01 +02:00
Robin Appelman 29eeeb2273 Save the files external mount id in the mount cache table 2016-07-13 16:34:08 +02:00
Morris Jobke c2d88a08b7
Remove unneeded checks if it runs on a Windows machine
* the setup check is still there
2016-07-08 15:55:17 +02:00
Robin Appelman f98cb9efa0
Fix type hinting 2016-07-08 12:35:50 +02:00
Robin Appelman 8f84c99e3f
Fix undefined properties 2016-07-08 12:35:16 +02:00
Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Robin Appelman 9fb92b56ec show configuration options for authentication backends while listing storage
Fixes #22447
2016-06-30 15:50:14 +02:00
Robin Appelman f982d104f3 hide hidden parameters from list backend/auth parameters 2016-06-30 15:44:42 +02:00
Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Morris Jobke cee2f5dc65 Merge pull request #233 from nextcloud/allow-users-to-change-global-credentials
Allow regular users to specify global credentials password
2016-06-27 17:03:19 +02:00
Lukas Reschke 341dabf300 Merge pull request #190 from nextcloud/add-wnd-1
Add "Login credentials" and "User Provided"
2016-06-27 16:15:31 +02:00
Lukas Reschke 1cd255af56
Allow regular users to specify global credentials password
While the UI is existent the feature simply doesn't work because admin privileges are required for the controller. This adds proper permission checks and also unit tests.

To test this:
1. Enable external storage
2. Login as non-admin user
3. Go to personal page and try to change global credentials
2016-06-27 12:29:27 +02:00
Vincent Petry 0d3de20b02 Quickfix: do not lazy load auth mechanisms for ext storages
Some auth mechanisms like SessionCredentials need to register hooks
early, so they cannot be lazy loaded.
2016-06-27 10:50:10 +02:00
Lukas Reschke 7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Robin Appelman bac1a3a623 Add option to `occ files_external:list` to show all configured mounts 2016-06-23 13:12:03 +02:00
Robin Appelman eed1c52aec Hide more default options in occ files_external:list 2016-06-22 13:34:55 +02:00
Lukas Reschke d5dd30c3a0
Add "Login credentials" and "User Provided"
This adds the "Login Credentials" and "User Provided" option to the external storage implementation, it is basically done by reverting 176fb191b7 from https://github.com/owncloud/core/pull/22432.

This was taken from owncloud/core which is AGPL licensed.
2016-06-21 14:58:35 +02:00
Robin Appelman 6affbdc6e7
Add "Global Auth" option to external storage
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93 from https://github.com/owncloud/core/pull/22468.

This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.

![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png)
2016-06-21 14:16:45 +02:00
Vincent Petry ef5217d6e8 Merge pull request #25173 from owncloud/fix_conversion_issues
Fix conversion issues
2016-06-20 17:15:45 +02:00
Juan Pablo Villafáñez bb24e40bf4 Fix conversion issues
Change to phpdoc type for automatic conversion
2016-06-20 14:51:36 +02:00
Vincent Petry 09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests
Fix GDrive test rename overwrite folder
2016-06-20 11:02:24 +02:00
Vincent Petry e325209291
Convert Dropbox Forbidden exception to StorageNotAvailableException 2016-06-14 17:38:32 +02:00
Vincent Petry c51bdd1809
Fix GDrive test rename overwrite folder 2016-06-10 14:53:37 +02:00
Vincent Petry ac163426ef Merge pull request #25008 from owncloud/externals_test_with_origin
Add support to know where the storage test comes from
2016-06-09 16:21:05 +02:00
Juan Pablo Villafáñez 7d85bed1fc Change the default value to true instead of null 2016-06-08 12:48:33 +02:00
Vincent Petry fa9c96ac4f
Fix GDrive file size when mime type doesn't match contents
Uploading a txt file with XML contents makes GDrive return the XML mime
type.

This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size
properly rely on the Google Docs mime types.
2016-06-08 09:46:49 +02:00
Juan Pablo Villafáñez 110edd3d3c Rename variable 2016-06-07 18:25:17 +02:00
Juan Pablo Villafáñez 8526bbb347 Add support to know where the storage test comes from 2016-06-07 16:53:16 +02:00
Vincent Petry 15fffb2b10
Fix GDrive upload file which name might match the one of a folder
Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
2016-06-07 16:29:23 +02:00
Arthur Schiwon c9132261c8 implement specific rename handling for SMB 2016-05-31 13:32:11 +02:00
Robin McCorkell 4ea7a349d2 Fix SMB backend registration 2016-05-30 21:25:10 +01:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Vincent Petry ae4ee56997 Merge pull request #24814 from owncloud/fix-psr4-external-maste
Move Stuff to PSR-4 again
2016-05-25 09:12:17 +02:00
Vincent Petry e8c3794308 Merge pull request #7897 from owncloud/ext-swiftcaching
Added object cache for Swift ext storage
2016-05-24 16:21:30 +02:00
Joas Schilling 794c566244
Move Stuff to PSR-4 again 2016-05-24 16:10:22 +02:00
Vincent Petry f7d102ccc5 Merge pull request #24799 from owncloud/altyr-117-upstream
Update google-api-php-client to 1.1.7
2016-05-24 14:46:10 +02:00
Vincent Petry 648fc8d916 skip google map files (#24807) 2016-05-24 14:45:29 +02:00
Robin Appelman 8a40003169 fix phpdoc 2016-05-24 13:58:08 +02:00
Robin Appelman c031eafd84 Fix cert bundle path 2016-05-24 13:44:43 +02:00
Vincent Petry f77a11a876
Added object cache for Swift ext storage
This avoid calling the remote API for repeated calls to is_dir,
filetype, etc
2016-05-24 13:29:29 +02:00
Vincent Petry 4635ed7748
Fix autoloading for new google SDK lib 2016-05-24 12:22:30 +02:00
Francesco Rovelli 49bec94959
enable autoload of lib in google storage 2016-05-24 12:22:30 +02:00
Joas Schilling 3eba0c479f
Fix import path for 3rdparty dropbox autoloader
We moved the file by one level
2016-05-24 12:15:53 +02:00
Joas Schilling 64538740ec
Fix missing imports 2016-05-24 08:41:22 +02:00
Joas Schilling f14dff680d
Move remaining classes to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling 4576891f10
Move Lib\Storage to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling b9fd7d4cc7
Move Config to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling 6ea54e73e8
Move Lib\Backend to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling 6d7a1b9bd4
Move Lib\Auth to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling 328b3c47d7
Move stuff from outside lib/ to PSR-4 2016-05-24 08:41:20 +02:00
Vincent Petry 4728308a9e Merge pull request #24585 from owncloud/files_external_lazy
Load external storage backends/auth mechanisms lazily
2016-05-19 18:08:17 +02:00
Vincent Petry 5585fa0a68 Merge pull request #24630 from owncloud/one-shall-adjust-the-path
Use proper path
2016-05-17 10:11:21 +02:00
Robin McCorkell af0930fe59 Introduce backend/auth mechanism providers
Direct registration of backends/auth mechanisms is now deprecated
2016-05-11 21:16:26 +01:00
Lukas Reschke 0d8393178b
Use proper path
Fixes https://github.com/owncloud/core/issues/24407
2016-05-03 14:37:50 +02:00
Robin McCorkell 43abe2b648 Add links to load GDrive/Dropbox configuration pages 2016-05-03 11:30:02 +01:00
Robin McCorkell de98a6e54c Allow multiple custom JS files 2016-05-03 11:30:02 +01:00
Vincent Petry 4326d73ff6
Fix SMB storage to not normalize UTF8
This makes sure that even if a NFD file name exists, it is found by the
storage and will be visible to higher layers. Even though the file will
be discarded anyway there, it gives the scanner a chance to display a
warning at least.
2016-04-29 16:19:53 +02:00
Robin Appelman baff79cc63 Fix loading the dropbox autoloader 2016-04-15 12:46:47 +02:00
Robin McCorkell 9a78cac2eb Fix OCA\Files\External\Api namespace 2016-04-14 00:49:47 +01:00
Robin McCorkell 4717605d22 Fix storage backend class namespaces and move to subdir
All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar
2016-04-14 00:44:28 +01:00
Thomas Müller 690eef26dd Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp
Add urlencode to username part of ftp and sftp links
2016-03-31 23:18:10 +02:00
Frank Karlitschek 6d40e69e29 Merge pull request #23517 from owncloud/gdrive-stream-download
GDrive stream download with RetryWrapper
2016-03-31 21:17:10 +02:00
Thomas Müller dea3985e86 Merge pull request #23516 from owncloud/dropbox-stream-download
Dropbox stream download with RetryWrapper
2016-03-31 20:07:36 +02:00
Thomas Müller 8394985e14 Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp
Use RetryWrapper for SFTP storage
2016-03-31 11:24:47 +02:00
Lukas Reschke 3dc5c59e57 Use RetryWrapper for SFTP storage
Equivalent to https://github.com/owncloud/core/pull/23442

Required for making encryption work with external storage reliable.
2016-03-30 22:45:09 +02:00
Vincent Petry 7be541bda1 GDrive stream download with RetryWrapper 2016-03-30 18:39:41 +02:00
Lukas Reschke bd93722e12 Use the shipped cacerts.pem instead of the global one
The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
2016-03-30 16:58:39 +02:00
Vincent Petry 02c2568442 Dropbox stream download with RetryWrapper 2016-03-23 18:06:01 +01:00
Thomas Müller 5e4f9b8627 Merge pull request #23440 from owncloud/fix_22286
apply retry wrapper to make sure that we always read/write a complete block
2016-03-22 09:50:05 +01:00
Thomas Müller 2357bbf80a Merge pull request #23439 from owncloud/smb-permissions
properly use smb permissions
2016-03-21 18:05:45 +01:00
Thomas Müller 736b80f0cb Merge pull request #23323 from owncloud/gdrive-chunkupload
Chunk upload for GDrive
2016-03-21 18:02:55 +01:00
Bjoern Schiessle f761733f17 apply retry wrapper to make sure that we always read/write a complete block 2016-03-21 17:39:43 +01:00
Robin Appelman 8ab70b1231 properly use smb permissions 2016-03-21 14:35:41 +01:00
Thomas Müller 0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory
Fix dropbox storage to not store the whole file in memory
2016-03-17 20:52:41 +01:00
Vincent Petry 5db41dfbed Only use GDrive chunks when needed 2016-03-17 12:36:47 +01:00
Vincent Petry aa2674e7e2 Chunk upload for GDrive
Instead of storing the WHOLE file in memory in a PHP variable, use the
library's chunk upload support.
2016-03-16 17:57:54 +01:00
Robin Appelman d498282e12 handle connection errors as storage not available in smb 2016-03-16 13:15:54 +01:00
Senorsen a6631eceb4 Add urlencode to username part of ftp and sftp links
according to #17796
2016-03-16 01:49:40 +08:00
Vincent Petry ab50ba7a58 Fix dropbox storage to not store the whole file in memory
Since the library can only store the full response in memory on
download, we use an alternate client lib and set the correct headers to
be able to stream the content to a temp file.
2016-03-15 18:05:27 +01:00
Robin Appelman a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman 3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Lukas Reschke d14adb2351 Fix compatibility with PHP 5.4
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 18:04:24 +01:00
Vincent Petry 4255dd2b39 Properly set exception in FailedStorage 2016-03-03 14:37:23 +01:00
Robin Appelman 6990100e6e allow availability recheck for external storages 2016-03-03 14:19:34 +01:00
Lukas Reschke c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke 933f60e314 Update author information
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Thomas Müller 914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
Thomas Müller 202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption
Copy into local file
2016-02-25 14:35:39 +01:00
Lukas Reschke aebb900cd4 More error handling 2016-02-25 10:12:31 +01:00
Lukas Reschke 3b5ddb417c Copy into local file
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣

This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.

While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90 for the breaking change.

To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.

Fixes https://github.com/owncloud/core/issues/22590
2016-02-25 09:40:30 +01:00
Lukas Reschke db2ddb5441 Properly cast type
The current logic is checking whether:

1. The returned value is a boolen
2. The returned value is a string and then matches for "true"

Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP.

This change casts the data to a boolean if it is defined as boolean.

Fixes https://github.com/owncloud/core/issues/22605
Fixes https://github.com/owncloud/core/issues/22016
2016-02-24 19:58:41 +01:00
Vincent Petry 4829a2d421 Disable sharing by default for external storage mounts
This is for newly created mount points.

Migrated mount points will have sharing enabled as before.
2016-02-24 13:58:21 +01:00
Thomas Müller ae2304f23f Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes
Fix GDrive handling of office files
2016-02-19 09:13:35 +01:00
Thomas Müller bfd4a9548b Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection
Fix GDrive mime type detection with encryption
2016-02-18 10:14:01 +01:00
Robin Appelman c2c6caee93 remove global credentials 2016-02-17 13:55:27 +01:00
Robin Appelman 176fb191b7 remove login credentails and user provided backends 2016-02-16 15:27:55 +01:00
Vincent Petry d38b71f206 Fix GDrive mime type detection with encryption
When encryption is enabled, GDrive would think that all files are text
files. This fix falls back to the extension based detection when a
non-special mime type is returned
2016-02-15 17:09:08 +01:00
Vincent Petry 075dd54f6c Fix GDrive handling of office files
1) Properly detect empty file extension, can be null.

2) When renaming part file to final file, use the correct file name
without extension, if it exists

3) When renaming a file, do not delete the original file if it had the
same id, which can happen with part files
2016-02-15 16:49:12 +01:00
Robin Appelman edbe5d7b6d handle forbidden exceptions in smb backend 2016-02-10 16:52:13 +01:00
Robin Appelman 87179eaae2 Add tests 2016-02-08 15:53:46 +01:00
Robin Appelman 678a3abf6d handle no user set for personal global auth 2016-02-08 13:45:52 +01:00
Robin Appelman 54d2175bf5 Add occ files_external:create command to add new mounts 2016-02-05 14:20:22 +01:00
Thomas Müller 342c2aac98 Merge pull request #20920 from owncloud/issue_20888
Add dialog to enter credentials on errored mount point
2016-02-05 10:05:23 +01:00
Robin Appelman b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
Robin Appelman d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman 2e3a5ccaaa show failed external storages properly 2016-02-04 16:33:08 +01:00
Jesús Macias 8fa96435b0 Add credentials dialog for user provided auth 2016-02-04 16:33:08 +01:00
Robin Appelman 9dfe9f77f2 Add global auth backend for files external 2016-02-04 14:57:17 +01:00
Robin Appelman f4e1a1677b Remove magic flags from files_external backend params 2016-02-02 15:10:59 +01:00
Vincent Petry 04b88b4aaa Reword external storage auth backends 2016-02-01 12:20:21 +01:00
Robin Appelman d0f5687687 Dont set null values when validating storage definition 2016-01-29 14:51:30 +01:00
Robin Appelman efcf790eff minor fixes 2016-01-29 14:51:30 +01:00
Robin Appelman 03c79ac24f remove custom controler for user provided password auth 2016-01-29 14:51:30 +01:00
Robin Appelman 5bdcd534b1 dont show user provided auth as option for personal mounts 2016-01-29 14:51:30 +01:00
Robin Appelman 860d51487b Allow setting user provided credentials from the personal settings page 2016-01-29 14:51:30 +01:00
Robin Appelman 419507c118 Add user provided credentials mechanism 2016-01-29 14:50:52 +01:00
Robin Appelman adbc5a0b41 Fix invalid storages not showing in directory listing 2016-01-29 14:50:52 +01:00
Robin Appelman 54e58b520c Handle no user set in sftp constructor 2016-01-26 14:48:45 +01:00
Thomas Müller 0a4142d5df Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download
Streaming download from Swift in files_external
2016-01-22 17:27:41 +01:00
Thomas Müller 9b4c9a0357 Merge pull request #18531 from owncloud/ext-user-credentials
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Robin McCorkell 3fe802d931 Introduce 'login credentials' auth mechanism
Stores user credentials in the database after user login, uses the new
CredentialsManager class
2016-01-18 11:10:41 +01:00
Vincent Petry d608c37c90 Use Guzzle stream to download files from GDrive
The API library does not support streaming and always reads the full
file into memory.

This workaround copies the signed headers to a Guzzle request and
returns the response as stream.
2016-01-14 17:52:30 +01:00
Thomas Müller 5565b19382 Merge pull request #21648 from owncloud/smb-statcache-cap
cap the number of entries we cache in smb's statcache
2016-01-13 10:33:43 +01:00
Thomas Müller 682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Robin Appelman d8d6368dd7 cap the number of entries we cache in smb's statcache 2016-01-12 13:26:58 +01:00
Daniel Tosello 8783eb99f7 Modified swift handling to explicitly set 404 responses to false 2016-01-12 16:47:52 +11:00
Thomas Müller d7d0cfc775 Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers
Allowing access to Swift containers shared by ACL
2016-01-08 20:13:13 +01:00
Robin Appelman 88bfe1477d Filter getStorage to make sure the user has access to it 2016-01-08 15:30:45 +01:00
Tim Dettrick 8799d5563f Allowing access to Swift containers shared by ACL
To avoid a confusing extra field, the bucket field is overloaded to
optionally take a URL.
2016-01-08 11:42:28 +01:00
Robin McCorkell fc52327d2c Check libsmbclient-php as well as smbclient binary 2016-01-07 08:56:45 +01:00
Thomas Müller 24271cf953 Merge pull request #21216 from owncloud/fopen-statcache
Clear SMB statcache after fopen
2015-12-28 10:21:26 +01:00
Robin Appelman 667d7383e1 clear statcache after fopen for smb 2015-12-15 14:24:02 +01:00
Robin Appelman f27e98a3e2 Migrate files external for the user that the filesystem is being setup for 2015-12-14 13:38:54 +01:00
Scrutinizer Auto-Fixer ffc49a24f0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-10 16:43:37 +01:00
Daniel Tosello 41f1feaf23 Fixing swift fopen by ensuring stream is a valid resource 2015-12-10 16:40:17 +11:00
Tim Dettrick cb9a4d4cdc Streaming download from Swift external storage
Speeds up downloads as they no longer need to buffer completely on the
ownCloud server before being sent to the client.
2015-12-10 15:55:45 +11:00
Thomas Müller bffd7a1d93 Merge pull request #21059 from owncloud/remove-deaed-code-mount-config
Remove dead code
2015-12-09 13:05:14 +01:00
Thomas Müller 51b5498be8 Merge pull request #21003 from owncloud/personal-mount-mountid
Dont set the string storage id to the numeric storage id for personal mounts
2015-12-09 10:05:36 +01:00
Lukas Reschke 025f021fd4 Remove dead code
Silences two other security warnings, also I cleaned up the PHPDoc a little bit.
2015-12-09 08:18:47 +01:00
Lukas Reschke f55a56ff6c Use proper PHPDoc reference 2015-12-08 09:45:20 +01:00
Thomas Müller 7dd1874188 Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen
Improving fopen behaviour for Swift backend
2015-12-07 16:50:07 +01:00
Robin Appelman eec4f82cf0 Dont set the string storage id to the numeric storage id for personal mounts 2015-12-07 16:15:37 +01:00
Scrutinizer Auto-Fixer 97f9213da9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00
Thomas Müller e44b164f40 Merge pull request #20569 from owncloud/issue_20427
Show external storage status in file list + prompt credentials if different
2015-12-07 10:27:35 +01:00
Tim Dettrick 35ab7f0e64 Improving fopen behaviour for Swift backend 2015-12-07 10:20:09 +01:00
Robin Appelman a1898dc2bf db config backend for files_external 2015-12-04 13:48:21 +01:00
Jesus Macias Portela dcfbbe4737 Merge branch 'master' into issue_20427 2015-12-03 12:35:49 +01:00