d699d31518
make versions of shared files downloadable
2015-01-09 12:46:24 +01:00
efac8ced90
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
2014-12-09 09:47:26 +01:00
7f7006643f
Fix namespace of files_encryption classes and autoload them
2014-12-09 09:47:26 +01:00
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
b228226700
Fix single run of encryption tests and usages of uniqid() and fopen()
2014-11-17 10:48:13 +01:00
676b911b22
Merge pull request #12027 from owncloud/cleanup_exceptions
...
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
2af7256267
only set the values we need and make sure that we write the file info for both
...
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
4bbdcfbccf
support aes 256
2014-07-23 12:14:01 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
1782dcbb50
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
...
always encrypt files to owner
2014-04-02 13:20:51 +02:00
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
aa867ad647
don't call getFileInfo() to avoid to open the same file twice
2014-03-31 15:29:16 +02:00
4ace1a273d
remember original fopen access type in pre-proxy because sometimes they change
...
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
2014-02-27 14:16:03 +01:00
ec7c339930
Don't use is_array on FileInfo
2014-01-17 12:56:17 +01:00
4f8ae789ae
extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek
2013-12-18 15:43:50 +01:00
d9668977cd
implement ftell stream wrapper and fix return value from fseek stream wrapper
2013-12-18 15:41:40 +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
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +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
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
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
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
dd0ebcede2
fixPartialFilePath() is now stripPartialFileExtension()
2013-11-12 18:48:31 +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
39d710e737
block file access if share keys are missing
2013-10-11 14:20:46 +02:00
38e5da05af
only encrypt file to users with encryption keys
2013-10-09 15:56:21 +02:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
93f4dec798
fix part file handling and real size calculation, this should also solve #4581
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-09-06 16:06:34 +02:00
1558cb860c
remove test code
2013-09-06 13:16:48 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
bab63c22ee
encryption error messages, distinguish between a re-enabled encryption app and a password change from outside
2013-09-02 11:26:11 +02:00
d7dca966a2
improved error messaging, initial commit
2013-08-30 10:17:50 +02:00
a212c98125
handle error if we can't handle the given path
2013-07-30 15:27:59 +02:00
ba18452eda
only write keyfiles if it was a new file, otherwise nothing changed
2013-07-30 10:43:16 +02:00
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
Bjoern Schiessle
Joas Schilling
Morris Jobke
Vincent Petry
Robin McCorkell
Thomas Müller
Robin Appelman
Björn Schießle