Björn Schießle
1992450b32
Merge pull request #4902 from owncloud/repeat_recovery_password
...
let user repeat the recovery key password to prevent typos
2013-10-04 02:23:01 -07:00
Morris Jobke
5501dd623e
add/remove specific CSS class - not all classes
2013-10-03 12:22:25 +02:00
Thomas Müller
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Bjoern Schiessle
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
Jenkins for ownCloud
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
Morris Jobke
0f5fed5409
fix license header line breaks
2013-09-27 17:02:57 +02:00
Bjoern Schiessle
7e54e8831e
set rememberlogin to false for the encryption app
2013-09-26 19:34:50 +02:00
Bjoern Schiessle
62b8c36a40
check if encryption app is enabled before trying to calculate file size
2013-09-26 16:27:14 +02:00
Bjoern Schiessle
0b98427536
fix check if app is enabled
2013-09-25 19:23:07 +02:00
Bjoern Schiessle
71bbb2ea8b
check if key exists before reading it
2013-09-25 17:44:05 +02:00
Bjoern Schiessle
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
Bjoern Schiessle
bc3b147396
remove spaces
2013-09-19 10:13:21 +02:00
Jenkins for ownCloud
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
Bjoern Schiessle
4edd8b8303
remove debug output
2013-09-18 16:08:29 +02:00
Bjoern Schiessle
5fb0e257a4
let user repeat the recovery key password to prevent typos
2013-09-18 16:03:53 +02:00
Björn Schießle
e0f18ec72b
Merge pull request #4708 from owncloud/encryption_fixes
...
make sure that initial encryption also starts for a fresh installation
2013-09-18 01:33:52 -07:00
Bjoern Schiessle
72eaf2894a
performance improvement, check configuration only if no private key exists
2013-09-17 16:53:52 +02:00
Jenkins for ownCloud
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
Bjoern Schiessle
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
Jenkins for ownCloud
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
Thomas Müller
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Jenkins for ownCloud
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
Jenkins for ownCloud
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
Jenkins for ownCloud
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
Bjoern Schiessle
b2dde14dbc
coding style fixes
2013-09-06 16:07:18 +02:00
Bjoern Schiessle
93f4dec798
fix part file handling and real size calculation, this should also solve #4581
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-09-06 16:06:34 +02:00
Bjoern Schiessle
f6830e7462
check shares for the real file and not for the .part file
2013-09-06 16:05:11 +02:00
Bjoern Schiessle
404e36323a
first check if a extension exists before comparing it
2013-09-06 16:05:03 +02:00
Bjoern Schiessle
597a3cf1ad
handle part files correctly
2013-09-06 16:04:56 +02:00
Bjoern Schiessle
1558cb860c
remove test code
2013-09-06 13:16:48 +02:00
Bjoern Schiessle
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
Bjoern Schiessle
69b1625f0e
re-added error.php
2013-09-06 12:27:25 +02:00
Jenkins for ownCloud
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
Arthur Schiwon
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
Bjoern Schiessle
4dbc787055
check if stream wrapper is already registered to avoid warning
2013-09-03 15:56:25 +02:00
Jenkins for ownCloud
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
Bjoern Schiessle
3d49631b8d
make sure that initial encryption also starts for a fresh installation
2013-09-03 13:24:30 +02:00
ringmaster
39f4538e0f
This function doesn't cache anymore. Adjusted PHPDoc to suit.
2013-09-02 09:59:01 -04:00
ringmaster
df7bfa4bf0
Don't cache the pkey, skip generation if the keyfile exists
2013-09-02 09:59:00 -04:00
Owen Winkler
9a263a500a
Employ config option for OpenSSL config file, if provided.
...
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
Owen Winkler
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
Bjoern Schiessle
88c4ac9b98
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-02 14:39:45 +02:00
Bjoern Schiessle
6572ca811f
error.php no longer needed
2013-09-02 11:36:20 +02:00
Bjoern Schiessle
5e508f1ccb
improved documentation of the methods
2013-09-02 11:34:28 +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
Jenkins for ownCloud
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
Bjoern Schiessle
d7dca966a2
improved error messaging, initial commit
2013-08-30 10:17:50 +02:00
Thomas Müller
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
Thomas Müller
582b33bdf1
Merge pull request #4537 from owncloud/no-realpath
...
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
Andreas Fischer
83afb46205
Use __DIR__ instead of dirname(__FILE__).
...
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
Andreas Fischer
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
Andreas Fischer
9753e44ac2
Do not use realpath() on includes.
...
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.
'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +02:00
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Bart Visscher
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
Bjoern Schiessle
1be11bb03d
don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again
2013-08-18 11:21:01 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +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
Bart Visscher
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
Thomas Müller
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Bjoern Schiessle
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
Jenkins for ownCloud
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
Andreas Fischer
75e9015b54
Merge pull request #4393 from owncloud/fix_4326
...
provide correct path for require_once
* owncloud/fix_4326:
use __DIR__ instead of realpath
provide correct path for require_once
2013-08-14 21:20:53 +02:00
Bjoern Schiessle
7d0e9cc685
use __DIR__ instead of realpath
2013-08-14 17:15:01 +02:00
Jenkins for ownCloud
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
Bjoern Schiessle
eb0fdc8380
provide correct path for require_once
2013-08-12 17:38:57 +02:00
Bjoern Schiessle
7b1067c2a0
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
2013-08-12 16:19:08 +02:00
Bjoern Schiessle
0bab8935c9
preserve mtime if file gets encrypted/decrypted
2013-08-12 14:30:43 +02:00
Bjoern Schiessle
b982868c14
fix array declaration
2013-08-12 13:59:49 +02:00
Jenkins for ownCloud
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
Bjoern Schiessle
44d201a526
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
2013-08-09 15:57:07 +02:00
Bjoern Schiessle
5ba8d38b7f
remove old comments, TODos, etc.
2013-08-09 15:55:17 +02:00
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Thomas Müller
c458e785a1
fixing typos and PHPDoc
2013-08-08 15:08:58 +02:00
Bjoern Schiessle
512f98cac9
remove todo item
2013-08-08 13:38:15 +02:00
Bjoern Schiessle
023121aed0
adapt tests to the changes in crypt.php
2013-08-08 13:35:01 +02:00
Bjoern Schiessle
b39d2d1938
more error messages which might be useful for the user to debug his server config
2013-08-08 08:39:11 +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
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
Bjoern Schiessle
97e910e087
make methods private which are not used from outside
2013-08-08 08:37:39 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
Jenkins for ownCloud
0fce89308e
[tx-robot] updated from transifex
2013-08-05 07:54:38 -04:00
Jenkins for ownCloud
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
Jenkins for ownCloud
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04: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
Jenkins for ownCloud
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
Bjoern Schiessle
d7dd2ee465
don't know why it works locally but not on the build server... let's keep it out for the moment
2013-07-31 16:44:43 +02:00
Bjoern Schiessle
23e9721644
use OC\Files\View to read encrypted file, so that it also works with external storages
2013-07-31 16:35:14 +02:00
Bjoern Schiessle
fe2937e3cd
this hopefully fixes testRecoveryForUser(), works locally
...
for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
2013-07-31 16:15:49 +02:00
Bjoern Schiessle
58233033c1
this test works locally, let's see what out build server says...
2013-07-31 12:03:50 +02:00
Jenkins for ownCloud
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
Bjoern Schiessle
6c96a5273b
fixing some unit tests
2013-07-30 18:21:23 +02:00
Bjoern Schiessle
2549322763
we need to use the path relative to data/
2013-07-30 18:17:33 +02:00
Bjoern Schiessle
a212c98125
handle error if we can't handle the given path
2013-07-30 15:27:59 +02:00
Bjoern Schiessle
a6ced6b53f
remove unused method, the right one is in util.php
2013-07-30 14:28:24 +02:00
Bjoern Schiessle
aca7fbe2c8
adapt unit tests to the modified stream wrapper
2013-07-30 14:18:01 +02:00
Bjoern Schiessle
3640c99462
encrypt/decrypt file versions
2013-07-30 12:19:04 +02:00
Bjoern Schiessle
ba18452eda
only write keyfiles if it was a new file, otherwise nothing changed
2013-07-30 10:43:16 +02:00
Bjoern Schiessle
223d3c91d6
use path relative to data/
2013-07-30 10:14:17 +02:00
Bjoern Schiessle
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
Jenkins for ownCloud
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Björn Schießle
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
Björn Schießle
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
Jenkins for ownCloud
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
Jenkins for ownCloud
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
Jenkins for ownCloud
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
Thomas Müller
6e2418141d
Merge branch 'master' into parallel-autotest.sh-master
2013-07-22 11:39:27 +02:00
Jenkins for ownCloud
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
Morris Jobke
f54f203e56
mark test as incomplete because I can't reproduce jenkins failure
2013-07-21 11:28:06 +02:00
Thomas Müller
20ee9945d1
don't rely on admin user but create a test user for Test_Encryption_Keymanager
2013-07-19 14:54:10 +02:00
Jenkins for ownCloud
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
Jenkins for ownCloud
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
Frank Karlitschek
ccb3c5b428
Removed the preview warning. This is only a simple text change
2013-07-13 13:31:55 +02:00
Jenkins for ownCloud
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
Jenkins for ownCloud
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
Jenkins for ownCloud
439cad07b5
[tx-robot] updated from transifex
2013-07-09 02:12:22 +02:00
Jenkins for ownCloud
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
Jenkins for ownCloud
096d7674fc
[tx-robot] updated from transifex
2013-07-07 02:06:06 +02:00
Jenkins for ownCloud
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +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
ec6350079f
fix getUidAndFilename() test
2013-07-05 16:00:43 +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
abc2ee2e07
handle rename correctly for system wide mounts
2013-07-05 15:59:38 +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
Jenkins for ownCloud
955646c461
[tx-robot] updated from transifex
2013-07-05 02:21:23 +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
Jenkins for ownCloud
51cfacd789
[tx-robot] updated from transifex
2013-07-04 09:33:58 +02:00
Jenkins for ownCloud
811cf02675
[tx-robot] updated from transifex
2013-07-03 02:04:16 +02: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
Jenkins for ownCloud
cec8384b1a
[tx-robot] updated from transifex
2013-07-02 15:35:55 +02:00
Björn Schießle
3fc5b34247
Merge branch 'master' into encryption_check_php_version
...
Conflicts:
apps/files_encryption/files/error.php
2013-07-02 13:54:31 +02:00
Björn Schießle
38ed00398f
Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version
2013-07-02 13:49:49 +02:00
Björn Schießle
40e6ede6a2
improved error message
2013-07-02 10:14:33 +02:00
Björn Schießle
29dd7eda2d
improved error message
2013-07-02 10:11:42 +02:00
Thomas Müller
3b1018ec00
no ?> at the end of a file
...
missing .
2013-07-01 21:13:04 +02: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
9512382ae0
fix error string
2013-07-01 12:24:21 +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
Jenkins for ownCloud
d2f50bc089
[tx-robot] updated from transifex
2013-06-29 02:09:10 +02:00
Bart Visscher
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Jenkins for ownCloud
6127fee5aa
[tx-robot] updated from transifex
2013-06-28 02:04:58 +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
Jenkins for ownCloud
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
Björn Schießle
5a20c8b66f
add openssl_error_string() output to the owncloud.log
2013-06-26 15:51:22 +02:00
Jenkins for ownCloud
afc3d9314a
[tx-robot] updated from transifex
2013-06-26 02:07:04 +02:00
Jenkins for ownCloud
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
Jörn Friedrich Dreyer
c79f7f4f3c
fix numRows usage in files_encryption
2013-06-24 16:29:59 +02:00
Jenkins for ownCloud
aaecfa18ed
[tx-robot] updated from transifex
2013-06-23 02:05:39 +02:00
Jenkins for ownCloud
52ba86678a
[tx-robot] updated from transifex
2013-06-22 02:11:35 +02:00
Björn Schießle
f40f49851c
fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'
2013-06-21 14:49:01 +02:00
Björn Schießle
76369b7424
encryption is LDAP compatible
2013-06-21 13:08:31 +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
Jenkins for ownCloud
8c923a85de
[tx-robot] updated from transifex
2013-06-21 08:53:57 +02:00
Björn Schießle
c4aa3fac7e
Merge pull request #3788 from owncloud/more_error_messages
...
add some more error messages, in case something went wrong
2013-06-20 02:12:01 -07:00
Jenkins for ownCloud
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +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
Jenkins for ownCloud
d991a9372b
[tx-robot] updated from transifex
2013-06-18 02:11:10 +02:00
Jenkins for ownCloud
6156d71832
[tx-robot] updated from transifex
2013-06-17 02:08:11 +02:00
Jenkins for ownCloud
8243d19050
[tx-robot] updated from transifex
2013-06-16 02:07:45 +02:00
Jenkins for ownCloud
ab411d2700
[tx-robot] updated from transifex
2013-06-15 02:07:18 +02:00
Björn Schießle
a8a60d761b
Merge pull request #3715 from owncloud/fixes_for_3641_3620
...
files_encryption: bug fixes for reported problems.
2013-06-14 01:38:15 -07:00
Jenkins for ownCloud
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +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
2b179ccff0
Merge pull request #3668 from owncloud/encryption_migrate_only_once
...
make sure that only one process can enter the migration mode
2013-06-13 03:31:31 -07:00
Björn Schießle
2f1005f05f
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
2013-06-13 10:44:05 +02:00
Björn Schießle
6394fedb33
add comment to explain the helper function
2013-06-13 10:35:30 +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
df78085171
adapt test to the code changes
2013-06-12 14:00:53 +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
Thomas Müller
74b1f7d448
Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
...
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
Jenkins for ownCloud
4f0f537b42
[tx-robot] updated from transifex
2013-06-11 02:02:44 +02:00
Jörn Friedrich Dreyer
c70a0f791d
allow 30 sec for testDeleteFile
2013-06-10 14:45:39 +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
Björn Schießle
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Jörn Friedrich Dreyer
b6f8d2b859
raise failed tests from first commit to size @medium
2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer
73fb722a9e
add timeouts 3/30/90 to phpunit tests
2013-06-10 09:31:22 +02:00
Jenkins for ownCloud
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
Jenkins for ownCloud
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +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
Jenkins for ownCloud
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
Björn Schießle
7fc5151d95
add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set
2013-06-05 18:53:02 +02:00
Björn Schießle
036732c249
allow to press enter to update the password
2013-06-05 14:51:51 +02:00
Björn Schießle
be324fad1c
tell the user what he can do to regain access to his files
2013-06-05 14:19:26 +02:00
Björn Schießle
57bda411d1
only show personal settings if the recovery feature is enabled or if no private key is set
2013-06-05 13:51:28 +02:00
Jenkins for ownCloud
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
Florin Peter
055c901091
improved error msg and removed duplicate string
2013-06-04 22:31:36 +02:00
Björn Schießle
7bbd85b6e5
improved label for the password recovery feature
2013-06-04 21:19:42 +02:00
Björn Schießle
4ee7a428ae
link directly to the encryption settings
2013-06-04 10:49:58 +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
b46e7323ec
fixed typo
2013-06-03 19:10:55 +02:00
Florin Peter
dc8bcf0688
reformat code
2013-06-03 18:42:13 +02:00
Björn Schießle
1e601cd6f1
use generated private key fro m setUp()
2013-06-03 17:43:06 +02:00
Björn Schießle
35c91ff901
added test for decryptPrivateKey()
2013-06-03 17:34:43 +02:00
icewind1991
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
Björn Schießle
b5820af3cc
let user update private key password in case it was changed from outside, e.g. external auth back-ends
2013-06-03 15:27:31 +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
42f66af5a3
control files are no longer needed, remove them from the tests
2013-06-03 14:21:30 +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
Jenkins for ownCloud
cf71a54f5d
[tx-robot] updated from transifex
2013-06-02 02:07:21 +02:00
Jenkins for ownCloud
3013c02767
[tx-robot] updated from transifex
2013-06-01 02:03:53 +02:00
Florin Peter
46e5e9bd73
cleanup unused method legacyKeyRecryptKeyfile
2013-05-31 22:49:32 +02:00
Florin Peter
d85a10ebc5
fix broken tests
2013-05-31 20:55:05 +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
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
Florin Peter
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
Florin Peter
88d74c33af
Merge branch 'master' into files_encryption_fs_loaded_fix
2013-05-31 12:49:46 +02:00
FlorinPeter
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
Florin Peter
4a0e69f941
fix login errors while filesystem is not loaded
2013-05-31 11:55:40 +02:00
Jenkins for ownCloud
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
Florin Peter
96ef926161
normalize path to prevent following split to fail
2013-05-31 01:57:32 +02:00
Florin Peter
ccdfb59426
fix legacy key in until test
2013-05-31 01:55:48 +02:00
Florin Peter
8e324aad38
fix re-encrypt legacy files
2013-05-31 01:36:49 +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
4f9cbadfa4
fix for autoloader while user logged in and system is in maintenance
2013-05-31 01:34:31 +02:00
Florin Peter
eaa4f92275
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
2013-05-30 22:07:36 +02:00
Jenkins for ownCloud
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
Florin Peter
6d94b393bf
fix share and un-share for single file
2013-05-30 01:38:11 +02:00
Florin Peter
8c17f26226
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
2013-05-30 01:13:22 +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
d59ae569ba
reformat code
2013-05-29 23:13:45 +02:00
Florin Peter
838fd1a20a
changed " to '
2013-05-29 23:11:30 +02:00
Florin Peter
ee7c4c4c93
changed l10n to full sentences
2013-05-29 20:27:12 +02:00
Florin Peter
df41a60c50
fixed typo
2013-05-29 20:11:53 +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
Björn Schießle
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
Florin Peter
5dd865a57f
changes l10n after review
2013-05-29 12:47:50 +02:00
Florin Peter
efd629462e
changes after review
2013-05-29 12:23:33 +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
Jenkins for ownCloud
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
Florin Peter
71a532fc4d
fixed if fopen returns false typically on external storage
2013-05-28 20:50:14 +02:00
Florin Peter
4b4b447e2a
fixed missing convert to new session handler
2013-05-28 17:06:37 +02:00
Florin Peter
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
Robin Appelman
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
Florin Peter
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
Björn Schießle
3a76c22372
$_POST["adminEnableRecovery"] is a string
2013-05-28 10:51:12 +02:00
Florin Peter
0041711fe3
fix for undefined index
2013-05-28 09:36:14 +02:00
Florin Peter
6f9e425939
fix for losing private key while being logged in and accessing a public link
2013-05-28 09:27:04 +02:00
Jenkins for ownCloud
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
Robin Appelman
9c99048429
fix syntax error
2013-05-28 01:31:26 +02:00
Robin Appelman
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
Florin Peter
e1e1c58969
changed to public log api
2013-05-27 20:51:52 +02:00
Florin Peter
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +02:00
Florin Peter
6075aff687
changed basic auth to test user
2013-05-27 20:32:59 +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
c81e34ef89
replace == with ===
2013-05-27 18:03:29 +02:00
Björn Schießle
4c05259ccf
legacyBlockDecryprt() needs to be public
2013-05-27 17:35:38 +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
690bf9b8c4
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
Björn Schießle
710e9c2d14
fix tests, after unused variables are removed
2013-05-27 15:34:57 +02:00
Björn Schießle
1a3f7891ea
remove unused varaibles
2013-05-27 15:31:26 +02:00
Florin Peter
80433fc4c4
Merge branch 'master' into file_encryption_util_is_error
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 14:41:53 +02:00
Björn Schießle
5e243b48bb
Merge pull request #3481 from owncloud/firsttime_enc
...
fix first time encryption after app was enabled
2013-05-27 05:17:31 -07:00
Florin Peter
8cf827ee9d
Merge branch 'master' into file_encryption_tests
2013-05-27 12:54:33 +02:00
Florin Peter
89f0c8f39d
added check by numRows()
...
changed to public api where it was possible
reformat code to comply with the coding guidelines
2013-05-27 12:41:55 +02:00
Jenkins for ownCloud
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
Florin Peter
9dd277576a
added users for tests
...
reformat code to meet coding guidelines
2013-05-26 20:44:15 +02:00
Florin Peter
c7981abbc9
improved test
...
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
2013-05-26 03:22:16 +02:00
Jenkins for ownCloud
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
Florin Peter
788c5940f0
fixed error rising from fetchRow
2013-05-25 23:20:55 +02:00
Florin Peter
9a6cd89a69
added OC_DB::isError and logging
2013-05-25 21:33:05 +02:00
Frank Karlitschek
29c8cbf4d1
increase version and add warning
2013-05-25 12:08:18 +02:00
Jenkins for ownCloud
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
Florin Peter
fba7200b05
improved trashbin test again
2013-05-24 23:12:16 +02:00
Florin Peter
b32823a96e
improved trashbin test
2013-05-24 23:12:07 +02:00
Björn Schießle
f56802a437
no use the recoveryPassword var instead of accessing the POST array
2013-05-24 18:37:58 +02:00
Björn Schießle
5ce4149e75
fix first time encryption after app was enabled
2013-05-24 17:35:00 +02:00
Florin Peter
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
Florin Peter
adc930d9f9
added l10n support in apps/files_encryption/ajax/adminrecovery.php
2013-05-23 22:09:28 +02:00
Björn Schießle
7b07168c46
code clean up; nicer solution to solve the public link share problem if a user is logged in
2013-05-23 21:18:31 +02:00
Björn Schießle
a9ebf2aabe
fix public link share if a user is logged in
2013-05-23 20:30:07 +02:00
Florin Peter
46c784ccdf
added trash bin tests
2013-05-22 23:51:35 +02:00
Björn Schießle
80dea1a8c5
settings clean-up; There is no blacklist in the new encryption app
2013-05-22 18:05:12 +02:00
Björn Schießle
15a3ae6db1
improved error messages
2013-05-22 18:01:18 +02:00
Florin Peter
c6722581f9
fix pgsql error
2013-05-22 02:02:42 +02:00
Florin Peter
afbfa742d7
improved tests
2013-05-22 01:11:55 +02:00
Florin Peter
9ca9a22c6a
fixed finding encrypted files in subfolders and removed unused code
2013-05-22 00:54:47 +02:00
Florin Peter
095fc790ac
added webdav test
2013-05-21 21:09:39 +02:00
Florin Peter
1deeec93b7
fixed postFileSize
2013-05-21 21:09:25 +02:00
Björn Schießle
9d324db054
fix path to 3rdparty apps
2013-05-21 12:33:32 +02:00
Björn Schießle
4c27c7e199
fix path, needs to be relative to data/
2013-05-21 12:22:03 +02:00
Björn Schießle
64591cf754
move 3rdparty dependencies to app
2013-05-21 10:30:24 +02:00
Florin Peter
c9e862ccba
fix broken tests
2013-05-21 07:19:23 +02:00
Florin Peter
4bf840e2ca
cleanup unused code optimize tests
2013-05-21 00:00:55 +02:00
Florin Peter
f2b1158add
improved tests
2013-05-20 23:44:10 +02:00
Florin Peter
1c8e5d6873
added test for failed sharing
2013-05-20 21:46:28 +02:00
Florin Peter
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
Florin Peter
8e0540d0e4
key creation should never override a private or public key
2013-05-20 21:22:03 +02:00
Florin Peter
171b9a4702
added legacy encryption test
2013-05-20 21:19:28 +02:00
Florin Peter
3b850a2524
reformat code added and changed phpdoc
2013-05-20 01:24:36 +02:00
Florin Peter
dc39ef378e
changed recovery_enabled and migration_status columns to integer and fix tests
2013-05-20 00:38:23 +02:00
Florin Peter
5d572c3449
update phpdoc
2013-05-19 22:31:00 +02:00
Florin Peter
bdd2127f19
cleanup tests
2013-05-19 22:28:48 +02:00
Florin Peter
ddda2a1f79
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
...
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
2013-05-19 07:04:31 +02:00
Florin Peter
2a038baee0
updated authors info
2013-05-18 22:33:31 +02:00
Florin Peter
227b122947
fixed again key-manager tests
2013-05-18 22:25:47 +02:00
Florin Peter
681252669a
changed migrationStatus to migration_status for pgsql
2013-05-18 22:10:00 +02:00
Florin Peter
e0e89602a2
fixed key-manager tests
2013-05-18 22:00:35 +02:00
Florin Peter
80f9c5bb6d
removed mockery from tests and changed class names
2013-05-18 21:37:00 +02:00
Florin Peter
6980f59b2f
fixed typos
2013-05-18 21:12:53 +02:00
Florin Peter
41165afa59
improved tests
2013-05-17 22:45:09 +02:00
Florin Peter
3aa48616a6
remove unused code
2013-05-17 22:44:45 +02:00
Florin Peter
b6572cedac
added folder move test
2013-05-17 22:16:56 +02:00
Florin Peter
cea9208cec
fix broken legacy tests
2013-05-17 21:59:53 +02:00
Björn Schießle
e7d1fe82aa
fix path to class
2013-05-17 18:01:32 +02:00
Björn Schießle
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
Björn Schießle
002445e23d
some typo fixed
2013-05-17 14:49:54 +02:00
Björn Schießle
93771f735b
gremove unused code
2013-05-17 14:13:05 +02:00
Björn Schießle
bf04a21973
set migration status after successful upgrade
2013-05-17 13:16:52 +02:00
Björn Schießle
0b40c1d08a
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-17 11:20:17 +02:00
Björn Schießle
ca6a77d39b
upgrade from old encryption to the new one needs to generate share keys too
2013-05-17 11:15:36 +02:00
Florin Peter
2b0bf4dc87
added tests for recovery
2013-05-17 01:07:50 +02:00
Florin Peter
a4c0eb1756
improved tests
2013-05-17 01:07:26 +02:00