e4e6574e42
allow admin to choose between client and server side encryption
2012-07-31 16:37:37 +02:00
9bab06537c
update file encryption key over webdav properties for client side encryption
2012-07-31 15:03:28 +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
931c4695a6
run setup routine only for server side encryption
2012-07-27 13:58:58 +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
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
91da4b05b7
fixed typos
2012-07-10 15:51:57 +01:00
9d2cbc88f0
Revert reversion of f5c329af98 :-P
2012-07-10 01:24:40 +02:00
34ac2ea1ba
Don't escape assigned values.
2012-07-10 01:24:40 +02:00
861c379255
Make sure the proper DOM is loaded and the right address book gets expanded.
2012-07-10 01:24:40 +02:00
0744e5a172
Look for the right field :-P
2012-07-10 01:24:40 +02:00
7cb74a0bf3
Reduce variables assigned.
2012-07-10 01:24:40 +02:00
50462903d6
Revert "Delay fetching of carddata and set ETag and size instead."
...
This reverts commit f5c329af98
2012-07-10 01:24:40 +02:00
b97eb3a48f
fixing oc-1198
2012-07-09 23:50:26 +02:00
43f00a2dc8
create uploads directory for ssl certificates if it didn't exists
2012-07-09 18:11:29 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
b67199bb45
add css id attribute, minor fixes
2012-07-09 16:04:46 +02:00
6f408c3651
add supersized slideshow
2012-07-09 15:13:23 +02:00
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
32b476d6ec
remove comments around code block
2012-07-09 10:19:19 +02:00
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
f5c329af98
Delay fetching of carddata and set ETag and size instead.
2012-07-09 01:48:42 +02:00
47aaca49a1
Rescan categories in small batches to reduce memory usage.
2012-07-09 00:16:14 +02:00
d1cf787197
Move code to OC_Contacts_App::scanCategories().
2012-07-09 00:15:37 +02:00
6d123e90f3
Remove deleted address book from list.
2012-07-08 23:38:03 +02:00
0b6cd8d203
Simplify VCF generation.
2012-07-08 23:36:52 +02:00
dc8193fccb
Make it possible to import files using CR as eol.
2012-07-08 18:28:55 +02:00
334257d2b6
Implemented VCFExportPlugin.
2012-07-08 17:52:57 +02:00
3424785db0
Implemented Sabre iCalendar Export Plugin.
2012-07-08 16:58:17 +02:00
f5c620006e
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
2012-07-08 16:15:52 +02:00
97106f198f
Set the loading class on the property being changed, not on its container.
2012-07-08 16:11:45 +02:00
e6a60198e4
Return error messages in correct format.
2012-07-08 14:11:48 +02:00
2b22f0db0a
Add missing requesttoken.
2012-07-08 13:28:12 +02:00
ea70ca3ce3
CSRF checks
2012-07-07 16:12:21 +02:00
2c318f45f4
CSRF checks
2012-07-07 16:08:27 +02:00
04a0755fd3
CSRF checks
2012-07-07 16:03:21 +02:00
b7c510a61a
CSRF checks
2012-07-07 16:02:33 +02:00
0abcf0a421
CSRF checks
2012-07-07 15:58:11 +02:00
c63db28eaf
CSRF check
2012-07-07 15:54:52 +02:00
b967530795
increase the time limit again to a sensible granularity of 1 min.
...
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
ca26bcc581
close file after write process
2012-07-06 17:09:20 +02:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
75d01b065d
Make export batch size configurable.
2012-07-06 13:49:04 +02:00
cafbd02337
Fix endless loop when no addressbooks.
2012-07-06 13:24:56 +02:00
a1872412bf
Correct hack ;)
2012-07-06 12:59:07 +02:00
ab1b4f1f03
Fugly fixed include.
2012-07-06 12:59:07 +02:00
963faf6458
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
2012-07-06 12:35:29 +02:00
8353517969
use OC_Connector_Sabre_Client
2012-07-06 12:24:03 +02:00
a5a1d929ca
No need for being protected.
2012-07-06 03:22:42 +02:00
59b38e668d
Missing requesttoken
2012-07-06 03:22:42 +02:00
5e0b80dc8d
Contacts: Fix copy&paste error
2012-07-05 17:12:52 +02:00
51774cca6b
use OC_Filesystem for rollback
2012-07-05 14:20:40 +02:00
378fa2bc86
check if caview really exists
2012-07-05 12:17:33 +02:00
55cde0e5aa
moved remove and rename hook to libs/hooks.php
2012-07-05 11:35:08 +02:00
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
f86ecb3bf7
send ca cert path to sabredav client
2012-07-05 11:28:32 +02:00
9d00f4d2fb
Correct db default value.
2012-07-05 00:40:11 +02:00
dac2c14ae9
Add missing CSRF check.
2012-07-05 00:37:08 +02:00
5d79444852
Missing update script.
2012-07-04 22:58:31 +02:00
706a13544b
Remove ugly activation hack.
2012-07-04 22:13:36 +02:00
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
b2eac08ad3
Query contacts in batches of 20. Possible fix for oc-1126.
2012-07-04 16:54:00 +02:00
6d3afb3857
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:57:07 +02:00
393eefa5d2
replace some direct links with OC.imagePath
2012-07-03 23:44:47 +02:00
b1c9785eb3
Merge branch 'master' of gitorious.org:owncloud/owncloud
...
Conflicts:
apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
a775deaf22
Moved hooks and versions.php into new lib directory
...
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
ca2b1f7863
fix encoding fail in calendar app - bugfix for oc-1194
2012-07-03 13:55:48 +02:00
88cbbc86b8
Text editor: Always use UTF-8 to keep Ace happy.
2012-07-02 19:06:40 +00:00
0a6f7b33c3
LDAP: make it UTF-8 save
2012-07-02 20:31:19 +02:00
ab036d4764
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
2012-07-02 17:52:51 +02:00
515adceace
LDAP: reset resource on failed bind
...
check for resource
2012-07-02 14:03:29 +02:00
eca2e073f8
Don't reload the page after sending private link to email address
2012-07-01 11:54:32 -04:00
c7a4075aaa
Updates contacts migration provider
2012-06-30 22:56:47 +00:00
fa5b31ac9c
fix documentation style
2012-06-30 17:09:20 +02:00
8e0addebc3
fix some doc
2012-06-30 15:39:20 +02:00
34b2486d53
some improvements for calendar export
2012-06-30 15:23:21 +02:00
51173163ce
Contacts: align the bottom control buttons
2012-06-30 11:22:09 +00:00
704a1c655e
Contacts: fix add contact icon path
2012-06-30 11:07:54 +00:00
6e6f90a8a2
fix merge conflicts
2012-06-30 12:44:51 +02:00
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
252453cd34
fix encryption test cases when not logged in
2012-06-30 01:05:18 +02:00
a4614f83ff
Don't add duplicate contacts in the list when en-/disable an address book.
2012-06-29 23:18:47 +02:00
Bjoern Schiessle
Sam Tuke
Thomas Tanghus
Thomas Mueller
Jörn Friedrich Dreyer
jfd
Lukas Reschke
Frank Karlitschek
Bart Visscher
Georg Ehrke
Tom Needham
Arthur Schiwon
Michael Gapczynski
Robin Appelman