wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31026 commits 157 branches 562 tags 714 MiB
Commit graph

355 commits

Author SHA1 Message Date
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Robin Appelman
b1ce53f890 use a normal rename when moving from the same storage in the encryption wrapper 2015-10-05 20:55:57 +02:00
Bjoern Schiessle
e7232a848b versions should always use the keys of the original file, no need to create new one 2015-10-01 10:10:19 +02:00
Jörn Friedrich Dreyer
8b90a55831 use correct variable 
wow ... just wow ...
 2015-09-23 23:41:39 +02:00
Jörn Friedrich Dreyer
d54d9a573f Revert "use correct variable" 
This reverts commit 52cbaff061.
 2015-09-23 14:09:52 +02:00
Jörn Friedrich Dreyer
52cbaff061 use correct variable 
wow ... just wow ...
 2015-09-23 13:59:37 +02:00
Martin
491250320a Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. 2015-09-22 17:53:15 +02:00
Robin Appelman
4ecf710dcd dont download the existing file for webdav if we're going to overwrite it 2015-09-21 13:45:25 +02:00
Lukas Reschke
1924dd348a Merge pull request #18653 from owncloud/dav-stream-guzzle 
stream webdav downloads using http client
 2015-09-11 17:10:10 +02:00
Robin Appelman
1c10fb5c9f also use httpclient for uploadFile 2015-09-01 18:01:27 +02:00
Robin Appelman
4cb8ca1860 Check result of storage wrappers 2015-08-30 10:02:42 +02:00
Robin Appelman
df8cb2cc63 stream webdav downloads using http client 2015-08-29 14:56:15 +02:00
Björn Schießle
6e210d960c Merge pull request #18423 from owncloud/occ_encrypt_all 
occ command line tool to encrypt all files
 2015-08-28 20:44:55 +02:00
Bjoern Schiessle
e51fe617d8 copy always file by file to encrypt/decrypt it if needed 2015-08-26 14:58:22 +02:00
Robin McCorkell
3bb793b6a7 Implement password authentication mechanisms 
Introduces the basic password authentication mechanism, along with a
mechanism based on ownCloud credentials stored in the user session.

Change to lib/private is an extension of PermissionsMask, as
isSharable() override was missing.

Session credentials auth mechanism now disables sharing on applied
storages, as credentials will not be available.
 2015-08-19 14:20:09 +01:00
Robin McCorkell
214729a552 Merge pull request #14779 from owncloud/use-iterator-directory 
Use the new IteratorDirectory instead of the fakedir wrapper
 2015-08-07 22:16:47 +01:00
Vincent Petry
b3a1aef934 Merge pull request #13641 from owncloud/cache-storage-status 
Store storage availability in database
 2015-08-07 17:31:03 +02:00
Bjoern Schiessle
51a67a54e0 always update file cache, the cache can handle partial data correctly if the file doesn't already exists in the file cache 2015-07-31 17:14:32 +02:00
Vincent Petry
7c9405a921 Disable filesystem_check_changes by default 
This will prevent detecting remote changes done in the data folder /
root storage by default. In the rare cases where the data folder is
shared with other apps/users outside ownCloud and change detection is
needed, the admin will have to set the option explicitly from now on.

Note that this doesn't affect external storages which have their own
setting in the mount options.
 2015-07-29 12:01:12 +02:00
Vincent Petry
6ada1e3276 Merge pull request #17902 from owncloud/fix_17898 
get header size before we open the file to avoid locking exception
 2015-07-27 16:58:32 +02:00
Bjoern Schiessle
0736b45d92 get header size before we open the file to avoid locking exception 2015-07-27 14:29:07 +02:00
Joas Schilling
9cee8ff9f8 Only set is encrypted when encryption is enabled 2015-07-23 15:18:59 +02:00
Robin McCorkell
df19cabb44 Store storage availability in database 
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.

Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
 2015-07-20 16:27:26 +01:00
Björn Schießle
f363fc2d4a Merge pull request #17540 from owncloud/enc_detect_legacy_files2 
make sure that we always detect legacy files correctly
 2015-07-17 21:42:32 +02:00
Bjoern Schiessle
16d8014cdd set targetIsEncrypted to true if file cache indicates that we try to read a encrypted file 2015-07-17 13:30:08 +02:00
Bjoern Schiessle
a2e2005e67 make sure that we always detect legacy files correctly 2015-07-17 13:30:08 +02:00
Morris Jobke
3fae984b56 Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions 
Throw lock exceptions if remote share returned 423 status code
 2015-07-17 11:34:34 +02:00
