1e631754d7
Fix share key finding algorithm in various cases
...
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.
This covers the following cases:
- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
2014-09-23 12:33:07 +02:00
ff6c5331e9
Merge pull request #11224 from owncloud/fix_recovery_admin_user
...
first check if a private key exists, if not it is always a recovery szenario
2014-09-23 10:13:58 +02:00
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
70937dabcd
Merge pull request #11167 from owncloud/env-movetomountreenableproxy
...
Reenable file proxy when renaming between mount points
2014-09-22 16:30:19 +02:00
744110905b
first check if a private key exists, if not it is always a recovery szenario
2014-09-22 15:05:03 +02:00
01808c8c84
fix typo
2014-09-19 18:22:09 +02:00
fb033cce98
Merge pull request #11104 from owncloud/enc_create_backup_on_recovery
...
[encryption] create backup from all keys before recovery
2014-09-19 16:40:19 +02:00
a280859bf8
make sure that we really catch the files folder only
2014-09-19 11:47:18 +02:00
2ee14c4734
create backup from all keys before recovery
2014-09-19 11:47:18 +02:00
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
f2a01dddbc
Reenable file proxy when renaming between mount points
...
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.
In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
2014-09-18 19:21:04 +02:00
112e570989
Merge pull request #11141 from owncloud/update_encrytionlink
...
update encryption doc link
2014-09-18 18:19:53 +02:00
ccaea93d6b
update encryption doc link
...
I don't know how we missed to update this :/
update ldap doc link
2014-09-18 18:14:51 +02:00
338db48c0b
Merge pull request #9541 from owncloud/force_loading_of_encryption_app
...
force loading of encryption app to show correct error
2014-09-18 09:04:53 +02:00
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
14571d4103
force loading of encryption app
2014-09-17 17:13:25 +02:00
2a89bc7b51
[tx-robot] updated from transifex
2014-09-17 01:55:27 -04:00
1e6ac31bde
[tx-robot] updated from transifex
2014-09-16 01:54:33 -04:00
90e91a9d10
Merge pull request #11050 from owncloud/enc-flockfix
...
Remove passing by reference to allow for proper GC
2014-09-15 00:31:10 +02:00
da9f9ae9b3
Remove passing by reference to allow for proper GC
...
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.
This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-12 19:51:47 +02:00
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
0736a6695e
[tx-robot] updated from transifex
2014-09-05 01:54:39 -04:00
8787162ec9
[tx-robot] updated from transifex
2014-09-03 01:54:34 -04:00
724ff6264a
Remove unneeded file initialization in encryption, already handled in a hook
2014-09-02 16:15:42 +02:00
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
53f3b7ab52
[tx-robot] updated from transifex
2014-08-30 01:57:04 -04:00
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
ba8eed0788
Better description to prevent people from misunderstanding the use case
2014-08-21 12:05:56 +02:00
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
520ee969f2
Add routing to files_encryption
2014-08-19 15:23:45 +02:00
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
283b99a42d
Merge pull request #10276 from owncloud/skip-webdavput
...
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
5a2fef4309
login as user1 before performing a test
2014-08-15 15:48:44 +02:00
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
67b7160e7b
[tx-robot] updated from transifex
2014-08-14 01:55:35 -04:00
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
f282a5cff0
Merge pull request #9754 from owncloud/enc_support_aes_256
...
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
609a52ebe2
[tx-robot] updated from transifex
2014-08-13 01:54:44 -04:00
d4eaa74b76
fixes from git push force
2014-08-12 21:29:05 +02:00
53c5a84eac
add unit tests
2014-08-12 21:15:39 +02:00
da1feafc78
fix detection of system wide mount points
2014-08-12 21:14:22 +02:00
e4221869c2
[tx-robot] updated from transifex
2014-08-12 01:56:16 -04:00
4dd9414f2c
Transifex suggestion by mnestis
2014-08-11 21:31:15 +02:00
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
e15b4d08a6
Disable encryption migration tests
2014-08-05 18:35:53 +02:00
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
1a797f90bb
add unit test for rename and copy operation
2014-07-30 15:14:01 +02:00
c738f71657
make the versions and encryption app aware of the copy operation
2014-07-30 15:14:01 +02:00
2946a63f6b
Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook
...
[encryption] define type in pre hook
2014-07-29 16:29:28 +02:00
f7d60f1190
Merge pull request #9951 from owncloud/enc_inproved_error_messages
...
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-29 16:27:24 +02:00
de4233bc1c
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-28 11:31:06 +02:00
9a4d2871eb
[tx-robot] updated from transifex
2014-07-27 01:54:31 -04:00
ffa6b33047
add unit test for aes256/aes128
2014-07-23 12:14:02 +02:00
de9d3797ff
update existing unit tests
2014-07-23 12:14:02 +02:00
4bbdcfbccf
support aes 256
2014-07-23 12:14:01 +02:00
ddc85a9871
[tx-robot] updated from transifex
2014-07-20 01:54:40 -04:00
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
b5cb1cfe4e
define type in pre hook
2014-07-18 14:34:04 +02:00
78b13de4bf
check that the file proxies are enabled after each test
2014-07-17 11:22:22 +02:00
6e447b6724
update keys recursively if a folder was moved
2014-07-17 11:22:22 +02:00
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
cbf3e2b829
Merge pull request #9662 from owncloud/enc_error_handling_master
...
[encryption] improved error handling
2014-07-16 15:31:20 +02:00
5a33c9c360
Removed legacy encryption tests
2014-07-16 12:38:41 +02:00
8105f2ac8a
introduce some encryption exceptions and catch additional error cases
2014-07-16 12:36:30 +02:00
de69c05f99
make sure that the crypt library is loaded
2014-07-16 12:10:52 +02:00
10a29556b0
- Added test to trigger index id error
...
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
d7b8e3209b
[tx-robot] updated from transifex
2014-07-13 01:54:35 -04:00
9fa28aa3f4
Disable legacy encryption tests
...
It seems these tests are not needed any more, but will now be skipped
instead until the case is cleared out.
2014-07-11 15:20:58 +02:00
b8c2e644cc
remove pointless require of Blowfish.php
2014-07-10 16:42:21 +02:00
064ac77e44
Kill legacy encryption migration
2014-07-08 13:07:05 +02:00
e5e8e28ae7
add ocsids to info.xml
2014-07-07 17:11:50 +02:00
a468687682
Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
...
[encryption] always take unencrypted size
2014-07-06 10:38:06 -04:00
23e0ef6ed0
[tx-robot] updated from transifex
2014-07-05 01:56:33 -04:00
5397101e1c
improved unit tests
2014-07-04 17:37:35 +02:00
ddac446c5b
always take unencrypted size
2014-07-04 16:44:50 +02:00
673b0f5eb9
add owner as parameter for delShareKey
2014-07-04 12:19:59 +02:00
e9f5730869
make sure that the umount hook always contains the path relative to data/user/files
2014-07-04 10:34:54 +02:00
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
f3973c1c20
Merge pull request #9240 from owncloud/enc_check_if_file_exists
...
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
618c9fd033
improved error message
2014-06-30 16:28:40 +02:00
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
d5462fdb50
Merge pull request #9265 from owncloud/fix-whitespace
...
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
26d0978993
[tx-robot] updated from transifex
2014-06-28 01:54:54 -04:00
1004836fd3
unit tests
2014-06-27 23:09:31 +02:00
e4c45b5e26
check if file exists before deleting keys, and add debug output for every
...
delete operation
2014-06-27 23:09:31 +02:00
706a8ace58
normalize path before comparison to make sure that we always find the mount point
2014-06-27 22:53:26 +02:00
b7cb4f5a63
fix trailing whitespace noted by Scrutinizer
2014-06-27 18:25:56 +02:00
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
aabee3e4b0
Merge pull request #9171 from owncloud/enc_always_use_oc_view
...
[encryption] always use oc view
2014-06-26 15:11:08 +02:00
a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
d3d1955ef4
fix unit tests
2014-06-25 12:38:26 +02:00
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
3d0805f27d
always use a \OC\Files\View
2014-06-25 12:27:30 +02:00
709691548d
always use oc filesystem for rename operation
2014-06-25 12:27:30 +02:00
9c45a3196b
add unit tests
2014-06-24 10:43:07 +02:00
6b85fe819c
always use '/' as directory seperator
2014-06-24 09:29:11 +02:00
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
1973fdb11d
Merge pull request #9093 from owncloud/remove_unused_code
...
remove unused code
2014-06-19 01:17:36 +02:00
edbc6b5db1
Merge pull request #9068 from owncloud/trashbin_unittests_master
...
fix trash bin expire operation and add unit tests
2014-06-18 15:32:16 +02:00
bcc88be4c7
adjust encryption tests to the trash bin changes
2014-06-18 14:41:16 +02:00
e20bb71a42
remove unused code
2014-06-18 13:26:42 +02:00
a921ad8925
fix rename of encryption keys
2014-06-18 12:19:33 +02:00
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
790d51ea1e
Fix checking for external share in encryption
2014-06-14 10:14:07 +02:00
277f25222a
if file doesn't exist, check parent folder
2014-06-14 10:14:07 +02:00
c580aeb455
exclude mounted server-to-server shares from encryption
2014-06-14 10:14:07 +02:00
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
4cef7f9d4b
disable failing tests
2014-06-11 17:21:57 +02:00
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
cf5eb0fef5
remove unused variable
2014-06-06 09:56:00 +02:00
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
e9011a8c55
adding unit tests for encryption data migration
2014-06-05 16:54:04 +02:00
eb29b2984c
use oc_preferences instead of oc_encryption to store encyption settings
2014-06-05 16:54:04 +02:00
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
917f389747
workaround to get the unit test going
2014-06-04 08:21:28 +02:00
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
2c8288d8f9
get the storage from the view
2014-06-04 07:55:46 +02:00
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
e6712bc12e
make sure to close the stream at the end of each test
2014-06-04 07:55:45 +02:00
d3e830e938
Merge pull request #8729 from owncloud/add-phpseclib-master
...
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
17cbfc714a
use phpseclib from 3rdparty
...
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
390d8e53b4
Merge pull request #8676 from owncloud/encryption_improvements
...
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +02:00
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
32a50563d3
Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
...
get mount point from mount manager
2014-05-29 17:52:28 +01:00
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
9ed5083efd
get mount point from mount manager
2014-05-28 17:28:31 +02:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
4e2cdb2f8a
Merge pull request #8713 from owncloud/typo-files-encr
...
fix grammar
2014-05-27 23:03:32 +02:00
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
59125cb796
fix grammar
2014-05-25 20:42:52 +02:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
9b23a210c9
Merge pull request #8637 from owncloud/enc_improved_error_handling
...
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
d9f715bdad
only start migration if the encryption was initialized; allow to overwrite keys if no files exists
2014-05-19 15:53:50 +02:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
58857b8df5
@returns -> @return
2014-05-13 19:09:15 +01:00
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
57b671ebec
only update the values which really changed
2014-04-30 12:48:16 +02:00
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
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04: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
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
a6de5efbab
Merge pull request #7978 from owncloud/enc_cleanup
...
there is no need to re-calculate the shares after a touch
2014-04-02 18:23:33 +02:00
1782dcbb50
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
...
always encrypt files to owner
2014-04-02 13:20:51 +02:00
Vincent Petry
Lukas Reschke
Jenkins for ownCloud
Morris Jobke
Bjoern Schiessle
Volkan Gezer
Robin Appelman
Jörn Friedrich Dreyer
blizzz
Bernhard Posselt
Volkan Gezer
Thomas Müller
Georg Ehrke
Frank Karlitschek
Jan-Christoph Borchardt
icewind1991
Robin McCorkell
Lukas Reschke