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

147 commits

Author SHA1 Message Date
Bjoern Schiessle
fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Bjoern Schiessle
bab63c22ee encryption error messages, distinguish between a re-enabled encryption app and a password change from outside 2013-09-02 11:26:11 +02:00
Bjoern Schiessle
d7dca966a2 improved error messaging, initial commit 2013-08-30 10:17:50 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Björn Schießle
d3e2f31ada Merge pull request #4352 from owncloud/encryption_clean_up 
crypt.php clean up
 2013-08-17 04:10:15 -07:00
Bjoern Schiessle
5ba8d38b7f remove old comments, TODos, etc. 2013-08-09 15:55:17 +02:00
Bjoern Schiessle
7ce03ba37c improved error message to refect openSSL PHP extension and stock openSSL configuration issues 2013-08-08 08:39:01 +02:00
Bjoern Schiessle
cfbdad9cdb catch broken server config and disable encryption app. 2013-08-08 08:38:37 +02:00
Bjoern Schiessle
69173c2a6b fix test and make warning translatable 2013-08-01 14:19:33 +02:00
Bjoern Schiessle
9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Bjoern Schiessle
b6fa0e4eef working decrypt files method 2013-07-29 17:06: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
f9c337dd21 only escape glob pattern 2013-07-05 16:00:17 +02:00
Björn Schießle
abc2ee2e07 handle rename correctly for system wide mounts 2013-07-05 15:59:38 +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
f30dd1557e more verbose error message 2013-07-04 14:50:07 +02:00
Björn Schießle
40e6ede6a2 improved error message 2013-07-02 10:14:33 +02:00
Björn Schießle
9512382ae0 fix error string 2013-07-01 12:24:21 +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
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
d10ad0d603 Squashed commit of the following: 
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:27:46 2013 +0200

    add l10n support

commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:19:10 2013 +0200

    only init session if openssl extension is loaded

commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:25:40 2013 +0200

    first disable app and than show error page

commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:17:34 2013 +0200

    typo fixed

commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:15:40 2013 +0200

    move dependency check to the encryption app

commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 11:13:11 2013 +0200

    make sure that openssl is installed and loaded
 2013-06-21 10:37:51 +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
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
5fafd55108 make sure that only one process can enter the migration mode 2013-06-11 12:03:50 +02: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
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
dc8bcf0688 reformat code 2013-06-03 18:42:13 +02:00
Björn Schießle
b02f4dc62c $session->setPrivateKey expects only one parameter 2013-06-03 15:26:58 +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
8761242f52 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/appinfo/app.php
 2013-05-31 20:34:43 +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
Florin Peter
88d74c33af Merge branch 'master' into files_encryption_fs_loaded_fix 2013-05-31 12:49:46 +02:00
Florin Peter
4a0e69f941 fix login errors while filesystem is not loaded 2013-05-31 11:55:40 +02:00
Florin Peter
986e9dd362 use legacyDecrypt to decrypt key file like the previous files_encryption 2013-05-31 01:35:48 +02:00
Florin Peter
6d94b393bf fix share and un-share for single file 2013-05-30 01:38:11 +02:00
Florin Peter
313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes 
Conflicts:
	apps/files_encryption/hooks/hooks.php
 2013-05-30 00:45:29 +02:00
Florin Peter
1202ab9995 Merge branch 'master' into file_encryption_external_storage_fixes 2013-05-29 19:19:40 +02:00
Florin Peter
d265264542 fix for share folder on external storage 2013-05-29 19:11:39 +02:00
Florin Peter
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
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Florin Peter
7224fc98b2 replace == with === and replace != with !== 2013-05-27 20:44:38 +02:00
Björn Schießle
2c3c60c1af Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
 2013-05-27 18:09:35 +02:00
Björn Schießle
df22a7c495 make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 17:35:28 +02:00
Björn Schießle
8b35578833 fix migration from old to new encryption 2013-05-27 17:35:06 +02:00
Florin Peter
5d32e214b7 reformat code 2013-05-27 17:26:58 +02:00
Florin Peter
6c8de5ae6d fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00