Robin Appelman
da951ba059 Use the new IteratorDirectory instead of the fakedir wrapper 2015-07-15 13:57:53 +02:00
Vincent Petry
f62d94c4ff Throw StorageNotAvailable if propfind on root failed 
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
 2015-07-13 18:28:53 +02:00
Thomas Müller
9120942bcf Merge pull request #16924 from owncloud/copy-recursive-polyfill 
add recursive copy polyfill for storage backends
 2015-07-06 17:05:36 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Vincent Petry
3df27a01be Merge pull request #17379 from owncloud/kill-file-mapper 
Remove file mapper - was only use in Windows and never worked properly
 2015-07-03 17:53:47 +02:00
Robin Appelman
de4e4cb6ea also dont download existing on fopen when using w+ and wb+ 2015-07-03 15:53:02 +02:00
Robin Appelman
6cc65b53ab add phpdoc 2015-07-03 15:53:02 +02:00
Robin Appelman
232872e401 add flysystem adapater 2015-07-03 15:53:02 +02:00
Thomas Müller
f55aa856ad Remove file mapper - was only use in Windows and never worked properly 2015-07-03 15:41:29 +02:00
Robin Appelman
b849b7c7f2 better handling of folders 2015-07-03 13:43:22 +02:00
Vincent Petry
34043d4647 Throw lock exceptions if remote share returned 423 status code 2015-07-03 07:51:13 +02:00
Joas Schilling
9c533342fc Perform the filesize only when the file exists 
Regression from 95602d4069
and 9b336765b6
 2015-06-30 11:47:58 +02:00
Joas Schilling
70eb20e3a7 Merge pull request #17030 from owncloud/lock-posthooks 
Keep shared lock for post-hooks
 2015-06-29 14:17:03 +02:00
Lukas Reschke
d1f0ff372e Merge pull request #17163 from owncloud/update-licenses 
Update license headers
 2015-06-27 20:22:23 +02:00
Joas Schilling
9b336765b6 Correctly check if the real file exists, otherwise try the part file 2015-06-26 13:17:23 +02:00
Vincent Petry
538e466c30 Keep shared locks in post hooks 
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.

Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
 2015-06-25 16:33:02 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Robin Appelman
4b181f73ca phpdoc 2015-06-15 15:41:52 +02:00
Robin Appelman
2fb8a76705 add recursive copy polyfill for storage backends 2015-06-14 15:15:21 +02:00
Joas Schilling
bb0cb0aaec Merge pull request #15895 from owncloud/dav-getremoteetag 
Get etag from remote OC server
 2015-06-03 17:20:25 +02:00
Thomas Müller
3ebc8f0564 Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master 
Fix get local file encryption master
 2015-06-02 13:47:37 +02:00
Vincent Petry
30d7f92763 Get etag from remote OC server 2015-06-02 11:42:03 +02:00
Robin Appelman
661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman
35c377f7a9 phpdoc and minor issues 2015-06-01 13:22:56 +02:00
Vincent Petry
8d53dc803f Use md5 + prefix for file locking keys in memcache 
Also trim slashes from paths to make sure the locks are based on the
same paths.
 2015-06-01 13:22:56 +02:00
Vincent Petry
0775e9c1ca Use md5 for lock key 2015-06-01 13:22:56 +02:00
Robin Appelman
536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Vincent Petry
e114d00242 Only use quota stream wrapper on "files" 
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
 2015-05-28 18:31:20 +02:00
Vincent Petry
ded62ff693 Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages 
[encryption] fix move versions between storages
 2015-05-28 15:28:25 +02:00
