313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
d265264542
fix for share folder on external storage
2013-05-29 19:11:39 +02:00
c398fc59ad
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
2013-05-29 09:21:00 +02:00
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +02:00
2c3c60c1af
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
2013-05-27 18:09:35 +02:00
df22a7c495
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
2013-05-27 17:35:28 +02:00
8b35578833
fix migration from old to new encryption
2013-05-27 17:35:06 +02:00
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
f2b1158add
improved tests
2013-05-20 23:44:10 +02:00
1c8e5d6873
added test for failed sharing
2013-05-20 21:46:28 +02:00
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
6980f59b2f
fixed typos
2013-05-18 21:12:53 +02:00
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
bf04a21973
set migration status after successful upgrade
2013-05-17 13:16:52 +02:00
ca6a77d39b
upgrade from old encryption to the new one needs to generate share keys too
2013-05-17 11:15:36 +02:00
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
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
ec2e193a44
removed unused code
2013-05-15 21:01:03 +02:00
63a790b415
fix for broken tests
2013-05-15 14:33:08 +02:00
5b160edebb
check if the user knows the correct recovery password before changing the recovery key settings
2013-05-15 14:02:13 +02:00
8776000754
fix for move file to an empty folder
2013-05-14 23:19:16 +02:00
a4e9e2fc79
added post_deleteUser hook for cleanup public key
2013-05-13 22:49:27 +02:00
b2d021b2a5
added post_createUser hook
2013-05-13 22:34:11 +02:00
2f4ba9d1e8
if file was shared to user than userIds is just the users Id
2013-05-13 15:45:30 +02:00
d1e2e47592
generate random key name for share key to avoid name conflicts
2013-05-13 15:15:35 +02:00
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
8e004cc3e1
added handling for sharing with link
...
NOTE: only encryption work atm
2013-05-11 01:03:43 +02:00
33e0dfeecb
sharing with group should work now
2013-05-11 00:25:32 +02:00
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
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
763c8f78ed
Made code formatting of new methods more consistent
2013-05-07 17:16:16 +02:00
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
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
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
06a5cf70f7
fix duplicate login behavior if user not setup
2013-05-01 02:01:16 +02:00
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
5deba29bdf
fixed public-keys mount point error
2013-05-01 00:09:55 +02:00
c52fe12537
fixed missing parameter
2013-04-29 23:37:08 +02:00
d40ffc5aac
added filesystem post rename hook
2013-04-27 20:18:05 +02:00
11d0eef8cc
fixed webdav errors, now webdav up - and downloads are full working
2013-04-25 15:21:11 +02:00
bcb2e87846
check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
2013-04-22 14:13:59 +02:00
8a46e809f0
remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
2013-04-22 12:22:07 +02:00
a2ba3c8a43
fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
2013-04-22 11:58:39 +02:00
12785b93f1
make sure that all share keys get deleted if a file/folder gets unshared from a user/group
2013-04-19 13:17:08 +02:00
5a7a64df08
Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
2013-04-18 20:00:45 +02:00
f378a7f572
Fixed proxy class handing of read / write files
...
Various work on other classes
2013-04-16 13:22:16 +02:00
Florin Peter
Björn Schießle
Sam Tuke