Commit Graph

653 Commits

Author SHA1 Message Date
Frank Karlitschek b216b3fad0 Merge pull request #15215 from owncloud/ext-gdrivelistfilequoting
Properly quote file names in listFiles query for GDrive
2015-03-31 09:08:59 -04:00
Robin McCorkell 308a43a10e Merge pull request #15076 from owncloud/fix-smb-oc-admin
Support constructing an SMB_OC without saved session credentials
2015-03-30 15:38:22 +01:00
Robin McCorkell c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Vincent Petry 58b4c2c0e5 Make sure mountOptions keep their data type
str_replace for $user substitution was converting the data type of
mountOptions to string. This fix prevents this to happen by making sure
only strings are processed by substitution.

Also added a int conversion when reading the watcher policy
2015-03-26 19:24:37 +01:00
Vincent Petry 534892d456 Added rawurlencode for other params in GDrive storage 2015-03-26 13:57:28 +01:00
Vincent Petry 43588fe2f7 Properly quote file names in listFiles query for GDrive 2015-03-26 12:15:02 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Robin McCorkell 1f3fdf17ef Support constructing an SMB_OC without saved session credentials 2015-03-20 16:24:30 +00:00
Vincent Petry e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework
Cleanup ext storage CRUD code, introduce storage config id
2015-03-20 14:17:32 +01:00
Robin McCorkell c37913b1d5 Introduce async status checking 2015-03-20 09:48:14 +00:00
Vincent Petry e5e30924b1 Fix PHPDoc in files_external, add missing tag
Fix various PHPDoc issues in external storage app.

Added missing NoAdminRequired tag
2015-03-17 11:42:52 +01:00
Vincent Petry 5b6ecb2d98 Fix root request path for Dropbox 2015-03-17 10:56:24 +01:00
Vincent Petry 72632ad402 Generate storage config ids when missing
When reading in old mount.json files, they do not contain config ids.
Since these are needed to be able to use the UI and the new service
classes, these will be generated automatically.

