5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
690bf9b8c4
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
1a3f7891ea
remove unused varaibles
2013-05-27 15:31:26 +02:00
80433fc4c4
Merge branch 'master' into file_encryption_util_is_error
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 14:41:53 +02:00
5e243b48bb
Merge pull request #3481 from owncloud/firsttime_enc
...
fix first time encryption after app was enabled
2013-05-27 05:17:31 -07:00
89f0c8f39d
added check by numRows()
...
changed to public api where it was possible
reformat code to comply with the coding guidelines
2013-05-27 12:41:55 +02:00
788c5940f0
fixed error rising from fetchRow
2013-05-25 23:20:55 +02:00
9a6cd89a69
added OC_DB::isError and logging
2013-05-25 21:33:05 +02:00
f56802a437
no use the recoveryPassword var instead of accessing the POST array
2013-05-24 18:37:58 +02:00
5ce4149e75
fix first time encryption after app was enabled
2013-05-24 17:35:00 +02:00
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
7b07168c46
code clean up; nicer solution to solve the public link share problem if a user is logged in
2013-05-23 21:18:31 +02:00
a9ebf2aabe
fix public link share if a user is logged in
2013-05-23 20:30:07 +02:00
c6722581f9
fix pgsql error
2013-05-22 02:02:42 +02:00
afbfa742d7
improved tests
2013-05-22 01:11:55 +02:00
9ca9a22c6a
fixed finding encrypted files in subfolders and removed unused code
2013-05-22 00:54:47 +02:00
1deeec93b7
fixed postFileSize
2013-05-21 21:09:25 +02:00
9d324db054
fix path to 3rdparty apps
2013-05-21 12:33:32 +02:00
4c27c7e199
fix path, needs to be relative to data/
2013-05-21 12:22:03 +02:00
64591cf754
move 3rdparty dependencies to app
2013-05-21 10:30:24 +02:00
4bf840e2ca
cleanup unused code optimize tests
2013-05-21 00:00:55 +02:00
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
8e0540d0e4
key creation should never override a private or public key
2013-05-20 21:22:03 +02:00
3b850a2524
reformat code added and changed phpdoc
2013-05-20 01:24:36 +02:00
5d572c3449
update phpdoc
2013-05-19 22:31:00 +02:00
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
681252669a
changed migrationStatus to migration_status for pgsql
2013-05-18 22:10:00 +02:00
3aa48616a6
remove unused code
2013-05-17 22:44:45 +02:00
cea9208cec
fix broken legacy tests
2013-05-17 21:59:53 +02:00
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
002445e23d
some typo fixed
2013-05-17 14:49:54 +02:00
93771f735b
gremove unused code
2013-05-17 14:13:05 +02:00
0b40c1d08a
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-17 11:20:17 +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
42b4963dd0
moved enable and disable recovery to Helper class for unit tests
2013-05-17 00:58:41 +02:00
3793e4d2d6
fix for recover files in subfolder
2013-05-16 22:57:55 +02:00
d40d6aa358
fix typo in addRecoveryKeys
2013-05-16 22:39:09 +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
c0c4fe5fd3
fix if file is not yet created
2013-05-16 00:31:17 +02:00
ec2e193a44
removed unused code
2013-05-15 21:01:03 +02:00
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
64d94c540a
enable admin to change the recovery password
2013-05-15 16:12:20 +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
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
ddedf20106
prevent of infinite loop with FileProxy
2013-05-15 02:34:36 +02:00
0a7aa6e8cd
fix for Allowed memory size of xx bytes exhausted while reading big files
2013-05-14 22:32:39 +02:00
84c56a5d56
fix for zero size files
2013-05-14 21:29:24 +02:00
517105660d
fix for public link share
2013-05-14 20:11:07 +02:00
81ae4cb5d0
added test for public shared file via link
2013-05-14 00:00:20 +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
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +02:00
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
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
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
e88595638c
fix for webdav
2013-05-11 00:23:30 +02:00
e25aa78caf
added helper class and moved hook registration to it
2013-05-09 19:36:18 +02:00
163fe64016
Fixes to code formatting and indentation
2013-05-09 18:24:07 +02:00
92e28839ff
Improvements to code formatting & indentation
2013-05-09 18:16:59 +02:00
3003dd46d1
Implemented initial recoveryAdmin functionality in crypto file proxy
2013-05-09 18:09:20 +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
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +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
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
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
fbbc76f281
fix for sharing files
2013-04-30 20:44:42 +02:00
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
4a63faf64b
speed improvement
2013-04-29 01:43:59 +02:00
f9760f6521
improved file size
2013-04-27 23:34:25 +02:00
7f1f0464a8
added self healing if file get remove from file cache
2013-04-27 23:02:42 +02:00
770aebfb9e
check if file exists before fixing file size
2013-04-27 20:22:38 +02:00
ba080e0d2e
removed preRename and moved postRename to hooks.php
...
added postWrite and postTouch to fix file size and sharing keys
2013-04-27 20:21:46 +02:00
05523b76c0
fix reusing keys
...
fix webdav part files
2013-04-27 20:18:57 +02:00
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
d017bbb065
fix share for renamed or moved files
2013-04-25 23:24:07 +02:00
8ee7959092
implement postRename
...
@samtuke no need anymore for fixPartialFilePath this is now handled by rename
share-keys are now handled properly
webdav .part files are handled properly
2013-04-25 22:49:47 +02:00
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
fac288a4ad
added unencrypted file size to file cache
...
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
170d09203f
fixed file_proxy handling
2013-04-25 14:56:11 +02:00
f8819f54c2
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-23 19:09:01 +02:00
baa6fd639f
improved file size handling
2013-04-23 19:08:52 +02:00
b7d8da87d0
Development snapshot
...
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +02:00
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
a1d241783e
Updated buglist
2013-04-23 14:12:28 +02:00
8ab9433fdf
fix wrong file path in proxy
2013-04-22 18:54:23 +02:00
2827004634
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 18:51:11 +02:00
37c7205941
fix wrong file path in util
2013-04-22 18:50:59 +02:00
a4364a93d0
delete all share keys if a file gets deleted
2013-04-22 15:29:58 +02:00
b5cb5dab51
fix encryption to owncloud user for public link shares
2013-04-22 14:30:10 +02:00
b57478fa27
fix comment, remove unused variable
2013-04-22 14:14:28 +02:00
1705938848
removed some leftover code; use already existing var for path to users file folder
2013-04-22 12:32:38 +02:00
eade87dc79
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 12:32:35 +02:00
f6ac34afea
improved handling for getSharingUsersArray
2013-04-22 12:25:55 +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
8790ceba25
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-04-22 11:59:26 +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
6b47da10be
improved rename and file size support
...
fix missing user_id on write
2013-04-22 04:40:49 +02:00
9a0b73070c
Merge pull request #2992 from FlorinPeter/files_encryption
...
fix for trashbin
2013-04-20 05:35:29 -07: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
0e1970438b
fixed incorrect filesize, download via web is now possible
...
fixed broken file-info
2013-04-18 22:34:22 +02:00
2bd338c49f
getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
2013-04-18 20:02:27 +02:00
935d039860
necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() ( fe58e4b1a6)
2013-04-18 17:53:59 +02:00
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
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
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
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
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
a646a1169f
return filename relative to users file dir and not relative to data dir
2013-04-18 13:41:21 +02:00
2434739d69
fix for trashbin
2013-04-18 02:03:03 +02:00
6dd8c79461
Development snapshot
...
Working on stream{} write
2013-04-17 17:20:37 +02:00
f89a3604aa
Working on stream{} writing
...
Development snapshot
2013-04-16 18:29:22 +02:00
770dcbf663
Fixed stream{} reading of encrypted files (stream_read())
2013-04-16 14:53:54 +02:00
b4dd6ae36c
Merge pull request #2885 from FlorinPeter/files_encryption
...
fix performance issues
2013-04-16 04:25:59 -07:00
f378a7f572
Fixed proxy class handing of read / write files
...
Various work on other classes
2013-04-16 13:22:16 +02:00
854b920787
fix some more paths
2013-04-12 15:18:19 +02:00
02d1f86a53
fix some confusion about paths relative to the files dir and to the data dir
2013-04-12 14:30:02 +02:00
f87229ddaf
fix stream wrapper to make initial encryption work
2013-04-12 14:13:38 +02:00
8f0bbdc5cb
fix performance issues
2013-04-11 22:55:48 +02:00
c3a284569b
make sure that public-keys dir exists
2013-04-10 16:46:02 +02:00
fff979a590
add $view as parameter for getFileKey() call
2013-04-10 15:14:44 +02:00
98de385b8a
add $view as parameter for session constructor
2013-04-10 15:08:28 +02:00
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
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
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
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
73157133e8
reuse function provided in util.php
2013-03-26 16:22:26 +01:00
6beeb2466f
also delete share keys if a different user than the owner deletes a shared file
2013-03-26 16:17:26 +01:00
b1d620300e
delete share keys if file gets deleted
2013-03-26 14:22:18 +01:00
5f233ee814
get the correct paths and owner to access shared files
2013-03-26 12:40:31 +01:00
a65d741a3f
move getUidAndFilename() tu util.php
2013-03-26 12:39:55 +01:00
890f0142a2
get shared keys from new location
2013-03-26 12:24:04 +01:00
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
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
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
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
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
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
f2b86d0227
make sure that $this->userId is initialized before using it as a parameter
2013-03-04 17:58:56 +01:00
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
0bc7d3bcf8
Added notes where to reuse old keys instead of generating new ones
2013-02-27 18:50:57 +00:00
953319a2c3
Made proxy class reuse existing keyfiles not gen new ones;
...
Added notes about reusing shareKeys
2013-02-27 18:46:44 +00:00
69bc42f920
Deleting encrypted files with missing keyfiles/shareKeys now succeeds
2013-02-27 16:15:03 +00:00
14eae441eb
Unsharing a single file now works
2013-02-27 15:31:23 +00:00
aae9b0b1bf
Started work on post unshare hook
...
Development snapshot
2013-02-26 18:33:31 +00:00
4550ae6a69
Shared encrypted files now readable by both sharer and sharee
2013-02-26 18:11:29 +00:00
ca1b94d890
make sure that home folders are mounted correctly before write/read keyfile
2013-02-25 12:29:07 +01:00
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
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
2d267501a1
Development snapshot
...
Added comments
Added methods
2013-02-20 19:18:00 +00:00
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
14ae373dfe
Fixed wrong array key reference
2013-02-19 17:42:37 +00:00
fd629983fa
remove debug output
2013-02-19 17:10:32 +01:00
8c35bbcba7
remove debug output, fix typo in file names
2013-02-14 16:33:57 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
1e5d03da80
use right location of the file is the source and not the target it is shared to
2013-02-12 12:45:54 +01:00
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
3e3cee98c8
- moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
...
Crypt::encKeyfileToMultipleUsers() because this can be reused if files get unshared
- switch from preUnshare hook to postUnshare hook because afterward we can simply get the
updated list of users with access to the file and call Crypt::encKeyfileToMultipleUsers()
2013-02-11 13:28:37 +01:00
2787aafae6
added some TODOs
2013-02-11 12:12:21 +01:00
92f06243be
Implementing sharing support
...
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
f141f8b523
Add further capabilities to /cloud/capabilitites api call
2013-02-10 14:42:23 +01:00
b3e59ca1e3
Work on post_share hook for files_encryption
...
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
1aba986d9f
Fixed bug causing nested file read over webdav to fail
2013-02-09 12:42:18 +00:00
b95bc663af
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
2013-02-09 11:52:11 +00:00
7f58e27495
cleanup - more to come after
2013-02-09 18:01:38 +01:00
954a627483
Added comment
2013-02-06 18:24:35 +00:00
6870add18f
Development snapshot
2013-02-06 15:08:36 +00:00
16a5ace434
Fixed bug causing encrypted files to be doubly encrypted at login
...
Added comments and docblocks
2013-02-06 14:30:40 +00:00
3b9e2f1bab
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-02-05 18:43:55 +00:00
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
680c5b3dad
Removed debugging output
2013-02-05 16:11:50 +00:00
a1f200c1e5
Cleaned up path formatting with new method stripUserFilesPath()
2013-02-05 15:59:28 +00:00
53248a9b60
Recryption of legacy encrypted files now working on login
2013-02-05 15:35:29 +00:00
927d4c98a1
Fixed todos: undefined vars and unreachable code
2013-02-05 13:12:34 +00:00
0677d56ee2
Added debugging output relating to recrypting legacy files
2013-02-01 19:31:15 +00:00
06847f609b
Improved support for detecting and recrypting legacy files. Bugs remain.
2013-01-31 19:40:51 +00:00
c6b3bdd5a0
Fixed compatibility with filecache rewrite merge
2013-01-31 17:51:46 +00:00
2183f77527
Fixed incompatibilities with filecache rewrite merge
2013-01-31 16:49:07 +00:00
c7b1bdf00e
Fixed handling of keyfile subdir creation
...
Improved keyfile subdir deletion (1 bug remains here)
2013-01-30 18:52:02 +00:00
61b23ce6cc
Working on support for deleting directories (removing all keyfiles)
2013-01-30 17:25:17 +00:00
8ded07dd5c
first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review
2013-01-30 17:49:05 +01:00
c1f20fe37a
Made encyrption keyfiles be deleted when their parents are
...
Made encryption keyfiles be renamed when their parents are
Fixed bugs with encryptAll() execution on login
2013-01-29 19:54:40 +00:00
094213e231
Fixed many coding guidelines issues
...
Continued work on upgrade path via login hook listener
New spec file with notes
2013-01-24 18:37:34 +00:00
59ca312263
Work on util: findFiles() and encryptAll(); both close to working
...
Ecnryption unit tests are failing, recursion in filecache{}
2013-01-23 19:24:26 +00:00
d95fc4e1e3
Adding sharing support: added new method in Keymanager setShareKey()
...
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
e9f3c5feea
Added creation of dir for shared file env encryption keys
...
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
3fbf362ba2
Removed debugging comments
2013-01-14 12:36:46 +00:00
fed74eda1c
Removed old and unnecessary comments
2013-01-10 18:48:40 +00:00
2e30641caa
Removed misleading crypto gen comment
2013-01-10 18:19:37 +00:00
015787fbb3
All in-use unit tests now passing after merge
2013-01-06 18:38:35 +00:00
2d98afa1ea
Removed debugging line
2013-01-06 14:06:22 +00:00
b024db9f98
Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly
2013-01-06 13:56:45 +00:00
7fe9245636
Development snapshot
...
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
2013-01-05 17:12:23 +00:00
665261dc9a
Development snapshot, mocking out Session{} for crypt unit tests
2013-01-02 19:29:22 +00:00
063f225a26
Merge branch 'master' into files_encryption
...
Encryption unit tests still failing, needs work
Conflicts:
3rdparty/Archive/Tar.php
3rdparty/MDB2/Driver/Datatype/Common.php
3rdparty/MDB2/Driver/mysql.php
3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
3rdparty/Sabre/CalDAV/Plugin.php
3rdparty/Sabre/CalDAV/Version.php
3rdparty/Sabre/CardDAV/AddressBook.php
3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/Sabre/CardDAV/Version.php
3rdparty/Sabre/DAV/Client.php
3rdparty/Sabre/DAV/Locks/Plugin.php
3rdparty/Sabre/DAV/Server.php
3rdparty/Sabre/DAV/Tree/Filesystem.php
3rdparty/Sabre/DAV/Version.php
3rdparty/Sabre/HTTP/BasicAuth.php
3rdparty/Sabre/HTTP/Version.php
3rdparty/Sabre/VObject/Component/VEvent.php
3rdparty/Sabre/VObject/DateTimeParser.php
3rdparty/Sabre/VObject/RecurrenceIterator.php
3rdparty/Sabre/VObject/Version.php
3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
3rdparty/css/chosen-sprite.png
3rdparty/css/chosen.css
3rdparty/css/chosen/chosen.css
3rdparty/fullcalendar/css/fullcalendar.css
3rdparty/fullcalendar/css/fullcalendar.print.css
3rdparty/fullcalendar/js/fullcalendar.js
3rdparty/fullcalendar/js/fullcalendar.min.js
3rdparty/fullcalendar/js/gcal.js
3rdparty/js/chosen/VERSION
3rdparty/js/chosen/chosen.jquery.js
3rdparty/js/chosen/chosen.jquery.min.js
3rdparty/openid/class.openid.v3.php
3rdparty/openid/phpmyid.php
3rdparty/php-cloudfiles/cloudfiles.php
3rdparty/smb4php/smb.php
3rdparty/timepicker/css/jquery.ui.timepicker.css
3rdparty/timepicker/js/i18n/i18n.html
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
3rdparty/timepicker/js/jquery.ui.timepicker.js
3rdparty/timepicker/releases.txt
README
apps/files/admin.php
apps/files/ajax/autocomplete.php
apps/files/ajax/move.php
apps/files/ajax/newfile.php
apps/files/ajax/scan.php
apps/files/ajax/timezone.php
apps/files/ajax/upload.php
apps/files/appinfo/filesync.php
apps/files/appinfo/update.php
apps/files/css/files.css
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/es_AR.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/lv.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/oc.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/si_LK.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files/l10n/zh_CN.GB2312.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files/templates/part.list.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/appinfo/info.xml
apps/files_encryption/js/settings.js
apps/files_encryption/l10n/fa.php
apps/files_encryption/l10n/sl.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/encryption.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/cs_CZ.php
apps/files_external/l10n/et_EE.php
apps/files_external/l10n/lt_LT.php
apps/files_external/l10n/nl.php
apps/files_external/l10n/ru.php
apps/files_external/l10n/sk_SK.php
apps/files_external/l10n/sl.php
apps/files_external/l10n/vi.php
apps/files_external/lib/config.php
apps/files_external/lib/ftp.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
apps/files_external/tests/ftp.php
apps/files_sharing/appinfo/update.php
apps/files_sharing/css/public.css
apps/files_sharing/js/share.js
apps/files_sharing/l10n/de.php
apps/files_sharing/l10n/et_EE.php
apps/files_sharing/l10n/ja_JP.php
apps/files_sharing/l10n/nb_NO.php
apps/files_sharing/l10n/ru.php
apps/files_sharing/l10n/sl.php
apps/files_sharing/l10n/vi.php
apps/files_sharing/lib/share/file.php
apps/files_sharing/lib/share/folder.php
apps/files_sharing/lib/sharedstorage.php
apps/files_sharing/public.php
apps/files_sharing/templates/public.php
apps/files_versions/l10n/et_EE.php
apps/files_versions/l10n/lt_LT.php
apps/files_versions/l10n/nb_NO.php
apps/files_versions/l10n/nl.php
apps/files_versions/l10n/ru.php
apps/files_versions/l10n/sl.php
apps/files_versions/l10n/vi.php
apps/files_versions/lib/hooks.php
apps/files_versions/lib/versions.php
apps/user_ldap/appinfo/database.xml
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/l10n/da.php
apps/user_ldap/l10n/et_EE.php
apps/user_ldap/l10n/pt_PT.php
apps/user_ldap/l10n/sl.php
apps/user_ldap/l10n/vi.php
apps/user_ldap/l10n/zh_CN.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/tests/group_ldap.php
apps/user_ldap/user_ldap.php
apps/user_webdavauth/appinfo/app.php
apps/user_webdavauth/appinfo/info.xml
apps/user_webdavauth/settings.php
apps/user_webdavauth/templates/settings.php
apps/user_webdavauth/user_webdavauth.php
autotest.sh
core/ajax/appconfig.php
core/ajax/share.php
core/ajax/translations.php
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
core/ajax/vcategories/edit.php
core/css/share.css
core/js/eventsource.js
core/js/js.js
core/js/oc-vcategories.js
core/js/share.js
core/l10n/ar.php
core/l10n/bg_BG.php
core/l10n/ca.php
core/l10n/cs_CZ.php
core/l10n/da.php
core/l10n/de.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/es_AR.php
core/l10n/et_EE.php
core/l10n/eu.php
core/l10n/fa.php
core/l10n/fi_FI.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hi.php
core/l10n/hr.php
core/l10n/hu_HU.php
core/l10n/ia.php
core/l10n/id.php
core/l10n/it.php
core/l10n/ja_JP.php
core/l10n/ko.php
core/l10n/ku_IQ.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/lv.php
core/l10n/mk.php
core/l10n/ms_MY.php
core/l10n/nb_NO.php
core/l10n/nl.php
core/l10n/nn_NO.php
core/l10n/oc.php
core/l10n/pl.php
core/l10n/pt_BR.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/ru_RU.php
core/l10n/si_LK.php
core/l10n/sk_SK.php
core/l10n/sl.php
core/l10n/sr.php
core/l10n/sr@latin.php
core/l10n/sv.php
core/l10n/th_TH.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/vi.php
core/l10n/zh_CN.GB2312.php
core/l10n/zh_CN.php
core/l10n/zh_TW.php
core/lostpassword/index.php
core/lostpassword/resetpassword.php
core/templates/layout.base.php
core/templates/layout.guest.php
core/templates/layout.user.php
cron.php
db_structure.xml
files/webdav.php
index.php
l10n/.tx/config
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_encryption.po
l10n/ar/lib.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/ar_SA/core.po
l10n/ar_SA/files.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/lib.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/lib.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/lib.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/lib.po
l10n/da/settings.po
l10n/da/user_ldap.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_sharing.po
l10n/de/gallery.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/lib.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/lib.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/lib.po
l10n/es_AR/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/et_EE/files_sharing.po
l10n/et_EE/files_versions.po
l10n/et_EE/lib.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/lib.po
l10n/eu/settings.po
l10n/eu_ES/core.po
l10n/eu_ES/files.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_encryption.po
l10n/fa/lib.po
l10n/fa/settings.po
l10n/fi/core.po
l10n/fi/files.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/lib.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/lib.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/lib.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/lib.po
l10n/he/settings.po
l10n/hi/core.po
l10n/hi/files.po
l10n/hi/lib.po
l10n/hi/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/lib.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/lib.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/lib.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_encryption.po
l10n/id/files_external.po
l10n/id/files_sharing.po
l10n/id/files_versions.po
l10n/id/lib.po
l10n/id/settings.po
l10n/id/user_ldap.po
l10n/id_ID/core.po
l10n/id_ID/files.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/lib.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_sharing.po
l10n/ja_JP/lib.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/lib.po
l10n/ko/settings.po
l10n/ku_IQ/core.po
l10n/ku_IQ/files.po
l10n/ku_IQ/lib.po
l10n/ku_IQ/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/lib.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lt_LT/files_versions.po
l10n/lt_LT/lib.po
l10n/lt_LT/settings.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/lib.po
l10n/lv/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/lib.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/lib.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_sharing.po
l10n/nb_NO/files_versions.po
l10n/nb_NO/gallery.po
l10n/nb_NO/lib.po
l10n/nb_NO/settings.po
l10n/nb_NO/user_ldap.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nl/files_versions.po
l10n/nl/gallery.po
l10n/nl/lib.po
l10n/nl/settings.po
l10n/nl/user_ldap.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/lib.po
l10n/nn_NO/settings.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/lib.po
l10n/oc/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/lib.po
l10n/pl/settings.po
l10n/pl_PL/core.po
l10n/pl_PL/files.po
l10n/pl_PL/lib.po
l10n/pl_PL/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/lib.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/lib.po
l10n/pt_PT/settings.po
l10n/pt_PT/user_ldap.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/lib.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/files_sharing.po
l10n/ru/files_versions.po
l10n/ru/gallery.po
l10n/ru/lib.po
l10n/ru/settings.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/ru_RU/lib.po
l10n/ru_RU/settings.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_encryption.po
l10n/si_LK/files_external.po
l10n/si_LK/files_sharing.po
l10n/si_LK/files_versions.po
l10n/si_LK/lib.po
l10n/si_LK/settings.po
l10n/si_LK/user_ldap.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sk_SK/lib.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_ldap.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_encryption.po
l10n/sl/files_external.po
l10n/sl/files_sharing.po
l10n/sl/files_versions.po
l10n/sl/gallery.po
l10n/sl/lib.po
l10n/sl/settings.po
l10n/sl/user_ldap.po
l10n/so/core.po
l10n/so/files.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/lib.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/lib.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/lib.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/lib.po
l10n/ta_LK/settings.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/lib.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_encryption.po
l10n/uk/files_versions.po
l10n/uk/lib.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/vi/files_sharing.po
l10n/vi/files_versions.po
l10n/vi/lib.po
l10n/vi/settings.po
l10n/vi/user_ldap.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/lib.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_CN/gallery.po
l10n/zh_CN/lib.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_ldap.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/lib.po
l10n/zh_TW/settings.po
lib/MDB2/Driver/sqlite3.php
lib/app.php
lib/appconfig.php
lib/archive.php
lib/archive/tar.php
lib/archive/zip.php
lib/base.php
lib/connector/sabre/auth.php
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/eventsource.php
lib/filecache.php
lib/filecache/cached.php
lib/filecache/update.php
lib/filechunking.php
lib/fileproxy.php
lib/fileproxy/fileoperations.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage.php
lib/filestorage/common.php
lib/filestorage/commontest.php
lib/filestorage/local.php
lib/filesystem.php
lib/filesystemview.php
lib/group.php
lib/group/dummy.php
lib/group/example.php
lib/helper.php
lib/image.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/l10n/ca.php
lib/l10n/cs_CZ.php
lib/l10n/da.php
lib/l10n/de.php
lib/l10n/el.php
lib/l10n/eo.php
lib/l10n/es.php
lib/l10n/es_AR.php
lib/l10n/et_EE.php
lib/l10n/eu.php
lib/l10n/fa.php
lib/l10n/fi_FI.php
lib/l10n/fr.php
lib/l10n/gl.php
lib/l10n/he.php
lib/l10n/hu_HU.php
lib/l10n/it.php
lib/l10n/ja_JP.php
lib/l10n/lt_LT.php
lib/l10n/nb_NO.php
lib/l10n/nl.php
lib/l10n/oc.php
lib/l10n/pl.php
lib/l10n/pt_BR.php
lib/l10n/pt_PT.php
lib/l10n/ro.php
lib/l10n/ru.php
lib/l10n/ru_RU.php
lib/l10n/sk_SK.php
lib/l10n/sl.php
lib/l10n/sv.php
lib/l10n/th_TH.php
lib/l10n/uk.php
lib/l10n/vi.php
lib/l10n/zh_CN.GB2312.php
lib/l10n/zh_CN.php
lib/l10n/zh_TW.php
lib/log.php
lib/log/owncloud.php
lib/mail.php
lib/migrate.php
lib/migration/content.php
lib/minimizer.php
lib/ocs.php
lib/ocsclient.php
lib/preferences.php
lib/public/backgroundjob.php
lib/public/db.php
lib/public/share.php
lib/public/util.php
lib/request.php
lib/search.php
lib/search/provider/file.php
lib/search/result.php
lib/setup.php
lib/streamwrappers.php
lib/template.php
lib/templatelayout.php
lib/updater.php
lib/user.php
lib/user/database.php
lib/user/http.php
lib/util.php
lib/vcategories.php
lib/vobject.php
public.php
remote.php
search/ajax/search.php
settings/admin.php
settings/ajax/apps/ocs.php
settings/ajax/changepassword.php
settings/ajax/creategroup.php
settings/ajax/createuser.php
settings/ajax/disableapp.php
settings/ajax/enableapp.php
settings/ajax/getlog.php
settings/ajax/lostpassword.php
settings/ajax/openid.php
settings/ajax/removegroup.php
settings/ajax/removeuser.php
settings/ajax/setlanguage.php
settings/ajax/setloglevel.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/ajax/togglesubadmins.php
settings/ajax/userlist.php
settings/apps.php
settings/css/settings.css
settings/help.php
settings/js/apps.js
settings/js/users.js
settings/l10n/ar.php
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/es_AR.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/id.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lb.php
settings/l10n/lt_LT.php
settings/l10n/lv.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/oc.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ro.php
settings/l10n/ru.php
settings/l10n/ru_RU.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/sr@latin.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.GB2312.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/personal.php
settings/settings.php
settings/templates/admin.php
settings/templates/apps.php
settings/templates/help.php
settings/templates/personal.php
settings/templates/users.php
settings/trans.png
settings/users.php
tests/bootstrap.php
tests/data/db_structure.xml
tests/lib/archive.php
tests/lib/cache.php
tests/lib/cache/apc.php
tests/lib/cache/xcache.php
tests/lib/db.php
tests/lib/filesystem.php
tests/lib/geo.php
tests/lib/share/share.php
tests/lib/streamwrappers.php
tests/lib/util.php
tests/phpunit.xml
2012-12-12 17:39:43 +00:00
398b52e4f0
Improved formatting of getPublicKeys()
2012-12-11 17:24:25 +00:00
453fd66c70
Changing user login pwd now correctly changes encryption key passphrase
...
All crypt unit tests are now passing
2012-12-11 17:12:46 +00:00
1fc5b1d02d
Replaced phpseclib calls with symmetric re-encryption of user private key
2012-12-11 15:15:30 +00:00
a00dd2d5d6
Revert "Revert "Development snapshot""
...
This reverts commit b66d38ecae
2012-12-11 15:10:56 +00:00
b66d38ecae
Revert "Development snapshot"
...
This reverts commit c56fb905d1
2012-12-11 15:10:39 +00:00
aabef796a0
Added library phpseclib
...
First implementation of passphrase changing on user pwd change
2012-12-11 13:22:46 +00:00
c56fb905d1
Development snapshot
...
Read/write interoperability working through web UI and WebDAV
New class Session for handling session data
A few new unit tests
Some additional unit tests are now failing, esp. legacy enc related ones
2012-12-05 18:57:44 +00:00
bc3550b37b
Development Snapshot
...
Opening short files via webdav, that were saved via webdav, now works
2012-12-04 19:53:13 +00:00
bfd47cd2df
Development snapshot
...
Moved legacy crypto methods from Util into Crypt
Added preliminary support for reading legacy encrypted files
Added some unit tests
2012-11-28 18:39:19 +00:00
a465b3cb63
Development snapshot
2012-11-22 20:19:03 +00:00
5f78f9d642
Development snapshot
2012-11-22 19:36:48 +00:00
13d93fb416
Development snapshot
2012-11-22 14:08:19 +00:00
5328aae8a8
Added unit tests for legacy encryption methods
...
Improvements to documentation
2012-11-20 19:10:10 +00:00
637891b771
Development snapshot, lots of fixes
...
Web UI based encryption working
Crypt and Util unit tests passing
2012-11-16 18:31:37 +00:00
b5c0e4042e
Fixing use of splitIv
...
Fixed unit tests for splitIv
2012-11-15 13:01:05 +00:00
886fb188cd
Improved documentation
...
Implemented exceptions
Added method for splitting catfiles
2012-11-15 11:54:16 +00:00
459a7622dc
Added check if sharing app is enabled, commented out sharing code due to issue
2012-11-15 11:54:16 +00:00
dd987a8bd1
Added minor documentation
2012-11-14 13:58:57 +00:00
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
561cbb2de6
NoSpaceAfterComma II
2012-10-23 23:01:10 +02:00
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
265f3654af
all unit files_encryption crypt unit tests now passing after merge
2012-10-17 16:35:19 +01:00
06ea9c18f8
Development snapshot
...
Stream reading and writing of small and large files working, using write cache
2012-10-16 15:02:51 +01:00
4da67b0a08
Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests
2012-10-10 18:40:59 +01:00
ed980674a6
Development snapshot
2012-09-11 13:40:45 +01:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
e3ac15bad3
development snapshot
2012-08-23 19:19:39 +01:00
32ee3de918
Extensive work on crypto stream wrapper implementation
2012-08-23 16:43:10 +01:00
293a0f4d32
Started rewrite of cryptstream class (renamed to stream)
...
Added unit tests
Fixed decryption of user private key at login
Added functionality to keymanager
2012-08-16 19:18:18 +01:00
f11f524dfa
working on streaming decrypted content
...
applied some dependency injection to keymanager.php
2012-08-15 18:49:53 +01:00
d039f11905
provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together
2012-08-15 13:18:11 +02:00
92ec88c7bc
move chane password code from keymanager.php to crypt.php
2012-08-15 09:54:21 +02:00
6ce315fe58
added wrapper method in crypt class for encrypting asymmetric and symmetric simultaneously
...
fixed bugs with keymanager integration
added unit tests
2012-08-14 19:06:56 +01:00
34f93ac765
check if user has write access to a given file before updating the filekey
2012-08-13 11:31:15 +02:00
e4450d1035
execute file hooks only if server side encryption is enabled
2012-08-10 12:27:09 +02:00
12628be38b
only call proxies for server side encryption
2012-08-10 11:44:38 +02:00
368ade6b2f
code cleanup
2012-08-09 17:25:57 +02:00
bd7d566733
change private key passphrase; disable file proxy for keymanager operations
2012-08-09 15:45:34 +02:00
a969c23e59
disable admin choice of encryption mode once a decision was taken
2012-08-09 14:25:09 +02:00
800942ece7
change key password when user switches from client to server side encryption.
...
make use of the keymanager class in changekeypasscode()
2012-08-09 13:47:27 +02:00
5a261b5b8f
ask user for passwords when switching from client to server side encryption
2012-08-09 12:19:51 +02:00
dc596a72c3
remove function which is no longer needed
2012-08-08 14:20:29 +02:00
d4974b6d4a
set default dependencies in keymanager.php
...
fix calls in ocs.php
2012-08-08 14:15:35 +02:00
5bb3ea9740
define default properties in keymanager.php
2012-08-08 12:13:14 +02:00
773d7b119d
OCS api calls cleanup
2012-08-03 13:52:41 +02:00
d5808f07ca
return a list of all public keys for a given file
2012-08-03 11:49:55 +02:00
6b058cd359
allow user to choose encryption mode
2012-08-02 10:40:32 +02:00
c4d1ad1b7d
Made dependencies of Kaymanager::setFileKey() explicit using dependency injection
2012-08-01 14:11:41 +01:00
82f5f73dff
Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption
...
Conflicts:
apps/files_encryption/lib/crypt.php
2012-07-31 19:38:28 +01:00
84fd62b130
Implemented writing of keyfiles and directory hierarchy in proxy class
...
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
2012-07-31 19:35:36 +01:00
eebf76d344
Implemented writing of keyfiles and directory hierarchy in proxy class
...
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
2012-07-31 19:28:11 +01:00
f6863f9e51
get encryption mode from the settings
2012-07-31 16:52:21 +02:00
ee15c40b14
comment added
2012-07-30 12:43:17 +02:00
23391b3694
get/set key files, take shared files into account
2012-07-30 12:38:38 +02:00
f752a27605
write keyfiles to server
2012-07-27 14:00:41 +02:00
bb229f7291
write private/public key from the client to the server
2012-07-26 17:19:55 +02:00
e5c84488ff
Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption
...
Conflicts:
apps/files_encryption/lib/keymanager.php
2012-07-26 14:06:39 +02:00
bdb406916c
fixed path for filesystem view
2012-07-26 13:49:22 +02:00
3ab4ddd1da
function to ask for the encryption mode (server side or client side).
...
Needs to be implemented and integrated into the settings.
2012-07-26 13:47:43 +02:00
9f51841c57
Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs
2012-07-25 18:28:56 +01:00
adf5c953dd
Fixed use of OCFSV in getPrivateKey()
2012-07-25 16:56:52 +01:00
e6de086fb6
Fixed various bugs in hooks class
...
Fixed documentation syntax in keymanager
2012-07-25 16:51:48 +01:00
66b461629b
Started implementation of new encyryption classes into the encryption proxy
2012-07-25 16:26:03 +01:00
6d1ed388c0
keymanager class for basic operations to store and retrieve keys
2012-07-25 17:01:11 +02:00
d766ca8b19
Changed util class methods to use / create public keys in single shared public-keys directory, and group encryption-related user files
2012-07-25 15:33:25 +01:00
9368ea73c8
added tests and methods relating to handling of legacy keys
2012-07-25 12:38:40 +01:00
9216289856
Wrote new methods for testing if a file is encrypted using AES or Blowfish
...
Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type
2012-07-24 17:57:20 +01:00
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
d294e77721
Development snapshot:
...
- Added methods for sealing data with multiple keys
- Added method for encrypting data, generating iv and keyfile, and returning both
- Added 6 unit test cases (containing 12 tests) for Crypt class
- Commented out old unit tests for now
2012-07-18 18:52:00 +01:00
283561823f
Added methods for handling encrypted file + iv content
...
Improved IV generation
2012-07-17 19:15:59 +01:00
6af99f3a09
Development snapshot:
...
Rewrote crtpt class as Util, Hooks, and Crypt
Switched blowfish for openssl with AES
Added setup() method for creating user keys and directory structure
Many other changes complete and in progress
2012-07-11 17:51:27 +01:00
6707e4187e
only use 1 fsview when initializing encryption
2012-06-21 18:35:12 +02:00
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
debd9c8dfb
fix problem with encryption flag not being saved correctly in the filecache
2012-06-18 18:18:10 +02:00
195c37f88a
fix for encryption binary files
2012-06-16 01:31:03 +02:00
03951ccc6b
fix encryption proxy for updated filecache
2012-06-15 23:11:55 +02:00
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
e93bb5135d
Applied fix from kalassico for "Chiper text must be a string" bug ( http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094 )
2012-05-31 12:25:07 +01:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
70cb053e6b
improve cryptstream fro writing non-chunksized data
2012-05-05 16:49:48 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
b39c3d4c4e
make use of the fact that stream_read will always read 8192 bytes for encryption stream
...
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
5b03de9a66
fix comments in crypt lib
2012-03-21 17:43:09 +01:00
01fcc080bb
dont set the encryption flag for existing non-encrypted files
2012-02-26 15:56:47 +01:00
ff0a542e48
always set encrypted flag when overwriting a file we should encrypt
2012-02-26 15:32:45 +01:00
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
6a8364c3ff
rework the way file_put_contents is handeled
2012-02-21 20:48:48 +01:00
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
e2b4954176
simple file encryption wip
2012-02-21 20:48:48 +01:00
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
Florin Peter
Björn Schießle
Björn Schießle
Sam Tuke
Sam Tuke
Florin Peter
Tom Needham
Bart Visscher
Thomas Müller
Felix Moeller
Robin Appelman
Frank Karlitschek
Jan-Christoph Borchardt
Georg Ehrke
Robin Appelman