874d35b27a
Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy
...
make sure that we keep the correct encrypted-flag and the (unencrypted)size
2015-05-06 10:28:10 +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
e0d151505f
improve phpdoc of cache classes
2015-05-05 16:06:28 +02:00
f5415653fd
fix #15973
...
Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code.
2015-04-30 17:10:18 +02:00
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +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
45784f213f
fix propagation when renaming a directly reshared folder
2015-04-27 14:07:16 +02:00
849e5521de
Make the change propagator an emitter
2015-04-27 14:07:15 +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
9a5783b284
fix unit tests
2015-04-24 16:47:27 +02:00
49df8ef525
Update encryption.php
2015-04-24 16:44:00 +02:00
238302ee7d
fixed name
2015-04-24 16:44:00 +02:00
1756562501
Update encryption.php
2015-04-24 16:44:00 +02:00
735f6cc037
fix encryption header error
...
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
2015-04-24 16:43:16 +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
903d52d45f
Merge pull request #15809 from owncloud/view-null-root
...
dont allow using null as view root
2015-04-22 18:10:26 +02:00
bd57902d1d
typo
2015-04-22 16:24:37 +02:00
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
f391f88d7f
dont allow using null as view root
2015-04-22 14:51:02 +02:00
a971fa8a90
Merge pull request #15549 from owncloud/jcf-fix-cache-update
...
don't update identical values
2015-04-22 13:34:08 +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
570718fb6b
Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
...
Fix encryption feof to not return too early
2015-04-22 11:32:21 +02:00
19e8c4fcb1
get dirname from sharePath
2015-04-21 14:58:01 +02:00
b0fcf0fa0e
Merge pull request #15636 from owncloud/enc2_performance_improvement
...
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
2015-04-21 11:01:33 +02:00
76dad297ff
Fix encryption feof to not return too early
...
This is because stream_read will pre-cache the next block which causes
feof($this->source) to return true prematurely. So we cannot rely on it.
Fixed encryption stream wrapper unit tests to actually simulate 6k/8k
blocks to make sure we cover the matching logic.
Added two data files with 8192 and 8193 bytes.
2015-04-20 18:32:40 +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
7fe0e09d14
set size and unencrypted size to zero on fopen
2015-04-20 11:06:13 +02:00
67500d5f2f
if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size
2015-04-16 14:15:04 +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
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +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
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
addfafd9da
Fix moving mount points
2015-04-13 17:10:02 +02:00
caadc8cdd9
reuse cache move logic
2015-04-13 17:10:01 +02:00
d7b3a1a35a
preserve cache data when doing a cross storage move
2015-04-13 17:10:01 +02:00
c29419e6d7
fix rebase issue
2015-04-13 15:13:03 +02:00
0772e3b4c1
Properly handle copy/move failures in cross storage copy/move
2015-04-13 15:13:03 +02:00
404773940d
Detect storage full when doing cross storage copy/move
2015-04-13 15:13:03 +02:00
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
c4ec8fbeff
Make getSourcePath accessible for storage wrappers
2015-04-13 15:13:03 +02:00
31e94708f8
Improve cross storage copy between local storages
2015-04-13 15:13:02 +02:00
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
b302592a64
Small cleanup of rename code
2015-04-13 15:11:03 +02:00
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
8450b6aa2d
Properly import used classes
2015-04-13 09:26:30 +02:00
9c95315a9e
clarify the duplication of the $params array
2015-04-12 14:49:18 +02:00
22c6216f5c
don't update identical values
...
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.
This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +02:00
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
8af52e3876
fixes #15326
2015-04-09 15:37:00 +02:00
4e60b81264
Merge pull request #14120 from owncloud/dav-statcache
...
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
59322a5037
Merge pull request #15333 from owncloud/copy-cross-device
...
fix copying folder across devices
2015-04-08 12:35:15 +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
69e95531f8
comment change as it broke unit tests
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
ff16e3dbff
Adjusting count on read
2015-04-07 13:30:31 +02:00
02404a6a8c
Fixing encryption stream wrapper seek - thanks @jknockaert
2015-04-07 13:30:30 +02:00
104d11ec4c
Fixing encryption storage wrapper tests
2015-04-07 13:30:30 +02:00
d9c41b00ab
Introducing trait LocalTempFileTrait
2015-04-07 13:30:30 +02:00
8ffa6db110
fixing unit tests for stream wrapper
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
cac83642f2
Finally fixing encryption with public share
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
e4895bda01
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
2015-04-07 13:30:29 +02:00
1b42b492dc
kill OC_FileProxy 💥
2015-04-07 13:30:28 +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
d185761d31
initializing some variables + update size after writing the headers
2015-04-07 13:30:28 +02:00
4441835d18
https://github.com/owncloud/core/pull/15305#discussion_r27382305
...
Conflicts:
lib/private/files/stream/encryption.php
2015-04-07 13:30:28 +02:00
90487384f7
initializing some variables
2015-04-07 13:30:28 +02:00
0c48b069ba
call end() before closing the file
2015-04-07 13:30:28 +02:00
498625ea3a
adding unit tests for stream wrapper
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
3e6eb28ee3
Applying diff as of https://github.com/owncloud/core/pull/15303
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
a8d1ede347
Fix the exception messages
2015-04-02 18:40:06 +02:00
f585994c4b
setup mount manager before wrappers
2015-04-02 13:28:36 +02:00
068c624b0d
fix copying folder across devices
2015-03-31 13:50:11 +02:00
Morris Jobke
Thomas Müller
Bjoern Schiessle
Robin Appelman
jknockaert
Joas Schilling
Vincent Petry
Björn Schießle
Jens-Christian Fischer
Jörn Friedrich Dreyer