Bjoern Schiessle
|
7aeb0068be
|
also write error message to the log
|
2013-08-08 08:38:52 +02:00 |
Bjoern Schiessle
|
cfbdad9cdb
|
catch broken server config and disable encryption app.
|
2013-08-08 08:38:37 +02:00 |
Björn Schießle
|
87063918f2
|
remove wrong closing bracket
|
2013-07-05 16:05:05 +02:00 |
Björn Schießle
|
9575c2f37c
|
added helper function to escape glob pattern
Conflicts:
apps/files_encryption/lib/helper.php
|
2013-07-05 16:03:20 +02:00 |
Björn Schießle
|
15cb8e4efd
|
only check for external mount points if the external storage app is enabled
|
2013-07-05 16:00:34 +02:00 |
Björn Schießle
|
f9c337dd21
|
only escape glob pattern
|
2013-07-05 16:00:17 +02:00 |
Björn Schießle
|
93730a090b
|
del share keys from correct location
|
2013-07-05 16:00:08 +02:00 |
Björn Schießle
|
af2cd6f541
|
always return normalized path
|
2013-07-05 15:59:57 +02:00 |
Björn Schießle
|
3043dbfb95
|
delete file keys from the correct location
|
2013-07-05 15:59:46 +02:00 |
Björn Schießle
|
eb2587a08f
|
move isSystemWideMountPoint() to util.php
|
2013-07-05 15:59:29 +02:00 |
Björn Schießle
|
f2de4cb342
|
some performance improvements, check for system wide mounts only once while writing share keys
|
2013-07-05 15:59:19 +02:00 |
Björn Schießle
|
2e56f0e2f8
|
fix path to OC_Mount_Config
|
2013-07-05 15:59:06 +02:00 |
Björn Schießle
|
3e4dcafa89
|
handle system wide mount points
|
2013-07-05 15:58:55 +02:00 |
VicDeo
|
f67fc78531
|
Merge pull request #3899 from owncloud/encryption_check_php_version
check php version, the encryption app needs php >= 5.3.3
|
2013-07-04 06:53:17 -07:00 |
Björn Schießle
|
4c1820a2a1
|
Merge pull request #3858 from owncloud/more_ssl_error_messages
add openssl_error_string() output to the owncloud.log
|
2013-07-02 07:58:22 -07:00 |
Björn Schießle
|
4d4484fac1
|
Merge pull request #3870 from owncloud/reset_migration_status
introduce pre-disable-app hook and first usage in files_encryption
|
2013-07-02 07:26:48 -07:00 |
Thomas Müller
|
a7f2563990
|
typo
|
2013-07-01 21:12:21 +02:00 |
Björn Schießle
|
d5c4854708
|
cast result to bool
|
2013-07-01 17:18:16 +02:00 |
Björn Schießle
|
16a719173f
|
add correct php version
|
2013-07-01 12:23:26 +02:00 |
Björn Schießle
|
adcee5b695
|
check php version, the encryption app needs php >= 5.3.3
|
2013-07-01 12:16:36 +02:00 |
Björn Schießle
|
2e6ebe1ab4
|
fix function documentation
|
2013-06-27 14:14:25 +02:00 |
Björn Schießle
|
c4aef89278
|
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
|
2013-06-27 14:09:22 +02:00 |
Björn Schießle
|
5a20c8b66f
|
add openssl_error_string() output to the owncloud.log
|
2013-06-26 15:51:22 +02:00 |
Jörn Friedrich Dreyer
|
c79f7f4f3c
|
fix numRows usage in files_encryption
|
2013-06-24 16:29:59 +02:00 |
Björn Schießle
|
fe61230cc1
|
always have a defined return value
|
2013-06-19 16:55:31 +02:00 |
Björn Schießle
|
e2e370f199
|
some more error messages
|
2013-06-19 15:58:34 +02:00 |
Björn Schießle
|
83d98e2d8b
|
add some more error messages, in case something went wrong
|
2013-06-19 15:52:33 +02:00 |
Florin Peter
|
8566881758
|
fix for path_hash not unique as reported at #3641
|
2013-06-13 20:52:34 +02:00 |
Florin Peter
|
35da408222
|
fix memory problems as reported at #3620
|
2013-06-13 20:51:22 +02:00 |
Björn Schießle
|
7cfb0dc406
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
|
2013-06-13 13:17:35 +02:00 |
Björn Schießle
|
bc2862fcb9
|
Merge branch 'master' into files_encryption_upgrade_fix
|
2013-06-13 12:53:29 +02:00 |
Björn Schießle
|
77944cf7b8
|
fix typo in var name
|
2013-06-13 10:11:23 +02:00 |
Björn Schießle
|
27fcdb3af5
|
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/tests/crypt.php
|
2013-06-12 20:53:45 +02:00 |
Björn Schießle
|
c78a90fd54
|
use number of manipulated rows as idicator if it was possible to enter the migration mode
|
2013-06-12 12:21:11 +02:00 |
Björn Schießle
|
20ddd6e1c7
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
|
2013-06-11 15:19:02 +02:00 |
Björn Schießle
|
3ec6b19cdf
|
use constants for different migration status
|
2013-06-11 13:07:39 +02:00 |
Björn Schießle
|
5fafd55108
|
make sure that only one process can enter the migration mode
|
2013-06-11 12:03:50 +02:00 |
Morris Jobke
|
1da112750e
|
Merge pull request #3647 from owncloud/missing_backticks
add missing backticks all over the place
|
2013-06-10 05:15:07 -07:00 |
Björn Schießle
|
13017ce9e1
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
|
2013-06-10 12:12:07 +02:00 |
Jörn Friedrich Dreyer
|
124f34422c
|
add missing backticks all over the place
|
2013-06-10 09:53:29 +02:00 |
Björn Schießle
|
d7a9852f7b
|
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
|
2013-06-06 13:32:02 +02:00 |
Florin Peter
|
14ac4fab05
|
better handling for http post
|
2013-06-04 00:41:47 +02:00 |
Florin Peter
|
ef97481a0d
|
changed redirect handling
|
2013-06-03 23:41:57 +02:00 |
Florin Peter
|
dc8bcf0688
|
reformat code
|
2013-06-03 18:42:13 +02:00 |
Björn Schießle
|
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 |
Florin Peter
|
46e5e9bd73
|
cleanup unused method legacyKeyRecryptKeyfile
|
2013-05-31 22:49:32 +02:00 |
Florin Peter
|
a134ffcf2c
|
code optimized and cleaned up unused vars
|
2013-05-31 16:52:33 +02:00 |
Florin Peter
|
e9d1ea712c
|
allow the user to login but do not allow upload and show error message on the web
|
2013-05-31 15:57:18 +02:00 |
Florin Peter
|
2e3bfdb12c
|
check if the decrypted private key is valid on login and on read/write files
|
2013-05-31 13:58:58 +02:00 |
Florin Peter
|
1bfe975938
|
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-31 12:58:12 +02:00 |