Florin Peter
ddda2a1f79
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
...
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
2013-05-19 07:04:31 +02:00
Florin Peter
681252669a
changed migrationStatus to migration_status for pgsql
2013-05-18 22:10:00 +02:00
Florin Peter
3aa48616a6
remove unused code
2013-05-17 22:44:45 +02:00
Florin Peter
cea9208cec
fix broken legacy tests
2013-05-17 21:59:53 +02:00
Björn Schießle
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
Björn Schießle
002445e23d
some typo fixed
2013-05-17 14:49:54 +02:00
Björn Schießle
93771f735b
gremove unused code
2013-05-17 14:13:05 +02:00
Björn Schießle
0b40c1d08a
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-17 11:20:17 +02:00
Björn Schießle
ca6a77d39b
upgrade from old encryption to the new one needs to generate share keys too
2013-05-17 11:15:36 +02:00
Florin Peter
42b4963dd0
moved enable and disable recovery to Helper class for unit tests
2013-05-17 00:58:41 +02:00
Florin Peter
3793e4d2d6
fix for recover files in subfolder
2013-05-16 22:57:55 +02:00
Florin Peter
d40d6aa358
fix typo in addRecoveryKeys
2013-05-16 22:39:09 +02:00
Björn Schießle
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
Florin Peter
c651950a17
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
2013-05-16 00:34:45 +02:00
Florin Peter
c0c4fe5fd3
fix if file is not yet created
2013-05-16 00:31:17 +02:00
Florin Peter
ec2e193a44
removed unused code
2013-05-15 21:01:03 +02:00
Björn Schießle
57c0a7ed69
add recovery key to all files if the user enabled the feature and removes them again on disable
2013-05-15 17:56:45 +02:00
Björn Schießle
64d94c540a
enable admin to change the recovery password
2013-05-15 16:12:20 +02:00
Björn Schießle
5b160edebb
check if the user knows the correct recovery password before changing the recovery key settings
2013-05-15 14:02:13 +02:00
Florin Peter
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
Florin Peter
ddedf20106
prevent of infinite loop with FileProxy
2013-05-15 02:34:36 +02:00
Florin Peter
0a7aa6e8cd
fix for Allowed memory size of xx bytes exhausted while reading big files
2013-05-14 22:32:39 +02:00
Florin Peter
84c56a5d56
fix for zero size files
2013-05-14 21:29:24 +02:00
Florin Peter
517105660d
fix for public link share
2013-05-14 20:11:07 +02:00
Florin Peter
81ae4cb5d0
added test for public shared file via link
2013-05-14 00:00:20 +02:00
Florin Peter
a4e9e2fc79
added post_deleteUser hook for cleanup public key
2013-05-13 22:49:27 +02:00
Florin Peter
b2d021b2a5
added post_createUser hook
2013-05-13 22:34:11 +02:00
Florin Peter
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +02:00
Björn Schießle
aa3eb6bb5b
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
2013-05-13 17:40:57 +02:00
Björn Schießle
517efdf952
don't create a recovery user, only generate recovery key similar to the public link share key
2013-05-13 17:26:21 +02:00
Björn Schießle
d1e2e47592
generate random key name for share key to avoid name conflicts
2013-05-13 15:15:35 +02:00
Björn Schießle
a6ef25ba08
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
2013-05-13 14:28:45 +02:00
Florin Peter
e88595638c
fix for webdav
2013-05-11 00:23:30 +02:00
Florin Peter
e25aa78caf
added helper class and moved hook registration to it
2013-05-09 19:36:18 +02:00
Sam Tuke
163fe64016
Fixes to code formatting and indentation
2013-05-09 18:24:07 +02:00
Sam Tuke
92e28839ff
Improvements to code formatting & indentation
2013-05-09 18:16:59 +02:00
Sam Tuke
3003dd46d1
Implemented initial recoveryAdmin functionality in crypto file proxy
2013-05-09 18:09:20 +02:00
Sam Tuke
101e037529
Fixed bugs with pre_share hook usage
...
Made sure new user being shared to is added to array of sharing users
2013-05-09 14:43:06 +02:00
Sam Tuke
28866de44b
Added pre_share hook
...
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
Florin Peter
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
Florin Peter
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
Florin Peter
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +02:00
Florin Peter
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
Sam Tuke
c8946ea608
Added support for user-specified password for adminRecovery account in admin settings page
...
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
2013-05-04 16:14:38 +02:00
Florin Peter
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
Sam Tuke
ba29147e34
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
...
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
Florin Peter
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
Florin Peter
fbbc76f281
fix for sharing files
2013-04-30 20:44:42 +02:00
Florin Peter
27ce7845b4
fixed tests, now tests should work via autotest.sh
...
files_encryption app is now enabled in enable_all.php
2013-04-30 01:35:46 +02:00
Florin Peter
4a63faf64b
speed improvement
2013-04-29 01:43:59 +02:00