38e5da05af
only encrypt file to users with encryption keys
2013-10-09 15:56:21 +02:00
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
5b7f76e702
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
...
Encryption improved error messages
2013-10-04 02:28:18 -07:00
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
5501dd623e
add/remove specific CSS class - not all classes
2013-10-03 12:22:25 +02:00
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
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
0f5fed5409
fix license header line breaks
2013-09-27 17:02:57 +02:00
7e54e8831e
set rememberlogin to false for the encryption app
2013-09-26 19:34:50 +02:00
62b8c36a40
check if encryption app is enabled before trying to calculate file size
2013-09-26 16:27:14 +02:00
0b98427536
fix check if app is enabled
2013-09-25 19:23:07 +02:00
71bbb2ea8b
check if key exists before reading it
2013-09-25 17:44:05 +02:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
bc3b147396
remove spaces
2013-09-19 10:13:21 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
4edd8b8303
remove debug output
2013-09-18 16:08:29 +02:00
5fb0e257a4
let user repeat the recovery key password to prevent typos
2013-09-18 16:03:53 +02:00
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
72eaf2894a
performance improvement, check configuration only if no private key exists
2013-09-17 16:53:52 +02:00
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
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
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
b2dde14dbc
coding style fixes
2013-09-06 16:07:18 +02:00
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
f6830e7462
check shares for the real file and not for the .part file
2013-09-06 16:05:11 +02:00
404e36323a
first check if a extension exists before comparing it
2013-09-06 16:05:03 +02:00
597a3cf1ad
handle part files correctly
2013-09-06 16:04:56 +02:00
1558cb860c
remove test code
2013-09-06 13:16:48 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
69b1625f0e
re-added error.php
2013-09-06 12:27:25 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
4dbc787055
check if stream wrapper is already registered to avoid warning
2013-09-03 15:56:25 +02:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
3d49631b8d
make sure that initial encryption also starts for a fresh installation
2013-09-03 13:24:30 +02:00
39f4538e0f
This function doesn't cache anymore. Adjusted PHPDoc to suit.
2013-09-02 09:59:01 -04:00
df7bfa4bf0
Don't cache the pkey, skip generation if the keyfile exists
2013-09-02 09:59:00 -04:00
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
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
88c4ac9b98
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-02 14:39:45 +02:00
6572ca811f
error.php no longer needed
2013-09-02 11:36:20 +02:00
5e508f1ccb
improved documentation of the methods
2013-09-02 11:34:28 +02:00
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
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
d7dca966a2
improved error messaging, initial commit
2013-08-30 10:17:50 +02:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
582b33bdf1
Merge pull request #4537 from owncloud/no-realpath
...
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
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
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
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
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
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
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
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
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
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
d3e2f31ada
Merge pull request #4352 from owncloud/encryption_clean_up
...
crypt.php clean up
2013-08-17 04:10:15 -07:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
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
7d0e9cc685
use __DIR__ instead of realpath
2013-08-14 17:15:01 +02:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
eb0fdc8380
provide correct path for require_once
2013-08-12 17:38:57 +02:00
7b1067c2a0
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
2013-08-12 16:19:08 +02:00
0bab8935c9
preserve mtime if file gets encrypted/decrypted
2013-08-12 14:30:43 +02:00
b982868c14
fix array declaration
2013-08-12 13:59:49 +02:00
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
44d201a526
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
2013-08-09 15:57:07 +02:00
5ba8d38b7f
remove old comments, TODos, etc.
2013-08-09 15:55:17 +02:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
c458e785a1
fixing typos and PHPDoc
2013-08-08 15:08:58 +02:00
512f98cac9
remove todo item
2013-08-08 13:38:15 +02:00
023121aed0
adapt tests to the changes in crypt.php
2013-08-08 13:35:01 +02:00
b39d2d1938
more error messages which might be useful for the user to debug his server config
2013-08-08 08:39:11 +02:00
7ce03ba37c
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
2013-08-08 08:39:01 +02:00
7aeb0068be
also write error message to the log
2013-08-08 08:38:52 +02:00
cfbdad9cdb
catch broken server config and disable encryption app.
2013-08-08 08:38:37 +02:00
97e910e087
make methods private which are not used from outside
2013-08-08 08:37:39 +02:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
0fce89308e
[tx-robot] updated from transifex
2013-08-05 07:54:38 -04:00
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
69173c2a6b
fix test and make warning translatable
2013-08-01 14:19:33 +02:00
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
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
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
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
58233033c1
this test works locally, let's see what out build server says...
2013-07-31 12:03:50 +02:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
6c96a5273b
fixing some unit tests
2013-07-30 18:21:23 +02:00
2549322763
we need to use the path relative to data/
2013-07-30 18:17:33 +02:00
a212c98125
handle error if we can't handle the given path
2013-07-30 15:27:59 +02:00
a6ced6b53f
remove unused method, the right one is in util.php
2013-07-30 14:28:24 +02:00
aca7fbe2c8
adapt unit tests to the modified stream wrapper
2013-07-30 14:18:01 +02:00
3640c99462
encrypt/decrypt file versions
2013-07-30 12:19:04 +02:00
ba18452eda
only write keyfiles if it was a new file, otherwise nothing changed
2013-07-30 10:43:16 +02:00
223d3c91d6
use path relative to data/
2013-07-30 10:14:17 +02:00
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
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
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
6e2418141d
Merge branch 'master' into parallel-autotest.sh-master
2013-07-22 11:39:27 +02:00
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
f54f203e56
mark test as incomplete because I can't reproduce jenkins failure
2013-07-21 11:28:06 +02:00
20ee9945d1
don't rely on admin user but create a test user for Test_Encryption_Keymanager
2013-07-19 14:54:10 +02:00
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
ccb3c5b428
Removed the preview warning. This is only a simple text change
2013-07-13 13:31:55 +02:00
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
439cad07b5
[tx-robot] updated from transifex
2013-07-09 02:12:22 +02:00
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
096d7674fc
[tx-robot] updated from transifex
2013-07-07 02:06:06 +02:00
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +02:00
87063918f2
remove wrong closing bracket
2013-07-05 16:05:05 +02:00
9575c2f37c
added helper function to escape glob pattern
...
Conflicts:
apps/files_encryption/lib/helper.php
2013-07-05 16:03:20 +02:00
ec6350079f
fix getUidAndFilename() test
2013-07-05 16:00:43 +02:00
15cb8e4efd
only check for external mount points if the external storage app is enabled
2013-07-05 16:00:34 +02:00
f9c337dd21
only escape glob pattern
2013-07-05 16:00:17 +02:00
93730a090b
del share keys from correct location
2013-07-05 16:00:08 +02:00
af2cd6f541
always return normalized path
2013-07-05 15:59:57 +02:00
3043dbfb95
delete file keys from the correct location
2013-07-05 15:59:46 +02:00
abc2ee2e07
handle rename correctly for system wide mounts
2013-07-05 15:59:38 +02:00
eb2587a08f
move isSystemWideMountPoint() to util.php
2013-07-05 15:59:29 +02:00
f2de4cb342
some performance improvements, check for system wide mounts only once while writing share keys
2013-07-05 15:59:19 +02:00
2e56f0e2f8
fix path to OC_Mount_Config
2013-07-05 15:59:06 +02:00
3e4dcafa89
handle system wide mount points
2013-07-05 15:58:55 +02:00
955646c461
[tx-robot] updated from transifex
2013-07-05 02:21:23 +02:00
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
f30dd1557e
more verbose error message
2013-07-04 14:50:07 +02:00
51cfacd789
[tx-robot] updated from transifex
2013-07-04 09:33:58 +02:00
811cf02675
[tx-robot] updated from transifex
2013-07-03 02:04:16 +02:00
Bjoern Schiessle
Jenkins for ownCloud
Björn Schießle
Morris Jobke
Arthur Schiwon
ringmaster
Andreas Fischer
Kondou
Bart Visscher
Frank Karlitschek
VicDeo