e7a3911c83
check if encryption is enbaled before we start moving keys
2015-05-06 11:35:45 +02:00
35a2fd3f89
Only return cached files if existing
2015-05-06 11:16:44 +02:00
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
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
7d0eba7a41
Merge pull request #15886 from owncloud/fix-15848-master
...
Adjust isLocal() on encryption wrapper
2015-04-27 15:06:26 +02:00
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
936d564058
fixes #15848
2015-04-27 14:26:05 +02:00
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
d600955a51
Make getDefaultModuleId public and get module protected
2015-04-27 11:03:51 +02:00
1592be117a
Use public interfaces for type hinting
2015-04-24 13:06:03 +02:00
24128d1384
only update share keys if the file was encrypted
2015-04-24 10:19:09 +02:00
2646bccb83
update share keys if file gets copied
2015-04-23 17:18:48 +02:00
2990b0e07e
update share keys if a file is moved to a shared folder
2015-04-23 17:18:48 +02:00
225cde2183
pass KeyStorage via ctor
2015-04-22 13:09:42 +02:00
987bc138df
calling renameKeys() on directory level as well - fixes #15778
2015-04-22 12:12:27 +02:00
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
32995ace1c
move permission related code into getMetaData()
2015-04-20 16:50:12 +02:00
23f1bdc3d4
Introduce Storage::getMetaData() to allow storage implementations more control over the data array
2015-04-20 14:54:54 +02:00
92b60e36de
Introduce Storage::getData() to allow storage implementations more control over the data array
2015-04-20 14:25:39 +02:00
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
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
967e882757
return size from cache in case the cache entry is marked as encrypted
2015-04-14 13:08:59 +02:00
387984a0d5
preserve filesize on rename after upload
2015-04-14 12:27:12 +02:00
404773940d
Detect storage full when doing cross storage copy/move
2015-04-13 15:13:03 +02:00
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
4a70ca665c
respect mount option while encrypting
2015-04-07 13:30:31 +02:00
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
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
fe74a0cb4f
implement webdav copy
2015-04-07 13:30:31 +02:00
8991272269
Using stream_get_contents in file_get_contents implementation + close handle
2015-04-07 13:30:31 +02:00
104d11ec4c
Fixing encryption storage wrapper tests
2015-04-07 13:30:30 +02:00
9d8c07850d
fixing unencrypted file size
2015-04-07 13:30:30 +02:00
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
137c135664
file_put_contents has to return the number of written bytes
2015-04-07 13:30:30 +02:00
83cb382b3f
pass file helper to encryption wrapper
2015-04-07 13:30:29 +02:00
99255ff3a9
Fix - public sharing: in case on user is available - get it from the path
2015-04-07 13:30:28 +02:00
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
a905f641b3
various fixes & start to unit test the encryption storage wrapper
2015-04-07 13:30:28 +02:00
cb9980823d
core: small fixes
2015-04-07 13:30:27 +02:00
810ca9105c
implement rename and delete of encryption keys
2015-04-07 13:30:27 +02:00
c6be1ba8d3
fix check if a file is excluded from encryption or not
2015-03-27 11:51:50 +01:00
232518ac54
Merge pull request #15234 from owncloud/encryption2_core
...
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
ff9c85ce60
implement basic encryption functionallity in core to enable multiple encryption modules
2015-03-26 20:56:51 +01:00
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
4bac595068
adding storage specific filename verification - refs #13640
2015-03-09 10:38:37 +01:00
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
81243b0f5d
adding getDirectDownload() to Wrapper
2014-12-28 17:17:14 +01:00
33b64868d7
Add storage and cache wrappers to apply a permissions mask to a storage
2014-11-27 15:25:57 +01:00
abb6e89c5d
Add storage and cache wrappers to jail a storage to a subfolder
2014-11-27 15:25:53 +01:00
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
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
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
f1bf06f8cf
Merge pull request #8884 from owncloud/move-flock-to-app
...
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
48eb0515e9
only lock if unlink is called for a file
2014-06-04 07:55:46 +02:00
54865815f5
Move Lock to private namespace, add interface. Update PHPDoc.
2014-06-04 07:55:45 +02:00
392a1b6662
Removed unused vars/declarations, update PHPDoc.
2014-06-04 07:55:45 +02:00
f9dbdb7c5c
Add actual locking and log changes necessary for debugging.
2014-06-04 07:55:44 +02:00
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
998fa2d9be
Pass any methods custom to specific storage implementations to the wrapped storage
2014-05-29 16:13:05 +02:00
8c5521fdfc
Add $storage->instanceOfStorage to handle instanceof for storage wrappers
2014-05-29 13:45:50 +02:00
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
66bc0f0848
Still return quota value when free space is unknown
...
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
c1cb9ee9b0
Merge pull request #7650 from owncloud/quota-totalspace
...
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
010eef95c0
Fixed total space display when data size exceeds quota
...
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
2014-03-10 17:59:14 +01:00
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
ec45a3c0e2
Merge pull request #6962 from owncloud/quota-space-root
...
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
788c8540aa
Added isLocal() method to storage, used for xsendfile
...
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
20c2aaab00
Actually rename the variable
2014-01-27 16:26:54 +01:00
c8207312c7
Fix phpdoc
2014-01-27 16:00:10 +01:00
a521949baf
Allow passing a root folder to get the used space from in the quota wrapper
2014-01-27 15:41:56 +01:00
1af7dab535
Fixed quota wrapper to not wrap failed fopen streams
...
When calling fopen() on some storage types, these return false instead
of throwing an exception.
This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.
Also added 'rb' as another case that doesn't need to be wrapped.
Fixes #6832
2014-01-19 18:51:36 +01:00
6cf9844e9c
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
c8df27de73
Fixed quota stream to not wrap read-only fopen calls
2013-10-25 12:33:16 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
Bjoern Schiessle
Thomas Müller
Joas Schilling
Björn Schießle
Robin Appelman
Jenkins for ownCloud
Morris Jobke
Stephan Peijnik
Jörn Friedrich Dreyer
ringmaster
Robin McCorkell
Vincent Petry