Vincent Petry
da9f9ae9b3
Remove passing by reference to allow for proper GC
...
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.
This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-12 19:51:47 +02:00
Jörn Friedrich Dreyer
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Vincent Petry
f282a5cff0
Merge pull request #9754 from owncloud/enc_support_aes_256
...
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
Bjoern Schiessle
da1feafc78
fix detection of system wide mount points
2014-08-12 21:14:22 +02:00
Bjoern Schiessle
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
Bjoern Schiessle
c738f71657
make the versions and encryption app aware of the copy operation
2014-07-30 15:14:01 +02:00
Bjoern Schiessle
de9d3797ff
update existing unit tests
2014-07-23 12:14:02 +02:00
Bjoern Schiessle
4bbdcfbccf
support aes 256
2014-07-23 12:14:01 +02:00
Bjoern Schiessle
8105f2ac8a
introduce some encryption exceptions and catch additional error cases
2014-07-16 12:36:30 +02:00
Thomas Müller
064ac77e44
Kill legacy encryption migration
2014-07-08 13:07:05 +02:00
Frank Karlitschek
a468687682
Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
...
[encryption] always take unencrypted size
2014-07-06 10:38:06 -04:00
Bjoern Schiessle
ddac446c5b
always take unencrypted size
2014-07-04 16:44:50 +02:00
Bjoern Schiessle
673b0f5eb9
add owner as parameter for delShareKey
2014-07-04 12:19:59 +02:00
Björn Schießle
f3973c1c20
Merge pull request #9240 from owncloud/enc_check_if_file_exists
...
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
Bjoern Schiessle
618c9fd033
improved error message
2014-06-30 16:28:40 +02:00
Bjoern Schiessle
e4c45b5e26
check if file exists before deleting keys, and add debug output for every
...
delete operation
2014-06-27 23:09:31 +02:00
Bjoern Schiessle
706a8ace58
normalize path before comparison to make sure that we always find the mount point
2014-06-27 22:53:26 +02:00
Bjoern Schiessle
3d0805f27d
always use a \OC\Files\View
2014-06-25 12:27:30 +02:00
Bjoern Schiessle
709691548d
always use oc filesystem for rename operation
2014-06-25 12:27:30 +02:00
Bjoern Schiessle
9c45a3196b
add unit tests
2014-06-24 10:43:07 +02:00
Bjoern Schiessle
6b85fe819c
always use '/' as directory seperator
2014-06-24 09:29:11 +02:00
Bjoern Schiessle
e20bb71a42
remove unused code
2014-06-18 13:26:42 +02:00
Robin Appelman
790d51ea1e
Fix checking for external share in encryption
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
277f25222a
if file doesn't exist, check parent folder
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
c580aeb455
exclude mounted server-to-server shares from encryption
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
Thomas Müller
e9011a8c55
adding unit tests for encryption data migration
2014-06-05 16:54:04 +02:00
Bjoern Schiessle
eb29b2984c
use oc_preferences instead of oc_encryption to store encyption settings
2014-06-05 16:54:04 +02:00
Bjoern Schiessle
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
Thomas Müller
d3e830e938
Merge pull request #8729 from owncloud/add-phpseclib-master
...
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
Thomas Müller
17cbfc714a
use phpseclib from 3rdparty
...
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
Morris Jobke
390d8e53b4
Merge pull request #8676 from owncloud/encryption_improvements
...
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
Bjoern Schiessle
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +02:00
Bjoern Schiessle
9ed5083efd
get mount point from mount manager
2014-05-28 17:28:31 +02:00
Morris Jobke
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
Robin McCorkell
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
Robin McCorkell
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
Thomas Müller
58857b8df5
@returns -> @return
2014-05-13 19:09:15 +01:00
Björn Schießle
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
Bjoern Schiessle
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
Thomas Müller
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
Thomas Müller
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
Bjoern Schiessle
57b671ebec
only update the values which really changed
2014-04-30 12:48:16 +02:00
Bjoern Schiessle
73a2d87ab4
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-28 14:49:19 +02:00
Bjoern Schiessle
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
Lukas Reschke
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
Vincent Petry
a6de5efbab
Merge pull request #7978 from owncloud/enc_cleanup
...
there is no need to re-calculate the shares after a touch
2014-04-02 18:23:33 +02:00