Bjoern Schiessle
2e8418b362
fix infinite loop if folder and subfolder has the same name
2014-01-23 13:36:33 +01:00
Bjoern Schiessle
3c7541e97c
don't try to encrypt/decrypt cache chunks or files in the trash bin
2014-01-15 15:58:56 +01:00
Bjoern Schiessle
13461698e4
tests added
2013-12-19 20:10:42 +01:00
Bjoern Schiessle
eaa5dd0282
we can also have a path user/cache/...
2013-12-19 20:10:29 +01:00
Bjoern Schiessle
2f568c9766
fix rename of shared files
2013-12-19 19:20:17 +01:00
Vincent Petry
c4c972fd2f
Merge pull request #6498 from owncloud/stable6-oracleencryptiontestfix
...
[stable6] Trying to fix failing encryption tests on Oracle
2013-12-19 06:45:37 -08:00
Vincent Petry
1f93b4e842
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-18 21:14:26 +01:00
Bjoern Schiessle
2f0ec8256f
reliable detect encrypted files
2013-12-17 18:14:36 +01:00
Bjoern Schiessle
3160b23291
update file cache for target file
2013-12-16 17:49:14 +01:00
Bjoern Schiessle
73a0b690e9
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 17:49:05 +01:00
Bart Visscher
281bbf4bd4
Don't try to encrypt a file when the temp file isn't created
2013-12-06 19:07:11 +01:00
Bjoern Schiessle
01de6c565a
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 17:08:17 +01:00
Bjoern Schiessle
91ca1cf985
fix typo
2013-12-05 20:02:41 +01:00
Bjoern Schiessle
d0afd774b7
add method to check if users private/public key exists
2013-12-05 18:49:55 +01:00
Morris Jobke
dffc2a8b1c
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
...
This reverts commit efbf18652c
2013-12-04 13:26:59 +01:00
Andreas Fischer
efbf18652c
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).
2013-11-29 20:34:57 +01:00
Bjoern Schiessle
1065c33543
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-27 16:44:06 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Bjoern Schiessle
7f2bdb0e97
typo fixed
2013-11-27 12:25:04 +01:00
Bjoern Schiessle
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
Bjoern Schiessle
35a6ad255d
fix typo in var name
2013-11-26 11:38:45 +01:00
Bjoern Schiessle
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
Bjoern Schiessle
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
Bjoern Schiessle
6443e570c2
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 16:00:21 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
87f2696e6a
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 11:18:53 +01:00
Bjoern Schiessle
c7dc6dc2c2
fix getFileKey() call
2013-11-21 11:11:15 +01:00
Bjoern Schiessle
009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Bjoern Schiessle
2b361ea085
better distinction between userID and keyId
2013-11-21 10:09:07 +01:00
Bjoern Schiessle
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
Bjoern Schiessle
b9c18d16fe
make sure that we always use the correct user id
2013-11-20 23:23:23 +01:00
Bjoern Schiessle
e11afd3066
fix some getShareKey() and getFileKey() calls
2013-11-20 22:44:23 +01:00
Bjoern Schiessle
c5cb4206f5
[wip] make encryption work with public gallery sharing
2013-11-20 18:10:56 +01:00
Vincent Petry
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
Vincent Petry
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
Bjoern Schiessle
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
Bjoern Schiessle
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
Bjoern Schiessle
b823505bd1
make sure that the owners home is mounted correctly
2013-11-19 18:28:51 +01:00
Vincent Petry
d306f5c4cf
Merge pull request #5908 from owncloud/fix_errorpage_call
...
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
Bjoern Schiessle
82f30d37ca
call error page with session as parameter
2013-11-17 13:23:07 +01:00
Björn Schießle
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
Bjoern Schiessle
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
Bjoern Schiessle
222fa88eec
Merge branch 'master' into encryption_fixes
2013-11-13 12:11:12 +01:00
Vincent Petry
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Bjoern Schiessle
dd0ebcede2
fixPartialFilePath() is now stripPartialFileExtension()
2013-11-12 18:48:31 +01:00
Bjoern Schiessle
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
Bjoern Schiessle
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
