Thomas Müller
7d0eba7a41
Merge pull request #15886 from owncloud/fix-15848-master
...
Adjust isLocal() on encryption wrapper
2015-04-27 15:06:26 +02:00
Thomas Müller
678b7d7e4d
Merge pull request #15860 from owncloud/enc_fallback_old_encryption
...
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
Thomas Müller
936d564058
fixes #15848
2015-04-27 14:26:05 +02:00
Morris Jobke
93c25a1f4a
Merge pull request #15882 from owncloud/fix-type-annotation
...
Fix type annotation
2015-04-27 14:17:59 +02:00
Thomas Müller
cc331609bf
Merge pull request #15411 from mmattel/fix_for_15375_better_message_text
...
Improve error messge text for app upgrade try (#15375 )
2015-04-27 13:38:16 +02:00
Lukas Reschke
d0363fe396
Fix type annotation
...
Obviously should be an int
2015-04-27 13:31:18 +02:00
Morris Jobke
6a7b7caa81
Merge pull request #15681 from owncloud/issue/15667-occ-encryption
...
OCC commands to manage encryption
2015-04-27 13:28:59 +02:00
Bjoern Schiessle
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +02:00
Joas Schilling
e4c24a6b5c
Undefined index: default
2015-04-27 12:21:48 +02:00
Joas Schilling
6f5de37f5b
Fix module registration
2015-04-27 12:21:27 +02:00
Joas Schilling
25b5adfe87
Fix scrutinizer complain
2015-04-27 11:46:00 +02:00
Joas Schilling
8f61fbb81f
Fix new tests
2015-04-27 11:10:31 +02:00
Joas Schilling
a4c314622a
Use interface
2015-04-27 11:03:51 +02:00
Joas Schilling
e4977841b4
Add unit tests for the commands
2015-04-27 11:03:51 +02:00
Joas Schilling
5855d23ff9
Make methods explicit public
2015-04-27 11:03:51 +02:00
Joas Schilling
d600955a51
Make getDefaultModuleId public and get module protected
2015-04-27 11:03:51 +02:00
Joas Schilling
4e97228cde
Deduplicate module mock
2015-04-27 11:03:51 +02:00
Joas Schilling
4b7ae395f2
Add test for setDefaultEncryptionModule
2015-04-27 11:03:51 +02:00
Joas Schilling
b35379515c
Add a test that the default module is returned before we fall back
2015-04-27 11:03:50 +02:00
Joas Schilling
f6d4bdb1fd
Add occ commands to manage the encryption modules
2015-04-27 11:03:50 +02:00
Joas Schilling
a09df6d453
Verify that the encryption module exists before setting it
2015-04-27 11:03:50 +02:00
Joas Schilling
802f818c27
Merge pull request #15875 from owncloud/multiline-buttons
...
fix layout for multiline buttons which are <a class='button'>
2015-04-27 10:04:51 +02:00
Jenkins for ownCloud
e58029f8ad
[tx-robot] updated from transifex
2015-04-27 01:54:46 -04:00
Jan-Christoph Borchardt
84b41b3a4b
fix layout for multiline buttons which are <a class='button'>
2015-04-26 11:05:51 +02:00
Jenkins for ownCloud
37adf6df01
[tx-robot] updated from transifex
2015-04-26 01:54:49 -04:00
Lukas Reschke
4dfdaf741c
Merge pull request #15834 from owncloud/make-temporary-file-really-unique
...
Fix collision on temporary files + adjust permissions
2015-04-25 23:18:26 +02:00
Jenkins for ownCloud
7855174879
[tx-robot] updated from transifex
2015-04-25 01:55:13 -04:00
Lukas Reschke
b9df932e3c
Merge pull request #15683 from owncloud/block-legacy-clients
...
Block old legacy clients
2015-04-24 18:21:10 +02:00
Vincent Petry
f63a0c99a4
Merge pull request #15774 from owncloud/jknockaert-patch-1
...
fix encryption header error
2015-04-24 17:24:32 +02:00
Bjoern Schiessle
9a5783b284
fix unit tests
2015-04-24 16:47:27 +02:00
jknockaert
4554df2512
enable testWriteWriteRead
2015-04-24 16:44:00 +02:00
jknockaert
18a1225b0c
enable testRewind
2015-04-24 16:44:00 +02:00
jknockaert
49df8ef525
Update encryption.php
2015-04-24 16:44:00 +02:00
jknockaert
27ea23ea6b
Update encryption.php
2015-04-24 16:44:00 +02:00
jknockaert
d6841aa706
disable r+ test
2015-04-24 16:44:00 +02:00
jknockaert
238302ee7d
fixed name
2015-04-24 16:44:00 +02:00
jknockaert
7a34f75da6
add two tests
...
testRewind tests reading and writing after rewind on an encrypted stream; testWriteWriteRead tests r+ mode
2015-04-24 16:44:00 +02:00
jknockaert
1756562501
Update encryption.php
2015-04-24 16:44:00 +02:00
jknockaert
735f6cc037
fix encryption header error
...
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
2015-04-24 16:43:16 +02:00
Joas Schilling
4334e77035
Merge pull request #15839 from owncloud/enc_fix_moving_shared_files
...
[encryption] fix moving files to a shared folder
2015-04-24 15:07:36 +02:00
Joas Schilling
8cefc657a1
Merge pull request #15838 from owncloud/code-checker-to-ignore-tests
...
Ignore test folders when checking the code for compliance
2015-04-24 14:52:40 +02:00
Joas Schilling
411f7893bf
Add test "operation on keys failed"
2015-04-24 14:27:23 +02:00
Lukas Reschke
a2f9a2dc6d
Merge pull request #15855 from owncloud/teardownaftercommand
...
Tear down FS after running trash expire
2015-04-24 13:52:55 +02:00
Joas Schilling
781cfff221
Deduplicate data provider and fix method visibility
2015-04-24 13:12:45 +02:00
Joas Schilling
1592be117a
Use public interfaces for type hinting
2015-04-24 13:06:03 +02:00
Vincent Petry
18506387c0
Tear down FS after running trash expire
2015-04-24 12:09:09 +02:00
Jan-Christoph Borchardt
5b998e13d7
Merge pull request #15835 from owncloud/delete-permission-icon
...
Show hint if there is no delete permission
2015-04-24 11:57:47 +02:00
Bjoern Schiessle
24128d1384
only update share keys if the file was encrypted
2015-04-24 10:19:09 +02:00
Jenkins for ownCloud
33d197db29
[tx-robot] updated from transifex
2015-04-24 01:55:15 -04:00
Lukas Reschke
6fed28271b
Merge pull request #15846 from owncloud/fix-missing-loading-indicator
...
Add missing loading indicator for enabled apps
2015-04-23 23:30:09 +02:00