The config grouping is based on a config hash.
2015-03-16 12:18:01 +01:00
Vincent Petry fb4cf53253 Fix mount config unit tests
Fix expected result now that it returns the status.
Added isset for some properties that are not always present.
2015-03-13 17:43:38 +01:00
Vincent Petry 34c8b1ac77 Mount options for ext storage are now passed around
The mount options are now passed to the UI and stored in a hidden field.
The ext storage controllers and services also know how to load/save them
from the legacy config.
2015-03-13 12:49:11 +01:00
Thomas Müller 5855108e9b drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-78586447 2015-03-12 21:43:41 +01:00
Vincent Petry ce94a998dd Use storage id + appframework for ext storage CRUD
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
2015-03-12 18:51:02 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Thomas Müller f5b6226732 Merge pull request #14462 from owncloud/add-some-php-docs
Add some PHPDocs
2015-02-25 02:53:22 -08:00
Thomas Müller f6044fe429 Merge pull request #14460 from owncloud/revive/12971
Add support for sftp custom port
2015-02-25 02:52:25 -08:00
Robin McCorkell edfeb05a05 Fix bugs in ownCloud external storage 2015-02-25 10:10:13 +00:00
Lukas Reschke dbb665a361 Add some PHPDocs
My IDE was crying...
2015-02-24 13:44:40 +01:00
Lukas Reschke 1229184873 Fix code that never worked
Introduced with 1df8a5a774 in February 2013…
2015-02-24 13:26:23 +01:00
Lukas Reschke 6dd5bc0379 Fix code style as per review 2015-02-24 13:22:12 +01:00
SA 350f8eb86e Add support for sftp custom port 2015-02-24 13:15:38 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Andreas Fischer c640e2fa66 Update phpseclib to version 0.3.9. 2015-02-18 01:16:23 +01:00
Robin Appelman 6467369cad make sure the root has a trailing slash 2015-02-16 13:52:11 +01:00
Robin Appelman e98983485f handle deleting non existing files 2015-02-16 13:52:11 +01:00
Robin Appelman e5731b6e1a Use better way to check for the existence of smbclient 2015-02-16 13:52:11 +01:00
Robin Appelman d2255a1d30 New SMB storage backend 2015-02-16 13:52:11 +01:00
Vincent Petry bd01ff135a Merge pull request #13190 from is-apps/master-sftp-key
Add SFTP public key authentication support
2015-02-10 16:44:29 +01:00
Vincent Petry 3764515365 Allow saving incomplete external storage config
This is needed for Dropbox and others that need a token.
2015-01-27 13:44:05 +01:00
Ross Nicoll 64f4f8fc84 Add support for SFTP key authentication
Add support for external files accessed via SFTP using public key exchange authentication.
Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised.
Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys.
Generated public keys are saved in user's data directory for easy retrieval by an external application.
Add controller for SFTP key generation AJAX
SFTP class initialisation no longer produces a warning if the password field is missing.
Add unit tests for SFTP with key authentication backend
2015-01-14 17:00:34 +00:00
Morris Jobke 75e8b39826 Merge pull request #12879 from owncloud/mountconfig
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer 49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Robin Appelman d075b1d743 Add the storage id to the mount config 2014-12-17 14:22:03 +01:00
Robin Appelman 95a145f67f Load mount specific options from the mount config 2014-12-17 14:03:50 +01:00
Morris Jobke d41082f4d6 first step to drop \OCP\Config:: in favour of IConfig 2014-12-17 11:12:37 +01:00
Lukas Reschke 5eaa2214b8 Remove conditional check for 5.3 compatibility 2014-12-12 12:25:59 +01:00
Morris Jobke e3de51078d Merge pull request #12090 from AdamWill/google-rename-delete
google: delete original after successful rename
2014-12-10 09:10:17 +01:00
Lukas Reschke 25a87d4058 Merge pull request #12577 from owncloud/public-mount-api
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
Volkan Gezer 57452a3641 Keep spaces out of the string
Otherwise translators cannot notice them on Transifex.
2014-12-07 01:57:34 +01:00
Robin Appelman a369d78124 Use the mount config api for files_external 2014-12-04 16:47:30 +01:00
Lukas Reschke 805be635fa Only store user credentials when SMB_OC storage is enabled
Conflicts:
	apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
Adam Williamson 415411a3d5 google: delete original after successful rename
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.

OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)

A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.

We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
2014-11-30 15:34:35 -08:00
Robin Appelman a2457b5fb9 Merge pull request #6989 from AdamWill/google-1
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
Lukas Reschke c749570a06 Merge pull request #12411 from owncloud/unknown-command-windows
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Joas Schilling 0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling 2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Lukas Reschke 284ba5b688 Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
Vincent Petry c941c3fa51 Show warning when invalid user was passed
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
2014-11-14 16:43:23 +01:00
Vincent Petry 914f4cb6f2 Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
Adam Williamson 3234c91557 google: drop duplicate path trim from opendir()
opendir() trims the path passed then calls getDriveFile() -
which immediately does the same trim operation. This breaks
opendir() on the root directory, which causes the failure of
the testStat() test when it checks the ctime of the root dir.
2014-11-10 12:00:27 -08:00
Adam Williamson f76419d190 fix touch() when $mtime is set (Google wants RFC3339) #11267
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.

