Commit graph

5321 commits

Author SHA1 Message Date
Sam Tuke
fdf0f6ce61 Added namespace 2012-11-14 16:39:35 +00:00
Sam Tuke
dd987a8bd1 Added minor documentation 2012-11-14 13:58:57 +00:00
Sam Tuke
265f3654af all unit files_encryption crypt unit tests now passing after merge 2012-10-17 16:35:19 +01:00
Sam Tuke
8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Sam Tuke
06ea9c18f8 Development snapshot
Stream reading and writing of small and large files working, using write cache
2012-10-16 15:02:51 +01:00
Sam Tuke
4da67b0a08 Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests 2012-10-10 18:40:59 +01:00
Sam Tuke
ed980674a6 Development snapshot 2012-09-11 13:40:45 +01:00
Bjoern Schiessle
2e796b563f urldecode private- and public-key 2012-08-27 17:51:02 +02:00
Sam Tuke
e3ac15bad3 development snapshot 2012-08-23 19:19:39 +01:00
Sam Tuke
32ee3de918 Extensive work on crypto stream wrapper implementation 2012-08-23 16:43:10 +01:00
Sam Tuke
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
Sam Tuke
f11f524dfa working on streaming decrypted content
applied some dependency injection to keymanager.php
2012-08-15 18:49:53 +01:00
Sam Tuke
b883bb6b42 Converted test to PHPUnit format 2012-08-15 14:52:03 +01:00
Sam Tuke
d725d07219 added two (currently passing) unit tests 2012-08-15 14:13:03 +01:00
Sam Tuke
ea236e83d7 added first version of keymanager PHPUnit test files 2012-08-15 14:01:43 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
92ec88c7bc move chane password code from keymanager.php to crypt.php 2012-08-15 09:54:21 +02:00
Sam Tuke
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
Bjoern Schiessle
b1f6bb36b0 write error to OC_Log 2012-08-13 13:29:22 +02:00
Bjoern Schiessle
34f93ac765 check if user has write access to a given file before updating the filekey 2012-08-13 11:31:15 +02:00
Bjoern Schiessle
3ec6dc56c9 ToDo item removed 2012-08-10 12:37:04 +02:00
Bjoern Schiessle
e4450d1035 execute file hooks only if server side encryption is enabled 2012-08-10 12:27:09 +02:00
Bjoern Schiessle
12628be38b only call proxies for server side encryption 2012-08-10 11:44:38 +02:00
Bjoern Schiessle
7e3f5492cc typo fixed 2012-08-09 17:56:43 +02:00
Bjoern Schiessle
368ade6b2f code cleanup 2012-08-09 17:25:57 +02:00
Bjoern Schiessle
bd7d566733 change private key passphrase; disable file proxy for keymanager operations 2012-08-09 15:45:34 +02:00
Bjoern Schiessle
a969c23e59 disable admin choice of encryption mode once a decision was taken 2012-08-09 14:25:09 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
5a261b5b8f ask user for passwords when switching from client to server side encryption 2012-08-09 12:19:51 +02:00
Bjoern Schiessle
a7cbc9e713 lock system wide encryption settings once the admin took a decision 2012-08-08 18:27:12 +02:00
Bjoern Schiessle
5983643abd fix setFileKey() call in updateKeyfile hook 2012-08-08 15:32:05 +02:00
Bjoern Schiessle
dc596a72c3 remove function which is no longer needed 2012-08-08 14:20:29 +02:00
Bjoern Schiessle
d4974b6d4a set default dependencies in keymanager.php
fix calls in ocs.php
2012-08-08 14:15:35 +02:00
Bjoern Schiessle
5bb3ea9740 define default properties in keymanager.php 2012-08-08 12:13:14 +02:00
Bjoern Schiessle
773d7b119d OCS api calls cleanup 2012-08-03 13:52:41 +02:00
Bjoern Schiessle
a0b2474019 code cleanup and TODOs added 2012-08-03 12:21:49 +02:00
Bjoern Schiessle
bed05f0302 only force re-login if server-side encryption is enabled 2012-08-03 11:59:32 +02:00
Bjoern Schiessle
d5808f07ca return a list of all public keys for a given file 2012-08-03 11:49:55 +02:00
Bjoern Schiessle
19b3109655 code cleanup 2012-08-02 13:55:23 +02:00
Bjoern Schiessle
5996ea735a remove debug output 2012-08-02 10:59:06 +02:00
Bjoern Schiessle
6b058cd359 allow user to choose encryption mode 2012-08-02 10:40:32 +02:00
Sam Tuke
c4d1ad1b7d Made dependencies of Kaymanager::setFileKey() explicit using dependency injection 2012-08-01 14:11:41 +01:00
Bjoern Schiessle
a7f3a67bc2 get settings from DB and check the right checkbox in the settings 2012-08-01 10:37:21 +02:00
Sam Tuke
82f5f73dff Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption
Conflicts:
	apps/files_encryption/lib/crypt.php
2012-07-31 19:38:28 +01:00
Sam Tuke
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
Sam Tuke
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
Bjoern Schiessle
f6863f9e51 get encryption mode from the settings 2012-07-31 16:52:21 +02:00
Bjoern Schiessle
e4e6574e42 allow admin to choose between client and server side encryption 2012-07-31 16:37:37 +02:00
Bjoern Schiessle
9bab06537c update file encryption key over webdav properties for client side encryption 2012-07-31 15:03:28 +02:00
Bjoern Schiessle
ee15c40b14 comment added 2012-07-30 12:43:17 +02:00