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
|
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 |
|
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 |
Lukas Reschke
|
3d8ea96e55
|
Fix PHPDoc
Use correct parameters
|
2015-05-22 00:17:38 +02: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 |
|
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 |
|
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 |
|
Bjoern Schiessle
|
c379557e1d
|
don't throw exception if a file gets uploaded and encryption is disabled
|
2015-04-08 16:41:20 +02:00 |
|
Thomas Müller
|
a4483243ac
|
fixing license headers - encryption code related
|
2015-04-07 17:02:49 +02:00 |
|
Thomas Müller
|
4a70ca665c
|
respect mount option while encrypting
|
2015-04-07 13:30:31 +02:00 |
|
Thomas Müller
|
111fbabfb4
|
PHPDoc cleanup - clean code \o/
|
2015-04-07 13:30:31 +02:00 |
|
Thomas Müller
|
ba9a797eaa
|
Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption
|
2015-04-07 13:30:31 +02:00 |
|
Bjoern Schiessle
|
fe74a0cb4f
|
implement webdav copy
|
2015-04-07 13:30:31 +02:00 |
|
Thomas Müller
|
8991272269
|
Using stream_get_contents in file_get_contents implementation + close handle
|
2015-04-07 13:30:31 +02:00 |
|
Thomas Müller
|
104d11ec4c
|
Fixing encryption storage wrapper tests
|
2015-04-07 13:30:30 +02:00 |
|
Thomas Müller
|
9d8c07850d
|
fixing unencrypted file size
|
2015-04-07 13:30:30 +02:00 |
|
Thomas Müller
|
c9d6ed3d7d
|
in case the file exists we require the explicit module as specified in the file header - otherwise we need to fail hard to prevent data loss on client side
|
2015-04-07 13:30:30 +02:00 |
|
Thomas Müller
|
137c135664
|
file_put_contents has to return the number of written bytes
|
2015-04-07 13:30:30 +02:00 |
|
Bjoern Schiessle
|
83cb382b3f
|
pass file helper to encryption wrapper
|
2015-04-07 13:30:29 +02:00 |
|
Thomas Müller
|
99255ff3a9
|
Fix - public sharing: in case on user is available - get it from the path
|
2015-04-07 13:30:28 +02:00 |
|
Bjoern Schiessle
|
0eee3a2618
|
remove unencrypted_size from the cache, size will contain the unencrypted size
|
2015-04-07 13:30:28 +02:00 |