This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989).
2014-11-10 11:56:01 -08:00
Adam Williamson c237acb395 google: disable compression when curl is not available
This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
2014-11-07 22:52:07 -08:00
Adam Williamson 04369fb9cc scrutinizer fix: explicitly declare Google class property $client 2014-11-06 21:28:05 -08:00
Adam Williamson f9bd43ff03 scrutinizer fix: correct @return for getDriveFile() 2014-11-06 21:27:12 -08:00
Adam Williamson 62b859d66f Migrate Google Drive storage app to v1.0.0 of the client library 2014-11-06 18:47:11 -08:00
Jörn Friedrich Dreyer 69a3d8eb1a fix files_external storage id migration 2014-10-31 14:25:55 +01:00
Lukas Reschke b3a04840b5 Add type hinting to functions
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
Lukas Reschke d060180140 Use function outside of loop
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Lukas Reschke 2d2a4741ce Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
Morris Jobke 7c14a17361 Merge pull request #11721 from owncloud/fix-s3-regression
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
Morris Jobke ca01530f57 Merge pull request #11726 from owncloud/s3-fixunittests
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
Vincent Petry 188effa433 Fix S3 folder creation for new AWS API
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
Vincent Petry 71dce48bd3 Fix S3 connection 2014-10-22 22:17:07 +02:00
Vincent Petry 075e8d8e86 Lazy initialize external storages
Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
2014-10-22 12:42:36 +02:00
Jörn Friedrich Dreyer 1c9004409b guess mimetype on touch 2014-10-21 12:58:26 +02:00
Vincent Petry ab5149f5df Allow specifying protocol in ext storage OC config
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
Vincent Petry 9dea79e341 Merge pull request #11305 from owncloud/ext-updateetagonmount
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
Jörn Friedrich Dreyer f664a31dec extract batchDelete(), better comments 2014-10-08 18:50:02 +02:00
André Gaul 0d0c9d0bb3 files_extern: remove empty Body and ContentLength in Amazon S3 mount
fixes #10501

Conflicts:
	apps/files_external/lib/amazons3.php
2014-10-08 18:49:59 +02:00
Jörn Friedrich Dreyer aa3ad898a9 fix amazon s3 issues
folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo
2014-10-08 18:49:47 +02:00
Vincent Petry 26e242a8a4 Added PHP docs for etag propagator 2014-10-08 14:22:18 +02:00
Robin Appelman bcf654127f More phpdoc 2014-10-08 14:22:17 +02:00
Robin Appelman 1030f0a763 Hookup the etag propagator 2014-10-08 14:22:17 +02:00
Robin Appelman 5d7bd8be42 Add EtagPropagator to handle etag changes when external storages are changed 2014-10-08 14:22:17 +02:00
Robin Appelman 9a5d0f6084 Fix add/remove mountpoint hooks 2014-10-08 14:22:17 +02:00
Vincent Petry 6585eaa5df Added failing unit tests for mount config hooks 2014-10-08 14:22:17 +02:00
Vincent Petry 0610937ac3 Added filesystem hooks for mount/unmount ext storage 2014-10-08 14:22:17 +02:00
Robin Appelman 11ac9ce28b Fix copy overwrite for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman 3b08b3fad4 Fix amazon s3 rename overwrite 2014-09-17 15:51:57 +02:00
Robin Appelman 6e12d830d5 Fix AmazonS3 rmdir on the root 2014-09-17 15:50:27 +02:00
Robin Appelman 2f22e67570 Also check if the file itself is updatable 2014-09-17 11:35:16 +02:00
Robin Appelman d25a9a118f Check if a folder is deletable before we try to recursively delete it 2014-09-17 11:35:16 +02:00
Lukas Reschke 4669ea3835 Merge pull request #10680 from helmutschneider/aws-2.6.15
Update AWS sdk to 2.6.15
2014-09-16 16:34:16 +02:00
Robin Appelman a1f4a0601b Fix hasUpdated for folders in swift backend 2014-09-05 13:23:10 +02:00
Robin Appelman 3d7aff84e5 Fix configuration of rackspace 2014-09-05 13:22:35 +02:00
Johan Björk d2979da864 Fix failing AmazonS3::touch on updated aws sdk 2014-09-03 12:09:12 +02:00
Robin Appelman ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Thomas Müller 2b63c375a4 Merge pull request #10719 from owncloud/files-external-personal-undefined
Prevent undefined index error loading external storages
2014-08-29 11:59:34 +02:00
Jörn Friedrich Dreyer f551917a3c kill OC::$session
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Robin McCorkell bffccdbea7 Add missing 'personal' mount configuration option 2014-08-29 09:08:46 +01:00
Robin McCorkell 87167d3141 Prevent errors on broken SFTP config 2014-08-27 09:02:14 +01:00
Vincent Petry 5e2f627d3d Merge pull request #10108 from owncloud/files_external-allowed-backend
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
Lukas Reschke 92c80dd946 Merge pull request #10518 from owncloud/fix_storage_const_autoload
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Morris Jobke b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik 2df52e54d7 Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
Jörn Friedrich Dreyer 240b952333 use S3Client::encodeKey(), fixes #8325 2014-08-14 21:46:50 +02:00
Robin Appelman 73607e5d16 Only load personal external storages for allowed backends 2014-08-01 17:15:46 +02:00
Robin Appelman 4886c8582d Merge pull request #9529 from helmutschneider/fix-8326
Fixes #8326: deletion of directories on S3
2014-08-01 14:04:21 +02:00
Andreas Fischer a27753dd80 Pass existing Net_SFTP object into Net_SFTP_Stream. 2014-07-18 15:47:13 +02:00
Andreas Fischer e18c8f23df login() must be called after getServerPublicHostKey(). 2014-07-12 20:41:35 +02:00
Andreas Fischer d02604b3fb Add short description explaining how SFTP ext storage class works. 2014-07-12 13:58:49 +02:00
Andreas Fischer c8024934c0 The file providing the sftp:// scheme needs to be included manually. 2014-07-12 13:57:27 +02:00
Johan Björk ac75a24597 Converted an array to PHP5.3 compatible version 2014-07-09 14:54:03 +02:00
Johan Björk e44a7aa034 Fixes #8326: deletion of directories on S3 2014-07-08 22:41:11 +02:00
Christopher T. Johnson 599ab7a802 Fix Signiture Does Not Match when mounting Amazon S3 external storage
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
	'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'