Bjoern Schiessle
0de59acb49 only request encryption module for files which are not excluded 2015-05-27 15:47:40 +02:00
Thomas Müller
4513cf5967 Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de""" 2015-05-26 14:40:07 +02:00
Oliver Kohl D.Sc
f8938f004d Revert "Revert "FIX for webdav.mediencenter.t-online.de"" 2015-05-26 13:36:45 +02:00
Bjoern Schiessle
c63f2286c0 copy keys before we move a file between storages to make sure that the new target file reuses the old file key, otherwise versions will break 2015-05-22 15:41:28 +02:00
Joas Schilling
d7b2bc9e2f Merge pull request #16516 from owncloud/fix-phpdoc-trait 
Fix PHPDoc
 2015-05-22 09:47:59 +02:00
Lukas Reschke
3d8ea96e55 Fix PHPDoc 
Use correct parameters
 2015-05-22 00:17:38 +02:00
Morris Jobke
39d1e99228 Merge pull request #16322 from owncloud/trash-view 
dont go trough the view when moving to trash
 2015-05-20 14:44:01 +02:00
Robin Appelman
9c751f1d87 use copy when doing a crossStorageCopy on the same storage 2015-05-19 14:21:58 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Clark Tomlinson
f9b6ee86cd Merge pull request #16399 from owncloud/enc_rmdir_fix 
[encryption] only try to delete file keys if it is a valid path
 2015-05-18 11:09:36 -04:00
Bjoern Schiessle
efa674f10d only try to delete file keys if it is a valid path 2015-05-18 11:54:51 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Bjoern Schiessle
ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Morris Jobke
dc362823e0 Merge pull request #16269 from owncloud/master-fix-16179 
Check if cURL supports the desired features
 2015-05-12 18:27:57 +02:00
Lukas Reschke
4613456a8a Check if cURL supports the desired features 
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.

Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
 2015-05-12 12:00:56 +02:00
Bjoern Schiessle
0d5c7a11e2 use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we 
are in the storage wrapper the file cache isn't up-to-date
 2015-05-11 12:06:57 +02:00
Joas Schilling
aea734aaf1 Fix missing types on doc block and deduplicate the method name 2015-05-06 14:31:10 +02:00
Bjoern Schiessle
e4829a2358 update 'encrypted'-flag in file cache according to the storage settings 2015-05-06 14:20:05 +02:00
Bjoern Schiessle
dc39bda870 move/copy from storage 2015-05-06 14:20:02 +02:00
Bjoern Schiessle
83ed4ee5b6 unit tests 2015-05-06 12:28:15 +02:00
Bjoern Schiessle
e7a3911c83 check if encryption is enbaled before we start moving keys 2015-05-06 11:35:45 +02:00
Thomas Müller
35a2fd3f89 Only return cached files if existing 2015-05-06 11:16:44 +02:00
Thomas Müller
a96c2b8354 Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others 2015-05-05 16:19:24 +02:00
Bjoern Schiessle
7089af96f2 make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied 2015-05-05 16:17:14 +02:00
Thomas Müller
7d0eba7a41 Merge pull request #15886 from owncloud/fix-15848-master 
Adjust isLocal() on encryption wrapper
 2015-04-27 15:06:26 +02:00
Thomas Müller
678b7d7e4d Merge pull request #15860 from owncloud/enc_fallback_old_encryption 
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
 2015-04-27 14:32:19 +02:00
Thomas Müller
936d564058 fixes #15848 2015-04-27 14:26:05 +02:00
Bjoern Schiessle
27683f9442 fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header 2015-04-27 13:01:18 +02:00
Joas Schilling
d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Joas Schilling
1592be117a Use public interfaces for type hinting 2015-04-24 13:06:03 +02:00
Bjoern Schiessle
24128d1384 only update share keys if the file was encrypted 2015-04-24 10:19:09 +02:00
Bjoern Schiessle
2646bccb83 update share keys if file gets copied 2015-04-23 17:18:48 +02:00
Bjoern Schiessle
2990b0e07e update share keys if a file is moved to a shared folder 2015-04-23 17:18:48 +02:00
Thomas Müller
225cde2183 pass KeyStorage via ctor 2015-04-22 13:09:42 +02:00
Thomas Müller
987bc138df calling renameKeys() on directory level as well - fixes #15778 2015-04-22 12:12:27 +02:00
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Thomas Müller
32995ace1c move permission related code into getMetaData() 2015-04-20 16:50:12 +02:00
Thomas Müller
23f1bdc3d4 Introduce Storage::getMetaData() to allow storage implementations more control over the data array 2015-04-20 14:54:54 +02:00
Thomas Müller
92b60e36de Introduce Storage::getData() to allow storage implementations more control over the data array 2015-04-20 14:25:39 +02:00
Bjoern Schiessle
e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Björn Schießle
4f0437fbde Merge pull request #15598 from owncloud/fix-enc-file-size-master 
Fix file size of encrypted files
 2015-04-14 16:48:04 +02:00
Thomas Müller
967e882757 return size from cache in case the cache entry is marked as encrypted 2015-04-14 13:08:59 +02:00
Thomas Müller
387984a0d5 preserve filesize on rename after upload 2015-04-14 12:27:12 +02:00