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

445 commits

Author SHA1 Message Date
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
Florin Peter
11d0eef8cc fixed webdav errors, now webdav up - and downloads are full working 2013-04-25 15:21:11 +02:00
Florin Peter
fac288a4ad added unencrypted file size to file cache 
improved file size calculation and speeds
 2013-04-25 15:20:06 +02:00
Florin Peter
170d09203f fixed file_proxy handling 2013-04-25 14:56:11 +02:00
Florin Peter
f8819f54c2 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-23 19:09:01 +02:00
Florin Peter
baa6fd639f improved file size handling 2013-04-23 19:08:52 +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
4aa80d02be Merge branch 'master' into files_encryption 2013-04-23 14:13:40 +02:00
Sam Tuke
a1d241783e Updated buglist 2013-04-23 14:12:28 +02:00
Florin Peter
8ab9433fdf fix wrong file path in proxy 2013-04-22 18:54:23 +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
a4364a93d0 delete all share keys if a file gets deleted 2013-04-22 15:29:58 +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
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
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
8790ceba25 Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption 2013-04-22 11:59:26 +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
Florin Peter
6b47da10be improved rename and file size support 
fix missing user_id on write
 2013-04-22 04:40:49 +02:00
FlorinPeter
9a0b73070c Merge pull request #2992 from FlorinPeter/files_encryption 
fix for trashbin
 2013-04-20 05:35:29 -07:00
Björn Schießle
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
Florin Peter
0e1970438b fixed incorrect filesize, download via web is now possible 
fixed broken file-info
 2013-04-18 22:34:22 +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
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
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
39c717b24c some fixes to the keymanager class to identify the file owner and the owner path correctly. 2013-04-18 17:52:27 +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
40905c8941 fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it 2013-04-18 16:34:23 +02:00
Björn Schießle
7892fddcb9 remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles 2013-04-18 15:44:57 +02:00
Björn Schießle
bd3024242f always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change 2013-04-18 15:42:28 +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
Florin Peter
2434739d69 fix for trashbin 2013-04-18 02:03:03 +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
770dcbf663 Fixed stream{} reading of encrypted files (stream_read()) 2013-04-16 14:53:54 +02:00
Sam Tuke
b4dd6ae36c Merge pull request #2885 from FlorinPeter/files_encryption 
fix performance issues
 2013-04-16 04:25:59 -07: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
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +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
Florin Peter
8f0bbdc5cb fix performance issues 2013-04-11 22:55:48 +02:00
Björn Schießle
c3a284569b make sure that public-keys dir exists 2013-04-10 16:46:02 +02:00
Björn Schießle
4303d6318e Session expect OC_FilesystemView() 2013-04-10 15:31:19 +02:00
Björn Schießle
fff979a590 add $view as parameter for getFileKey() call 2013-04-10 15:14:44 +02:00
Björn Schießle
98de385b8a add $view as parameter for session constructor 2013-04-10 15:08:28 +02:00
Sam Tuke
109fe198c3 Added info about filesystem method access conventions 2013-04-09 19:19:27 +02:00
Sam Tuke
400cf5beb3 Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload 2013-04-09 19:11:38 +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
Sam Tuke
ff6f52d5ec Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
 2013-03-28 18:39:12 +01:00
Sam Tuke
9ecfd07f23 Added ajax scripts for setting pwd recovery preferences 2013-03-28 18:29:18 +01:00
Björn Schießle
e717f7150e check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete 2013-03-26 16:52:58 +01:00
Björn Schießle
73157133e8 reuse function provided in util.php 2013-03-26 16:22:26 +01:00
Björn Schießle
6beeb2466f also delete share keys if a different user than the owner deletes a shared file 2013-03-26 16:17:26 +01:00
Björn Schießle
b1d620300e delete share keys if file gets deleted 2013-03-26 14:22:18 +01:00
Björn Schießle
5f233ee814 get the correct paths and owner to access shared files 2013-03-26 12:40:31 +01:00
Björn Schießle
a65d741a3f move getUidAndFilename() tu util.php 2013-03-26 12:39:55 +01:00
Björn Schießle
890f0142a2 get shared keys from new location 2013-03-26 12:24:04 +01:00
Björn Schießle
5995b6996b always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later 2013-03-26 12:23:28 +01:00
Björn Schießle
f10be4ea17 new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir) 2013-03-26 11:58:54 +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
Jenkins for ownCloud
63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +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
Jenkins for ownCloud
63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud
0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Jenkins for ownCloud
f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +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
Tom Needham
dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods 
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
 2013-03-09 16:59:13 -08:00
Tom Needham
e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud
97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Tom Needham
370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Björn Schießle
f2b86d0227 make sure that $this->userId is initialized before using it as a parameter 2013-03-04 17:58:56 +01:00
Björn Schießle
e65e6a12f1 define key size in constructor, otherwise the key size will depend on the servers openssl conf 2013-03-04 15:33:38 +01:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master 
suppress log messages like `include path for class ... starts with "apps/"`
 2013-03-04 12:59:39 -08:00
j-ed
5352f1e65b Update app.php 
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
 2013-03-02 12:18:28 +01:00
Lukas Reschke
7f8eddffe4 [files_encryption] Use p() instead of echo() 2013-02-27 21:20:37 +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
14eae441eb Unsharing a single file now works 2013-02-27 15:31:23 +00:00
Sam Tuke
aae9b0b1bf Started work on post unshare hook 
Development snapshot
 2013-02-26 18:33:31 +00:00
Sam Tuke
4550ae6a69 Shared encrypted files now readable by both sharer and sharee 2013-02-26 18:11:29 +00:00
Lukas Reschke
c94974cb97 Add missing echo 2013-02-26 16:10:52 +01:00
Björn Schießle
ca1b94d890 make sure that home folders are mounted correctly before write/read keyfile 2013-02-25 12:29:07 +01:00
Björn Schießle
31c434b795 the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely 2013-02-22 16:08:08 +01:00
Björn Schießle
40efeb9187 isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not 2013-02-22 16:02:27 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Sam Tuke
2d267501a1 Development snapshot 
Added comments
Added methods
 2013-02-20 19:18:00 +00:00
Sam Tuke
1b880f2f96 Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI) 
Fixed bug preventing sharing with users other than 'ownCloud'
Added comments
Moved functionality into filterShareReadyUsers()
Other changes
 2013-02-19 19:16:50 +00:00
Sam Tuke
14ae373dfe Fixed wrong array key reference 2013-02-19 17:42:37 +00:00
Björn Schießle
fd629983fa remove debug output 2013-02-19 17:10:32 +01:00
Björn Schießle
109fee7673 remove todo, it is already solved 2013-02-19 14:47:45 +01:00
Jenkins for ownCloud
76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Jenkins for ownCloud
c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00