97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
4d1086c35f
better error detection and don't use glob()
2014-01-31 20:39:11 +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
009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
16b484209c
Merge branch 'master' into encryption_work_with_public_gallery
...
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
2013-11-21 10:33:37 +01:00
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
b9c18d16fe
make sure that we always use the correct user id
2013-11-20 23:23:23 +01:00
c5cb4206f5
[wip] make encryption work with public gallery sharing
2013-11-20 18:10:56 +01:00
0c24c7c420
only check if the key file exists to decide if it is an encrypted file or not.
...
This solves problems with external storage which doesn't support fseek
2013-11-20 11:02:22 +01:00
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
9f10f15fd4
fixing tests for the new part file handling
2013-11-12 10:24:10 +01:00
802213f7ec
let encryption app detect transfer id in path and handle it correctly
2013-11-11 17:47:59 +01:00
71bbb2ea8b
check if key exists before reading it
2013-09-25 17:44:05 +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
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +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
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
3043dbfb95
delete file keys from the correct location
2013-07-05 15:59:46 +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
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
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
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +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
9ca9a22c6a
fixed finding encrypted files in subfolders and removed unused code
2013-05-22 00:54:47 +02:00
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
3b850a2524
reformat code added and changed phpdoc
2013-05-20 01:24:36 +02:00
5d572c3449
update phpdoc
2013-05-19 22:31:00 +02:00
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
61ed347d26
added handling for public file access via files_sharing link
2013-05-13 21:24:59 +02:00
163fe64016
Fixes to code formatting and indentation
2013-05-09 18:24:07 +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
05523b76c0
fix reusing keys
...
fix webdav part files
2013-04-27 20:18:57 +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
170d09203f
fixed file_proxy handling
2013-04-25 14:56:11 +02:00
b7d8da87d0
Development snapshot
...
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +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
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
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
40905c8941
fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it
2013-04-18 16:34:23 +02:00
f89a3604aa
Working on stream{} writing
...
Development snapshot
2013-04-16 18:29:22 +02:00
f87229ddaf
fix stream wrapper to make initial encryption work
2013-04-12 14:13:38 +02:00
Bjoern Schiessle
kondou
Florin Peter
Sam Tuke