73a2d87ab4
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-28 14:49:19 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
f37a76c396
Remember before change works better
2014-04-01 19:46:46 +02:00
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
a687498547
Fix encryption webdav tests
2014-03-05 13:19:08 +01:00
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
d3a24e945b
add test case if a file gets moved out from the shared folder
2014-02-24 17:56:00 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
2933668355
fileinfo is no longer a array
2014-02-14 18:05:59 +01:00
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
fe5f512272
added tests for the delete hooks if the trash bin is disabled
2014-02-01 20:08:23 +01:00
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
f09c19c316
Replaced time() with uniqid() to make sure the file name is unique
...
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)
This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
2014-01-21 16:31:58 +01:00
299bb4d99d
remove more is_array from encryption
2014-01-17 14:38:14 +01:00
6a3e38266f
Merge pull request #6507 from owncloud/enc_fix_getUser
...
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
517a55a437
tests added
2013-12-19 19:43:57 +01:00
df0c1fe7f3
add test for the stream wrapper to read encrypted files from the system folder /tmp
2013-12-18 17:07:35 +01:00
f9ec3a7124
test for isEncryptedPath()
2013-12-18 16:39:34 +01:00
cdd816c930
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 16:05:24 +01:00
6d489e0474
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 16:00:16 +01:00
b919a65432
enable more tests
2013-12-04 17:43:38 +01:00
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
318db64b2d
adapt tests to the new code
2013-11-20 23:27:42 +01:00
3ad546002f
Merge pull request #5833 from owncloud/encryption_fixes
...
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
f36ee69855
tests added
2013-11-15 16:49:50 +01:00
2624a6cb32
remove debug output
2013-11-14 12:13:22 +01:00
2df3763675
test encryptAll() and decryptAll() to make sure that mtime and etag stay the same
2013-11-14 12:11:21 +01:00
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
fcbb5d6cb3
missed some replacements... now tests should work
2013-11-12 11:17:34 +01:00
9f10f15fd4
fixing tests for the new part file handling
2013-11-12 10:24:10 +01:00
af58360434
files_encryption: Fix getFileSize()
...
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
Conflicts:
apps/files_encryption/tests/util.php
2013-10-23 16:28:43 +02:00
beaed2195d
fix comment
2013-10-15 17:36:52 +02:00
0d4117f6d5
added simple test for getFileSize proxy
2013-10-15 17:33:31 +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
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
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
c458e785a1
fixing typos and PHPDoc
2013-08-08 15:08:58 +02:00
023121aed0
adapt tests to the changes in crypt.php
2013-08-08 13:35:01 +02:00
69173c2a6b
fix test and make warning translatable
2013-08-01 14:19:33 +02: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
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
6c96a5273b
fixing some unit tests
2013-07-30 18:21:23 +02:00
aca7fbe2c8
adapt unit tests to the modified stream wrapper
2013-07-30 14:18:01 +02:00
6e2418141d
Merge branch 'master' into parallel-autotest.sh-master
2013-07-22 11:39:27 +02: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
ec6350079f
fix getUidAndFilename() test
2013-07-05 16:00:43 +02:00
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
bc2862fcb9
Merge branch 'master' into files_encryption_upgrade_fix
2013-06-13 12:53:29 +02:00
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
2f1005f05f
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
2013-06-13 10:44:05 +02:00
6394fedb33
add comment to explain the helper function
2013-06-13 10:35:30 +02:00
27fcdb3af5
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/tests/crypt.php
2013-06-12 20:53:45 +02:00
df78085171
adapt test to the code changes
2013-06-12 14:00:53 +02:00
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
c70a0f791d
allow 30 sec for testDeleteFile
2013-06-10 14:45:39 +02:00
13017ce9e1
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
b6f8d2b859
raise failed tests from first commit to size @medium
2013-06-10 10:17:47 +02:00
73fb722a9e
add timeouts 3/30/90 to phpunit tests
2013-06-10 09:31:22 +02:00
dc8bcf0688
reformat code
2013-06-03 18:42:13 +02:00
1e601cd6f1
use generated private key fro m setUp()
2013-06-03 17:43:06 +02:00
35c91ff901
added test for decryptPrivateKey()
2013-06-03 17:34:43 +02:00
42f66af5a3
control files are no longer needed, remove them from the tests
2013-06-03 14:21:30 +02:00
46e5e9bd73
cleanup unused method legacyKeyRecryptKeyfile
2013-05-31 22:49:32 +02:00
d85a10ebc5
fix broken tests
2013-05-31 20:55:05 +02:00
1bfe975938
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-31 12:58:12 +02:00
ccdfb59426
fix legacy key in until test
2013-05-31 01:55:48 +02:00
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
df41a60c50
fixed typo
2013-05-29 20:11:53 +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
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
6075aff687
changed basic auth to test user
2013-05-27 20:32:59 +02:00
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
df22a7c495
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
2013-05-27 17:35:28 +02:00
710e9c2d14
fix tests, after unused variables are removed
2013-05-27 15:34:57 +02:00
9dd277576a
added users for tests
...
reformat code to meet coding guidelines
2013-05-26 20:44:15 +02:00
c7981abbc9
improved test
...
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
2013-05-26 03:22:16 +02:00
fba7200b05
improved trashbin test again
2013-05-24 23:12:16 +02:00
b32823a96e
improved trashbin test
2013-05-24 23:12:07 +02:00
Bjoern Schiessle
Robin Appelman
Bart Visscher
Vincent Petry
Jörn Friedrich Dreyer
Thomas Müller
icewind1991
Björn Schießle
Markus Goetz
Andreas Fischer
kondou
Morris Jobke
Florin Peter