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
cf71a54f5d
[tx-robot] updated from transifex
2013-06-02 02:07:21 +02:00
3013c02767
[tx-robot] updated from transifex
2013-06-01 02:03:53 +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
8761242f52
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/appinfo/app.php
2013-05-31 20:34:43 +02:00
a134ffcf2c
code optimized and cleaned up unused vars
2013-05-31 16:52:33 +02:00
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
2e3bfdb12c
check if the decrypted private key is valid on login and on read/write files
2013-05-31 13:58:58 +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
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
88d74c33af
Merge branch 'master' into files_encryption_fs_loaded_fix
2013-05-31 12:49:46 +02:00
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
4a0e69f941
fix login errors while filesystem is not loaded
2013-05-31 11:55:40 +02:00
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
96ef926161
normalize path to prevent following split to fail
2013-05-31 01:57:32 +02:00
ccdfb59426
fix legacy key in until test
2013-05-31 01:55:48 +02:00
8e324aad38
fix re-encrypt legacy files
2013-05-31 01:36:49 +02:00
986e9dd362
use legacyDecrypt to decrypt key file like the previous files_encryption
2013-05-31 01:35:48 +02:00
4f9cbadfa4
fix for autoloader while user logged in and system is in maintenance
2013-05-31 01:34:31 +02:00
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
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
6d94b393bf
fix share and un-share for single file
2013-05-30 01:38:11 +02:00
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
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
d59ae569ba
reformat code
2013-05-29 23:13:45 +02:00
838fd1a20a
changed " to '
2013-05-29 23:11:30 +02:00
ee7c4c4c93
changed l10n to full sentences
2013-05-29 20:27:12 +02:00
df41a60c50
fixed typo
2013-05-29 20:11:53 +02:00
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
d265264542
fix for share folder on external storage
2013-05-29 19:11:39 +02:00
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
5dd865a57f
changes l10n after review
2013-05-29 12:47:50 +02:00
efd629462e
changes after review
2013-05-29 12:23:33 +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
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
71a532fc4d
fixed if fopen returns false typically on external storage
2013-05-28 20:50:14 +02:00
4b4b447e2a
fixed missing convert to new session handler
2013-05-28 17:06:37 +02:00
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
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
3a76c22372
$_POST["adminEnableRecovery"] is a string
2013-05-28 10:51:12 +02:00
0041711fe3
fix for undefined index
2013-05-28 09:36:14 +02:00
6f9e425939
fix for losing private key while being logged in and accessing a public link
2013-05-28 09:27:04 +02:00
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
9c99048429
fix syntax error
2013-05-28 01:31:26 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
e1e1c58969
changed to public log api
2013-05-27 20:51:52 +02:00
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +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
c81e34ef89
replace == with ===
2013-05-27 18:03:29 +02:00
4c05259ccf
legacyBlockDecryprt() needs to be public
2013-05-27 17:35:38 +02:00
df22a7c495
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
2013-05-27 17:35:28 +02:00
8b35578833
fix migration from old to new encryption
2013-05-27 17:35:06 +02:00
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
690bf9b8c4
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
710e9c2d14
fix tests, after unused variables are removed
2013-05-27 15:34:57 +02:00
1a3f7891ea
remove unused varaibles
2013-05-27 15:31:26 +02:00
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
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
8cf827ee9d
Merge branch 'master' into file_encryption_tests
2013-05-27 12:54:33 +02:00
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
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +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
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
788c5940f0
fixed error rising from fetchRow
2013-05-25 23:20:55 +02:00
9a6cd89a69
added OC_DB::isError and logging
2013-05-25 21:33:05 +02:00
29c8cbf4d1
increase version and add warning
2013-05-25 12:08:18 +02:00
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +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
f56802a437
no use the recoveryPassword var instead of accessing the POST array
2013-05-24 18:37:58 +02:00
5ce4149e75
fix first time encryption after app was enabled
2013-05-24 17:35:00 +02:00
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
adc930d9f9
added l10n support in apps/files_encryption/ajax/adminrecovery.php
2013-05-23 22:09:28 +02:00
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
a9ebf2aabe
fix public link share if a user is logged in
2013-05-23 20:30:07 +02:00
46c784ccdf
added trash bin tests
2013-05-22 23:51:35 +02:00
80dea1a8c5
settings clean-up; There is no blacklist in the new encryption app
2013-05-22 18:05:12 +02:00
15a3ae6db1
improved error messages
2013-05-22 18:01:18 +02:00
c6722581f9
fix pgsql error
2013-05-22 02:02:42 +02:00
afbfa742d7
improved tests
2013-05-22 01:11:55 +02:00
9ca9a22c6a
fixed finding encrypted files in subfolders and removed unused code
2013-05-22 00:54:47 +02:00
095fc790ac
added webdav test
2013-05-21 21:09:39 +02:00
1deeec93b7
fixed postFileSize
2013-05-21 21:09:25 +02:00
9d324db054
fix path to 3rdparty apps
2013-05-21 12:33:32 +02:00
4c27c7e199
fix path, needs to be relative to data/
2013-05-21 12:22:03 +02:00
64591cf754
move 3rdparty dependencies to app
2013-05-21 10:30:24 +02:00
c9e862ccba
fix broken tests
2013-05-21 07:19:23 +02:00
4bf840e2ca
cleanup unused code optimize tests
2013-05-21 00:00:55 +02:00
f2b1158add
improved tests
2013-05-20 23:44:10 +02:00
1c8e5d6873
added test for failed sharing
2013-05-20 21:46:28 +02:00
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
8e0540d0e4
key creation should never override a private or public key
2013-05-20 21:22:03 +02:00
171b9a4702
added legacy encryption test
2013-05-20 21:19:28 +02:00
3b850a2524
reformat code added and changed phpdoc
2013-05-20 01:24:36 +02:00
dc39ef378e
changed recovery_enabled and migration_status columns to integer and fix tests
2013-05-20 00:38:23 +02:00
5d572c3449
update phpdoc
2013-05-19 22:31:00 +02:00
bdd2127f19
cleanup tests
2013-05-19 22:28:48 +02:00
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
2a038baee0
updated authors info
2013-05-18 22:33:31 +02:00
227b122947
fixed again key-manager tests
2013-05-18 22:25:47 +02:00
681252669a
changed migrationStatus to migration_status for pgsql
2013-05-18 22:10:00 +02:00
e0e89602a2
fixed key-manager tests
2013-05-18 22:00:35 +02:00
80f9c5bb6d
removed mockery from tests and changed class names
2013-05-18 21:37:00 +02:00
6980f59b2f
fixed typos
2013-05-18 21:12:53 +02:00
41165afa59
improved tests
2013-05-17 22:45:09 +02:00
3aa48616a6
remove unused code
2013-05-17 22:44:45 +02:00
b6572cedac
added folder move test
2013-05-17 22:16:56 +02:00
cea9208cec
fix broken legacy tests
2013-05-17 21:59:53 +02:00
e7d1fe82aa
fix path to class
2013-05-17 18:01:32 +02:00
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
002445e23d
some typo fixed
2013-05-17 14:49:54 +02:00
93771f735b
gremove unused code
2013-05-17 14:13:05 +02:00
bf04a21973
set migration status after successful upgrade
2013-05-17 13:16:52 +02:00
0b40c1d08a
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-17 11:20:17 +02:00
ca6a77d39b
upgrade from old encryption to the new one needs to generate share keys too
2013-05-17 11:15:36 +02:00
2b0bf4dc87
added tests for recovery
2013-05-17 01:07:50 +02:00
a4c0eb1756
improved tests
2013-05-17 01:07:26 +02:00
42b4963dd0
moved enable and disable recovery to Helper class for unit tests
2013-05-17 00:58:41 +02:00
3793e4d2d6
fix for recover files in subfolder
2013-05-16 22:57:55 +02:00
d40d6aa358
fix typo in addRecoveryKeys
2013-05-16 22:39:09 +02:00
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
67a80e1870
improved tests for touch
2013-05-16 00:44:40 +02:00
0fca2f8f31
added tests for put content, get content, touch and fopen
2013-05-16 00:36:40 +02:00
c651950a17
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
2013-05-16 00:34:45 +02:00
c0c4fe5fd3
fix if file is not yet created
2013-05-16 00:31:17 +02:00
8f963b95e5
added test for share with group
2013-05-16 00:30:01 +02:00
b75a0abb6b
added test for rename folder
2013-05-15 22:42:22 +02:00
ec2e193a44
removed unused code
2013-05-15 21:01:03 +02:00
5fcb5f3aba
added test for password change
2013-05-15 21:00:35 +02:00
57c0a7ed69
add recovery key to all files if the user enabled the feature and removes them again on disable
2013-05-15 17:56:45 +02:00
1a31dc036a
added missing file to enable the admin to change the recovery key password
2013-05-15 16:14:54 +02:00
1f5ed65b12
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 16:13:29 +02:00
64d94c540a
enable admin to change the recovery password
2013-05-15 16:12:20 +02:00
63a790b415
fix for broken tests
2013-05-15 14:33:08 +02:00
1fbdc3ce8f
fix for previous workaround
2013-05-15 14:32:50 +02:00
5b160edebb
check if the user knows the correct recovery password before changing the recovery key settings
2013-05-15 14:02:13 +02:00
335f2ca321
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 11:42:41 +02:00
d8ae2fa80d
only let the user change the recovery admin settings if a key passwords was entered.
2013-05-15 11:42:22 +02:00
137039d35a
workaround for blank page need an other solution
2013-05-15 10:52:23 +02:00
3d7534da74
improved files_encryption tests
2013-05-15 10:21:56 +02:00
01f1153b08
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
...
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
2013-05-15 10:18:25 +02:00
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
7461e9c2b5
improved tests and added new tests for file rename and move
2013-05-15 02:38:08 +02:00
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
ddedf20106
prevent of infinite loop with FileProxy
2013-05-15 02:34:36 +02:00
8776000754
fix for move file to an empty folder
2013-05-14 23:19:16 +02:00
0a7aa6e8cd
fix for Allowed memory size of xx bytes exhausted while reading big files
2013-05-14 22:32:39 +02:00
84c56a5d56
fix for zero size files
2013-05-14 21:29:24 +02:00
517105660d
fix for public link share
2013-05-14 20:11:07 +02:00
81ae4cb5d0
added test for public shared file via link
2013-05-14 00:00:20 +02:00
a4e9e2fc79
added post_deleteUser hook for cleanup public key
2013-05-13 22:49:27 +02:00
b2d021b2a5
added post_createUser hook
2013-05-13 22:34:11 +02:00
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +02:00
d92f6b887d
removed var_dump
2013-05-13 21:22:59 +02:00
aa3eb6bb5b
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
2013-05-13 17:40:57 +02:00
517efdf952
don't create a recovery user, only generate recovery key similar to the public link share key
2013-05-13 17:26:21 +02:00
2f4ba9d1e8
if file was shared to user than userIds is just the users Id
2013-05-13 15:45:30 +02:00
d1e2e47592
generate random key name for share key to avoid name conflicts
2013-05-13 15:15:35 +02:00
a6ef25ba08
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
2013-05-13 14:28:45 +02:00
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
8e004cc3e1
added handling for sharing with link
...
NOTE: only encryption work atm
2013-05-11 01:03:43 +02:00
33e0dfeecb
sharing with group should work now
2013-05-11 00:25:32 +02:00
e88595638c
fix for webdav
2013-05-11 00:23:30 +02:00
3eae26143f
added test for re-share folder
2013-05-10 01:00:24 +02:00
15845bf0bf
fix for autotest.sh
2013-05-09 23:22:46 +02:00
18a821b1e3
added helper
2013-05-09 23:22:22 +02:00
de855ac31b
improved tests and include helper
2013-05-09 19:37:26 +02:00
e25aa78caf
added helper class and moved hook registration to it
2013-05-09 19:36:18 +02:00
163fe64016
Fixes to code formatting and indentation
2013-05-09 18:24:07 +02:00
92e28839ff
Improvements to code formatting & indentation
2013-05-09 18:16:59 +02:00
3003dd46d1
Implemented initial recoveryAdmin functionality in crypto file proxy
2013-05-09 18:09:20 +02:00
101e037529
Fixed bugs with pre_share hook usage
...
Made sure new user being shared to is added to array of sharing users
2013-05-09 14:43:06 +02:00
28866de44b
Added pre_share hook
...
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
fdc49e7acb
added test for share folder
2013-05-07 22:56:59 +02:00
33fc830dd3
added test for re-share
2013-05-07 22:22:05 +02:00
763c8f78ed
Made code formatting of new methods more consistent
2013-05-07 17:16:16 +02:00
4b53f72d0d
Added facility to manually encrypt all files from personal settings
...
Added success/fail feedback to personal settings functions
Improved look/layout of personal settings page
Fixed misplaced plain text in ajax scripts
2013-05-07 16:17:38 +02:00
b535964006
test for share is now able to run with autotest.sh
2013-05-07 13:43:34 +02:00
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
8fcef41143
added test for share
2013-05-07 09:49:14 +02:00
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +02:00
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
c8946ea608
Added support for user-specified password for adminRecovery account in admin settings page
...
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
2013-05-04 16:14:38 +02:00
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
ba29147e34
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
...
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
3579ba1e41
Merge branch 'master' into files_encryption
...
Conflicts:
apps/user_ldap/l10n/nn_NO.php
core/l10n/es.php
core/l10n/et_EE.php
core/l10n/ja_JP.php
core/l10n/nn_NO.php
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_encryption.po
l10n/cy_GB/files_external.po
l10n/cy_GB/files_sharing.po
l10n/cy_GB/files_trashbin.po
l10n/cy_GB/lib.po
l10n/cy_GB/settings.po
l10n/de_DE/core.po
l10n/es/core.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/gl/core.po
l10n/it/core.po
l10n/ja_JP/core.po
l10n/ja_JP/settings.po
l10n/nn_NO/core.po
l10n/nn_NO/user_ldap.po
l10n/pt_BR/core.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/zh_TW/files_sharing.po
settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
06a5cf70f7
fix duplicate login behavior if user not setup
2013-05-01 02:01:16 +02:00
04b0843bb4
fixed some tests
2013-05-01 01:43:56 +02:00
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
5deba29bdf
fixed public-keys mount point error
2013-05-01 00:09:55 +02:00
b08179d406
fixed tests after merge against master
2013-04-30 23:58:53 +02:00
b2da07fe95
Merge branch 'master' into files_encryption to get the latest files_trashbin app
...
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
2013-04-30 20:53:56 +02:00
fbbc76f281
fix for sharing files
2013-04-30 20:44:42 +02:00
b1c4464eda
improved key length tests
2013-04-30 01:54:19 +02:00
27ce7845b4
fixed tests, now tests should work via autotest.sh
...
files_encryption app is now enabled in enable_all.php
2013-04-30 01:35:46 +02:00
882a747b47
rename folder to tests
2013-04-30 00:34:05 +02:00
d22795d68b
fixed test for crypt and keymanager
...
disabled encryption file proxy in test/lib/cache/file.php
2013-04-29 23:41:49 +02:00
c52fe12537
fixed missing parameter
2013-04-29 23:37:08 +02:00
4ecd62e58d
improvements for test testSymmetricStreamEncryptShortFileContent
...
this runs currently into an infinite loop
2013-04-29 09:12:43 +02:00
4a63faf64b
speed improvement
2013-04-29 01:43:59 +02:00
f9760f6521
improved file size
2013-04-27 23:34:25 +02:00
7f1f0464a8
added self healing if file get remove from file cache
2013-04-27 23:02:42 +02:00
770aebfb9e
check if file exists before fixing file size
2013-04-27 20:22:38 +02:00
ba080e0d2e
removed preRename and moved postRename to hooks.php
...
added postWrite and postTouch to fix file size and sharing keys
2013-04-27 20:21:46 +02:00
05523b76c0
fix reusing keys
...
fix webdav part files
2013-04-27 20:18:57 +02:00
d40ffc5aac
added filesystem post rename hook
2013-04-27 20:18:05 +02:00
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
813641e6e8
improved file size
...
created new method fixFileSize in Util so it can be used with files_trashbin
2013-04-27 00:05:20 +02:00
d017bbb065
fix share for renamed or moved files
2013-04-25 23:24:07 +02:00
8ee7959092
implement postRename
...
@samtuke no need anymore for fixPartialFilePath this is now handled by rename
share-keys are now handled properly
webdav .part files are handled properly
2013-04-25 22:49:47 +02:00
328dea93c7
webdav fix for file chunking
...
upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav
2013-04-25 20:23:54 +02:00
11d0eef8cc
fixed webdav errors, now webdav up - and downloads are full working
2013-04-25 15:21:11 +02:00
fac288a4ad
added unencrypted file size to file cache
...
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
170d09203f
fixed file_proxy handling
2013-04-25 14:56:11 +02:00
f8819f54c2
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-23 19:09:01 +02:00
baa6fd639f
improved file size handling
2013-04-23 19:08:52 +02:00
b7d8da87d0
Development snapshot
...
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +02:00
c6bfc7315b
Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
...
.part file paths fixed in stream{}
2013-04-23 17:36:35 +02:00
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
a1d241783e
Updated buglist
2013-04-23 14:12:28 +02:00
8ab9433fdf
fix wrong file path in proxy
2013-04-22 18:54:23 +02:00
2827004634
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 18:51:11 +02:00
37c7205941
fix wrong file path in util
2013-04-22 18:50:59 +02:00
a4364a93d0
delete all share keys if a file gets deleted
2013-04-22 15:29:58 +02:00
b5cb5dab51
fix encryption to owncloud user for public link shares
2013-04-22 14:30:10 +02:00
b57478fa27
fix comment, remove unused variable
2013-04-22 14:14:28 +02:00
bcb2e87846
check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
2013-04-22 14:13:59 +02:00
1705938848
removed some leftover code; use already existing var for path to users file folder
2013-04-22 12:32:38 +02:00
eade87dc79
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 12:32:35 +02:00
f6ac34afea
improved handling for getSharingUsersArray
2013-04-22 12:25:55 +02:00
8a46e809f0
remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
2013-04-22 12:22:07 +02:00
8790ceba25
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-04-22 11:59:26 +02:00
a2ba3c8a43
fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
2013-04-22 11:58:39 +02:00
6b47da10be
improved rename and file size support
...
fix missing user_id on write
2013-04-22 04:40:49 +02:00
9a0b73070c
Merge pull request #2992 from FlorinPeter/files_encryption
...
fix for trashbin
2013-04-20 05:35:29 -07:00
12785b93f1
make sure that all share keys get deleted if a file/folder gets unshared from a user/group
2013-04-19 13:17:08 +02:00
0e1970438b
fixed incorrect filesize, download via web is now possible
...
fixed broken file-info
2013-04-18 22:34:22 +02:00
2bd338c49f
getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
2013-04-18 20:02:27 +02:00
5a7a64df08
Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
2013-04-18 20:00:45 +02:00
935d039860
necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() ( fe58e4b1a6)
2013-04-18 17:53:59 +02:00
39c717b24c
some fixes to the keymanager class to identify the file owner and the owner path correctly.
2013-04-18 17:52:27 +02:00
1df36e0c88
rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud
2013-04-18 16:39:00 +02:00
Björn Schießle
Jenkins for ownCloud
Florin Peter
Robin Appelman
Björn Schießle
Frank Karlitschek
Sam Tuke