930a46e8e2
Merge pull request #6469 from owncloud/enc_cleanup
...
remove duplicated code
2013-12-18 05:21:42 -08:00
9a94c07553
remove unused method tail()
2013-12-17 16:19:00 +01:00
69b89454a4
reliable detect encrypted files
2013-12-17 15:53:25 +01:00
83417d69be
remove duplicated code
2013-12-17 11:28:05 +01:00
4ae148cebd
Merge pull request #6183 from owncloud/enc_tests
...
enable more encryption tests
2013-12-16 08:46:52 -08:00
95892c8be9
update file cache for target file
2013-12-16 16:05:24 +01:00
cdd816c930
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 16:05:24 +01:00
575a68074f
Merge pull request #6220 from owncloud/debug_oracle_errors
...
cherry-picks from #5884 , just for debugging purpose
2013-12-06 10:00:04 -08:00
40f148cc6c
Don't try to encrypt a file when the temp file isn't created
2013-12-06 17:01:13 +01:00
9ff231590c
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 16:11:41 +01:00
9371944e43
fix typo
2013-12-06 12:20:42 +01:00
85467b973a
add method to check if users private/public key exists
2013-12-06 12:20:14 +01:00
36bc6b871f
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
...
This reverts commit efbf18652c
2013-12-04 13:27:38 +01:00
efbf18652c
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).
2013-11-29 20:34:57 +01:00
1065c33543
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-27 16:44:06 +01:00
060e0ad0cd
with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter
2013-11-27 15:35:32 +01:00
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
7f2bdb0e97
typo fixed
2013-11-27 12:25:04 +01:00
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
35a6ad255d
fix typo in var name
2013-11-26 11:38:45 +01:00
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
6443e570c2
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 16:00:21 +01:00
d2e6f7d979
check HTTP Referer to check if we come from public.php or from a internal page.
...
Necessary to detect public access also if a user is logged in.
2013-11-21 15:57:49 +01:00
87f2696e6a
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 11:18:53 +01:00
c7dc6dc2c2
fix getFileKey() call
2013-11-21 11:11:15 +01:00
009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
16b484209c
Merge branch 'master' into encryption_work_with_public_gallery
...
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
2013-11-21 10:33:37 +01:00
18c80e47b6
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-11-21 10:24:47 +01:00
2b361ea085
better distinction between userID and keyId
2013-11-21 10:09:07 +01:00
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
b9c18d16fe
make sure that we always use the correct user id
2013-11-20 23:23:23 +01:00
e11afd3066
fix some getShareKey() and getFileKey() calls
2013-11-20 22:44:23 +01:00
c5cb4206f5
[wip] make encryption work with public gallery sharing
2013-11-20 18:10:56 +01:00
5de5c317c1
Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset
...
Fix for extstorage + encryption where unencrypted size is not kept
2013-11-20 09:04:37 -08:00
fe44024868
Fix for extstorage + encryption where unencrypted size is not kept
...
Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
2013-11-20 16:22:55 +01:00
f3e2a63712
check if it is a cached file or a version to resolve the correct path to the file key
2013-11-20 12:34:23 +01:00
0c24c7c420
only check if the key file exists to decide if it is an encrypted file or not.
...
This solves problems with external storage which doesn't support fseek
2013-11-20 11:02:22 +01:00
b823505bd1
make sure that the owners home is mounted correctly
2013-11-19 18:28:51 +01:00
d306f5c4cf
Merge pull request #5908 from owncloud/fix_errorpage_call
...
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
82f30d37ca
call error page with session as parameter
2013-11-17 13:23:07 +01:00
3ad546002f
Merge pull request #5833 from owncloud/encryption_fixes
...
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
faa08da944
instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list
2013-11-14 17:32:21 +01:00
222fa88eec
Merge branch 'master' into encryption_fixes
2013-11-13 12:11:12 +01:00
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
dd0ebcede2
fixPartialFilePath() is now stripPartialFileExtension()
2013-11-12 18:48:31 +01:00
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
e2fb8d7128
only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry
2013-11-12 15:55:59 +01:00
894856ce01
make sure that we keep the correct timestamp and etag after encryoption/decryption
2013-11-12 15:51:51 +01:00
9f10f15fd4
fixing tests for the new part file handling
2013-11-12 10:24:10 +01:00
Thomas Müller
Bjoern Schiessle
Björn Schießle
Bart Visscher
Morris Jobke
Andreas Fischer
Vincent Petry