2014-07-08 10:16:48 +02:00
Vincent Petry 5e6f6da786 Fix warnings when personal is not set 2014-07-01 13:32:57 +02:00
Vincent Petry 8977a68548 Use filtered list for ext storage list mounts API
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.

Since that call was missing the backend name which is important for the
UI, this one was added as well.
2014-06-30 12:33:11 +02:00
Vincent Petry fd8b5680dd Merge pull request #8383 from owncloud/object_storage
Object storage
2014-06-27 16:53:03 +02:00
Thomas Müller c745240543 Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies 2014-06-27 08:52:28 +02:00
Jörn Friedrich Dreyer 42e9d49d72 update files_external swift to php-opencloud v1.9.2 2014-06-25 17:15:59 +02:00
Robin Appelman 544963f414 Allow adding object stores with the files_external mount config 2014-06-24 14:36:57 +02:00
Robin Appelman d24c0f4d42 Dont allow opening writable streams on a read only dav mount 2014-06-23 14:35:19 +02:00
Robin Appelman be93b0d01d Fix permissions functions for webdav external storages 2014-06-14 10:22:38 +02:00
Robin Appelman 3f2cb39aba Properly set read permissions for webdav storages 2014-06-14 10:14:08 +02:00
Robin Appelman 21ced89beb Dont return false for internalPath 2014-06-14 10:13:24 +02:00
Robin Appelman 65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Vincent Petry 710d017eec Added more columns to ext storage list
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
Vincent Petry 01c2c3107a Added external storage list in files app 2014-06-06 15:06:26 +02:00
Robin Appelman a66c2e6a47 Fix the removeMount for personal mounts 2014-06-06 09:55:59 +02:00
Robin Appelman cabe2873c4 Make personal external mount points (re)movable from the files app 2014-06-06 09:55:59 +02:00
Thomas Müller d0eb8f8668 Merge pull request #8880 from owncloud/webdav-read-permissions
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Robin Appelman 9eb177e8bc Use the permissions exposed by ownCloud for webdav external storages 2014-06-04 18:19:52 +02:00
Thomas Müller 76e04027bc Upgrade SabreDAV to 1.8.10
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Thomas Müller 17cbfc714a use phpseclib from 3rdparty
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
Thomas Müller 6ffb139a46 Merge pull request #8658 from realriot/master
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
Robin McCorkell 856c48bc25 Use default priority of 100 if backend default is not set 2014-05-21 22:31:18 +01:00
Robin McCorkell da03ef25d9 Add priority overriding comments 2014-05-21 22:29:16 +01:00
Robin McCorkell 0a8a319915 Fix priority merging logic and add unit test 2014-05-21 22:18:22 +01:00
Robin McCorkell eae45dca71 Add unit tests 2014-05-21 22:18:22 +01:00
Robin McCorkell 2254678a0c Use constants for priority type and add comments 2014-05-21 22:17:21 +01:00
Robin McCorkell a0ccb060fa Use more strict type comparisons 2014-05-21 22:17:21 +01:00
Robin McCorkell e4d3ee7866 Preserve priority if already set 2014-05-21 22:17:21 +01:00
Robin McCorkell 9151d72507 Treat 'all users' as 'global'
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
Robin McCorkell 05642733a3 Add storage priority support
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.

