dc8bcf0688
reformat code
2013-06-03 18:42:13 +02:00
471d2b732c
introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
2013-06-03 14:19:31 +02:00
c398fc59ad
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
2013-05-29 09:21:00 +02:00
4b4b447e2a
fixed missing convert to new session handler
2013-05-28 17:06:37 +02:00
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
09b54ccb2b
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
2013-05-28 11:00:49 +02:00
6f9e425939
fix for losing private key while being logged in and accessing a public link
2013-05-28 09:27:04 +02:00
9c99048429
fix syntax error
2013-05-28 01:31:26 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +02:00
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
a9ebf2aabe
fix public link share if a user is logged in
2013-05-23 20:30:07 +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
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +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
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
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
c3a284569b
make sure that public-keys dir exists
2013-04-10 16:46:02 +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
8c35bbcba7
remove debug output, fix typo in file names
2013-02-14 16:33:57 +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
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
06847f609b
Improved support for detecting and recrypting legacy files. Bugs remain.
2013-01-31 19:40:51 +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
665261dc9a
Development snapshot, mocking out Session{} for crypt unit tests
2013-01-02 19:29:22 +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
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
Florin Peter
Björn Schießle
Robin Appelman
Sam Tuke