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

2822 commits

Author SHA1 Message Date
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
Bjoern Schiessle
23391b3694 get/set key files, take shared files into account 2012-07-30 12:38:38 +02:00
Bjoern Schiessle
f752a27605 write keyfiles to server 2012-07-27 14:00:41 +02:00
Bjoern Schiessle
931c4695a6 run setup routine only for server side encryption 2012-07-27 13:58:58 +02:00
Bjoern Schiessle
bb229f7291 write private/public key from the client to the server 2012-07-26 17:19:55 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
bdb406916c fixed path for filesystem view 2012-07-26 13:49:22 +02:00
Bjoern Schiessle
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
Sam Tuke
9f51841c57 Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs 2012-07-25 18:28:56 +01:00
Sam Tuke
adf5c953dd Fixed use of OCFSV in getPrivateKey() 2012-07-25 16:56:52 +01:00
Sam Tuke
e6de086fb6 Fixed various bugs in hooks class 
Fixed documentation syntax in keymanager
 2012-07-25 16:51:48 +01:00
Sam Tuke
66b461629b Started implementation of new encyryption classes into the encryption proxy 2012-07-25 16:26:03 +01:00
Bjoern Schiessle
6d1ed388c0 keymanager class for basic operations to store and retrieve keys 2012-07-25 17:01:11 +02:00
Sam Tuke
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
Sam Tuke
9368ea73c8 added tests and methods relating to handling of legacy keys 2012-07-25 12:38:40 +01:00
Sam Tuke
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
Sam Tuke
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
Sam Tuke
283561823f Added methods for handling encrypted file + iv content 
Improved IV generation
 2012-07-17 19:15:59 +01:00
Sam Tuke
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
Sam Tuke
91da4b05b7 fixed typos 2012-07-10 15:51:57 +01:00
Thomas Tanghus
9d2cbc88f0 Revert reversion of f5c329af98 :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus
34ac2ea1ba Don't escape assigned values. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
861c379255 Make sure the proper DOM is loaded and the right address book gets expanded. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
0744e5a172 Look for the right field :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus
7cb74a0bf3 Reduce variables assigned. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
50462903d6 Revert "Delay fetching of carddata and set ETag and size instead." 
This reverts commit f5c329af98.
 2012-07-10 01:24:40 +02:00
Thomas Mueller
b97eb3a48f fixing oc-1198 2012-07-09 23:50:26 +02:00
Bjoern Schiessle
43f00a2dc8 create uploads directory for ssl certificates if it didn't exists 2012-07-09 18:11:29 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
jfd
b67199bb45 add css id attribute, minor fixes 2012-07-09 16:04:46 +02:00
Jörn Friedrich Dreyer
6f408c3651 add supersized slideshow 2012-07-09 15:13:23 +02:00
Bjoern Schiessle
77f07c672e remove hard coded path 2012-07-09 12:49:04 +02:00
Bjoern Schiessle
6bf1473f0e replace urlencoded slash 2012-07-09 11:58:16 +02:00
Bjoern Schiessle
32b476d6ec remove comments around code block 2012-07-09 10:19:19 +02:00
Bjoern Schiessle
7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Thomas Tanghus
f5c329af98 Delay fetching of carddata and set ETag and size instead. 2012-07-09 01:48:42 +02:00
Thomas Tanghus
47aaca49a1 Rescan categories in small batches to reduce memory usage. 2012-07-09 00:16:14 +02:00
Thomas Tanghus
d1cf787197 Move code to OC_Contacts_App::scanCategories(). 2012-07-09 00:15:37 +02:00
Thomas Tanghus
6d123e90f3 Remove deleted address book from list. 2012-07-08 23:38:03 +02:00