The priority order is as follows:
 * Personal
 * User
 * Group
 * Global

Within each mount type, the mount with the highest priority is active.

The storage backend defaults were chosen to be the following:
 * Local - 150
 * Remote storage - 100
 * SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
Sascha Schmidt 4b2888cd9a Changed access mode for Dropbox to 'auto' 2014-05-21 09:40:03 +02:00
Morris Jobke dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Robin McCorkell e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Robin McCorkell 6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Robin McCorkell 08a8a409d6 Extract mount point merging logic into separate function 2014-05-13 00:14:30 +01:00
Vincent Petry af2b7634ee Merge pull request #8293 from owncloud/files_external_fix_readData
Fix issue with personal mount points and sharing
2014-05-08 11:01:54 +02:00
Thomas Müller 9128900c56 drop files_irods from apps_external 2014-04-28 12:39:28 +02:00
Bjoern Schiessle 22e0a4b9a8 external storages: allow to mount a folder called "Shared", it is no longer a reserved name 2014-04-23 12:54:25 +02:00
Robin McCorkell abfd7ecb72 Permit personal mount points to be used for sharing
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.

`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
2014-04-21 21:42:35 +01:00
Lukas Reschke 2454759af7 Check whether the user has permissions to add personal storage backends 2014-04-13 11:01:50 +02:00
Thomas Müller 3ac009c2b4 unit tests for dynamic backend registration 2014-04-07 20:18:57 +02:00
Thomas Müller e3b9a86184 remove duplicate method checkDependencies() 2014-04-03 17:17:44 +02:00
Thomas Müller c6976d89a6 use command -v to detect if smbclient exists 2014-04-03 17:09:40 +02:00
Thomas Müller 14a5381977 Merge branch 'master' into fs-backend-registration
Conflicts:
	apps/files_external/templates/settings.php
2014-04-03 17:04:16 +02:00
Philipp Kapfer 730bca98b4 Moved dependency checks to end of class files
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends

Conflicts:
	apps/files_external/lib/google.php
	apps/files_external/lib/swift.php
	apps/files_external/templates/settings.php
2014-04-03 16:46:22 +02:00
Philipp Kapfer ff9a4a6d91 Added cURL dependency for Amazon S3, Dropbox and SWIFT
Conflicts:
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/swift.php
2014-04-03 16:38:43 +02:00
Philipp Kapfer 46379113a1 Changed dependency check messages from warnings to notes
Added check for duplicate dependency check messages to display only the first
2014-04-03 16:31:54 +02:00
Philipp Kapfer 8ca897df76 Added cURL dependency check to Google Drive and WebDAV backend
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing

Conflicts:
	apps/files_external/lib/config.php
	apps/files_external/lib/google.php
2014-04-03 16:30:48 +02:00
Philipp Kapfer f7da4280ca Modified app to dynamically register backends instead of hard-coding them
Moved dependency check to the individual backends instead of the config

Conflicts:
	apps/files_external/appinfo/app.php
	apps/files_external/lib/config.php
2014-04-03 16:21:52 +02:00
Robin Appelman 76c63a5760 Fix uploading files containing a # in the path for webdav 2014-03-31 17:00:32 +02:00
Vincent Petry 531f3cf1a8 Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
Fix swift touch operation
2014-03-27 18:10:45 +01:00
Vincent Petry 2a08e35d72 Fix swift touch operation
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.

This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
Vincent Petry 1f6259d9c2 Merge pull request #7875 from Xenopathic/files_external_smb_auto
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
Vincent Petry fa00a18677 Fixed mtime reading from OpenStack API
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
Robin McCorkell a1dca821f9 Use braces on single line if statements 2014-03-26 15:11:09 +00:00
Robin McCorkell cd5ebac7c4 Fix error in $isPersonal setting 2014-03-26 14:37:29 +00:00
Robin McCorkell b077528087 Perform proper checking for share availability
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.

The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
Robin McCorkell cac4aaa8c4 Rename SMB_Auto to SMB_OC and change visible name
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
2014-03-26 14:35:07 +00:00
Robin McCorkell 86aa6104e6 Revoke sharable permission on automatic SMB shares
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
2014-03-26 14:35:07 +00:00
Robin McCorkell 3445c062ec Use loginname instead of display name
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
2014-03-26 14:35:07 +00:00
Robin McCorkell ba63e46b5e SMB/CIFS mount using OwnCloud logon credentials
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.

Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
2014-03-26 14:35:07 +00:00
Vincent Petry b656c68ede Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
Vincent Petry e002b7242c Fix merging of external storage configurations
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
Vincent Petry 8d95c0d013 Pretty print mount.json when possible 2014-03-26 11:32:03 +01:00
Vincent Petry d95fde3924 Removed comment 2014-03-20 15:24:05 +01:00
Vincent Petry 1e4e0cfcd5 Lazy load phpseclib in ext storage config 2014-03-20 13:21:34 +01:00
Robin Appelman cf23defa52 Fix typo in mount loading 2014-03-20 12:52:09 +01:00
Vincent Petry 9116c39a82 Fixed ext storage password field order issue
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
Vincent Petry 8e0a5ed5df Added tests to check mount point list for a target user 2014-03-19 15:21:54 +01:00
Vincent Petry 4cb53f77b2 Moved external storage mounting code to files_external app
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
Vincent Petry 80180bea32 Added IV for ext storage password encryption 2014-03-19 11:42:22 +01:00
Vincent Petry 40a70ecf79 Added password obfuscation for external storage config
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
Vincent Petry 1f79f368ef Added unit tests for when adding ext storage mount points
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
  doing an actual check/connection (note: this is necessary because the
  static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
Vincent Petry 8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00
icewind1991 3eb58d9973 Merge pull request #7529 from owncloud/getlocalfile-cache
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
Lukas Reschke e3156fa5ad Merge pull request #7354 from pschmitt/master
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
Jan-Christoph Borchardt bd86642747 Merge pull request #7261 from owncloud/issue/6793
Allow admins to disable certain external storages for users
2014-03-05 14:41:36 +01:00
Robin Appelman a8c67dc675 Add caching for getLocalFile on remote storages 2014-03-04 15:44:58 +01:00
Thomas Müller f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string
fix https://github.com/owncloud/core/issues/6825
2014-03-04 14:30:30 +01:00
Frank Karlitschek 0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Joas Schilling 932c4ee927 Allow admins to disable certain external storages for users
Fix issue #6793
2014-02-26 15:02:41 +01:00
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
Vincent Petry 539ea0882b Fixed mount config path 2014-02-24 10:35:24 +01:00
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 2014-02-21 15:51:41 +01:00
Philipp Schmitt 43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Lukas Reschke 6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
Vincent Petry b060a17b59 Added extra checks for ext storage class 2014-02-20 10:40:10 +01:00
Vincent Petry 49f2014e0c Revert "Added extra checks for ext storage class"
This reverts commit 9e9a5b9ea1.

Unit tests weren't ready, need further tweaking.
2014-02-20 10:01:49 +01:00
Lukas Reschke 38d6c56249 Merge pull request #7294 from owncloud/extstorage-configclass
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
Vincent Petry 9e9a5b9ea1 Added extra checks for ext storage class 2014-02-19 19:08:28 +01:00