0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
49cfc30359
upgrade to new folder structure
2014-12-02 16:03:54 +01:00
a90606fb14
change private/public key names for consistency reasons
2014-11-26 10:57:47 +01:00
fd86d76f98
new folder structure for keys
...
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
391ece46e3
Fix file upload to ext storage when recovery key is enabled
...
Fixes an issue when uploading files to external storage when recovery
keys are enabled
The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
b228226700
Fix single run of encryption tests and usages of uniqid() and fopen()
2014-11-17 10:48:13 +01:00
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
cb3a4d22b1
make tests compatible with hook based skeleton generation
2014-10-20 11:29:20 +02:00
75593f87d5
Merge pull request #11137 from owncloud/enc-pregfix
...
Fix share key pattern matching
2014-09-23 12:36:34 +02:00
1e631754d7
Fix share key finding algorithm in various cases
...
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.
This covers the following cases:
- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
2014-09-23 12:33:07 +02:00
2ee14c4734
create backup from all keys before recovery
2014-09-19 11:47:18 +02:00
f282a5cff0
Merge pull request #9754 from owncloud/enc_support_aes_256
...
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
d4eaa74b76
fixes from git push force
2014-08-12 21:29:05 +02:00
53c5a84eac
add unit tests
2014-08-12 21:15:39 +02:00
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
de9d3797ff
update existing unit tests
2014-07-23 12:14:02 +02:00
5a33c9c360
Removed legacy encryption tests
2014-07-16 12:38:41 +02:00
9fa28aa3f4
Disable legacy encryption tests
...
It seems these tests are not needed any more, but will now be skipped
instead until the case is cleared out.
2014-07-11 15:20:58 +02:00
e20bb71a42
remove unused code
2014-06-18 13:26:42 +02:00
eb29b2984c
use oc_preferences instead of oc_encryption to store encyption settings
2014-06-05 16:54:04 +02:00
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +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
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
73a2d87ab4
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-28 14:49:19 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
a687498547
Fix encryption webdav tests
2014-03-05 13:19:08 +01:00
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
f09c19c316
Replaced time() with uniqid() to make sure the file name is unique
...
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)
This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
2014-01-21 16:31:58 +01:00
299bb4d99d
remove more is_array from encryption
2014-01-17 14:38:14 +01:00
6a3e38266f
Merge pull request #6507 from owncloud/enc_fix_getUser
...
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
517a55a437
tests added
2013-12-19 19:43:57 +01:00
f9ec3a7124
test for isEncryptedPath()
2013-12-18 16:39:34 +01:00
2624a6cb32
remove debug output
2013-11-14 12:13:22 +01:00
2df3763675
test encryptAll() and decryptAll() to make sure that mtime and etag stay the same
2013-11-14 12:11:21 +01:00
af58360434
files_encryption: Fix getFileSize()
...
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
Conflicts:
apps/files_encryption/tests/util.php
2013-10-23 16:28:43 +02:00
83afb46205
Use __DIR__ instead of dirname(__FILE__).
...
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
9753e44ac2
Do not use realpath() on includes.
...
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.
'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +02:00
ec6350079f
fix getUidAndFilename() test
2013-07-05 16:00:43 +02:00
bc2862fcb9
Merge branch 'master' into files_encryption_upgrade_fix
2013-06-13 12:53:29 +02:00
Morris Jobke
Bjoern Schiessle
Vincent Petry
Joas Schilling
Thomas Müller
Jörn Friedrich Dreyer
Robin McCorkell
Robin Appelman
Markus Goetz
Andreas Fischer