wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11086 commits 157 branches 562 tags 714 MiB
Commit graph

86 commits

Author SHA1 Message Date
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
Florin Peter
e88595638c fix for webdav 2013-05-11 00:23:30 +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
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
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
f9760f6521 improved file size 2013-04-27 23:34:25 +02:00
Florin Peter
770aebfb9e check if file exists before fixing file size 2013-04-27 20:22:38 +02:00
Florin Peter
813641e6e8 improved file size 
created new method fixFileSize in Util so it can be used with files_trashbin
 2013-04-27 00:05:20 +02:00
Florin Peter
328dea93c7 webdav fix for file chunking 
upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav
 2013-04-25 20:23:54 +02:00
Sam Tuke
b7d8da87d0 Development snapshot 
working on stream handling (large files) in Util->encryptAll()
 2013-04-23 18:41:01 +02:00
Sam Tuke
c6bfc7315b Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside 
.part file paths fixed in stream{}
 2013-04-23 17:36:35 +02:00
Sam Tuke
a1d241783e Updated buglist 2013-04-23 14:12:28 +02:00
Florin Peter
2827004634 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-22 18:51:11 +02:00
Florin Peter
37c7205941 fix wrong file path in util 2013-04-22 18:50:59 +02:00
Björn Schießle
b5cb5dab51 fix encryption to owncloud user for public link shares 2013-04-22 14:30:10 +02:00
Björn Schießle
b57478fa27 fix comment, remove unused variable 2013-04-22 14:14:28 +02:00
Björn Schießle
1705938848 removed some leftover code; use already existing var for path to users file folder 2013-04-22 12:32:38 +02:00
Florin Peter
eade87dc79 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-22 12:32:35 +02:00
Florin Peter
f6ac34afea improved handling for getSharingUsersArray 2013-04-22 12:25:55 +02:00
Björn Schießle
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
Björn Schießle
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
Björn Schießle
2bd338c49f getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results 2013-04-18 20:02:27 +02:00
Björn Schießle
935d039860 necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() (fe58e4b1a6) 2013-04-18 17:53:59 +02:00
Björn Schießle
1df36e0c88 rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud 2013-04-18 16:39:00 +02:00
Björn Schießle
a646a1169f return filename relative to users file dir and not relative to data dir 2013-04-18 13:41:21 +02:00
Sam Tuke
6dd8c79461 Development snapshot 
Working on stream{} write
 2013-04-17 17:20:37 +02:00
Sam Tuke
f89a3604aa Working on stream{} writing 
Development snapshot
 2013-04-16 18:29:22 +02:00
Sam Tuke
f378a7f572 Fixed proxy class handing of read / write files 
Various work on other classes
 2013-04-16 13:22:16 +02:00
Björn Schießle
854b920787 fix some more paths 2013-04-12 15:18:19 +02:00
Björn Schießle
02d1f86a53 fix some confusion about paths relative to the files dir and to the data dir 2013-04-12 14:30:02 +02:00
Björn Schießle
f87229ddaf fix stream wrapper to make initial encryption work 2013-04-12 14:13:38 +02:00
Björn Schießle
fff979a590 add $view as parameter for getFileKey() call 2013-04-10 15:14:44 +02:00
Sam Tuke
14451bdaf0 Development snapshot; 
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
 2013-03-29 21:11:29 +01:00
Björn Schießle
a65d741a3f move getUidAndFilename() tu util.php 2013-03-26 12:39:55 +01:00
Sam Tuke
fd4e59b748 Added method for setting user keyfile recovery preference 
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled
 2013-03-20 19:26:59 +01:00
Sam Tuke
c89fd49870 Improved folder creation code 
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
 2013-03-19 19:53:15 +01:00
Sam Tuke
c1f1fbda08 Fixed stream wrapper bugs 
Switched encryptAll() to use stream-based instead of file-at-a-time encryption
Development snapshot
 2013-03-09 19:18:34 +01:00
Sam Tuke
0bc7d3bcf8 Added notes where to reuse old keys instead of generating new ones 2013-02-27 18:50:57 +00:00
Sam Tuke
953319a2c3 Made proxy class reuse existing keyfiles not gen new ones; 
Added notes about reusing shareKeys
 2013-02-27 18:46:44 +00:00
Sam Tuke
69bc42f920 Deleting encrypted files with missing keyfiles/shareKeys now succeeds 2013-02-27 16:15:03 +00:00
Sam Tuke
aae9b0b1bf Started work on post unshare hook 
Development snapshot
 2013-02-26 18:33:31 +00:00