wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15042 commits 157 branches 562 tags 714 MiB
Commit graph

146 commits

Author SHA1 Message Date
Bjoern Schiessle
c5cb4206f5 [wip] make encryption work with public gallery sharing 2013-11-20 18:10:56 +01:00
Bjoern Schiessle
faa08da944 instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list 2013-11-14 17:32:21 +01:00
Bjoern Schiessle
9f10f15fd4 fixing tests for the new part file handling 2013-11-12 10:24:10 +01:00
Björn Schießle
9f8d52ee44 Merge pull request #5329 from owncloud/enc_fix_unencrypted_size 
try to fix unencrypted file size if it doesn't look plausible
 2013-10-16 02:25:28 -07:00
Bjoern Schiessle
6bfd8bdf63 revert last changes 2013-10-16 11:24:56 +02:00
Bjoern Schiessle
0811d2e304 added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong 2013-10-15 17:52:06 +02:00
Bjoern Schiessle
d3af7a9aa4 check if we are writing to user/files, otherwise skip encryption 2013-10-14 17:13:14 +02:00
Bjoern Schiessle
58196304b8 fix array key 2013-10-14 16:43:18 +02:00
Bjoern Schiessle
4151fd3ed9 try to fix unencrypted file size if it doesn't look plausible 2013-10-14 16:34:14 +02:00
Bjoern Schiessle
909af2b62e don't cache if the encryption is enabled, this can lead to problems during unit testing 2013-10-10 15:02:52 +02:00
Bjoern Schiessle
62b8c36a40 check if encryption app is enabled before trying to calculate file size 2013-09-26 16:27:14 +02:00
Bjoern Schiessle
0b98427536 fix check if app is enabled 2013-09-25 19:23:07 +02:00
Bjoern Schiessle
223d3c91d6 use path relative to data/ 2013-07-30 10:14:17 +02:00
Björn Schießle
2c8e5ec84f user interface to allow user to decrypt all his files once the encryption app was disabled 
Conflicts:
	settings/templates/personal.php
 2013-07-29 13:36:06 +02:00
Florin Peter
1bfe975938 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/lib/util.php
 2013-05-31 12:58:12 +02:00
Florin Peter
96ef926161 normalize path to prevent following split to fail 2013-05-31 01:57:32 +02:00
Florin Peter
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
Florin Peter
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
Florin Peter
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
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Florin Peter
e1e1c58969 changed to public log api 2013-05-27 20:51:52 +02:00
Florin Peter
7224fc98b2 replace == with === and replace != with !== 2013-05-27 20:44:38 +02:00
Björn Schießle
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
Björn Schießle
df22a7c495 make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 17:35:28 +02:00
Florin Peter
5d32e214b7 reformat code 2013-05-27 17:26:58 +02:00
Florin Peter
6c8de5ae6d fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
Florin Peter
afbfa742d7 improved tests 2013-05-22 01:11:55 +02:00
Florin Peter
9ca9a22c6a fixed finding encrypted files in subfolders and removed unused code 2013-05-22 00:54:47 +02:00
Florin Peter
1deeec93b7 fixed postFileSize 2013-05-21 21:09:25 +02:00
Björn Schießle
4c27c7e199 fix path, needs to be relative to data/ 2013-05-21 12:22:03 +02:00
Florin Peter
3b850a2524 reformat code added and changed phpdoc 2013-05-20 01:24:36 +02:00
Florin Peter
c0c4fe5fd3 fix if file is not yet created 2013-05-16 00:31:17 +02:00
Björn Schießle
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
Florin Peter
e88595638c fix for webdav 2013-05-11 00:23:30 +02:00
Sam Tuke
3003dd46d1 Implemented initial recoveryAdmin functionality in crypto file proxy 2013-05-09 18:09:20 +02:00
Florin Peter
a9649713d3 fix empty path 2013-05-07 13:42:08 +02:00
Florin Peter
fbbc76f281 fix for sharing files 2013-04-30 20:44:42 +02:00
Florin Peter
7f1f0464a8 added self healing if file get remove from file cache 2013-04-27 23:02:42 +02:00
Florin Peter
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
Florin Peter
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
Florin Peter
d017bbb065 fix share for renamed or moved files 2013-04-25 23:24:07 +02:00
Florin Peter
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
Florin Peter
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
Florin Peter
fac288a4ad added unencrypted file size to file cache 
improved file size calculation and speeds
 2013-04-25 15:20:06 +02:00
Florin Peter
f8819f54c2 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-23 19:09:01 +02:00
Florin Peter
baa6fd639f improved file size handling 2013-04-23 19:08:52 +02:00
Sam Tuke
b7d8da87d0 Development snapshot 
working on stream handling (large files) in Util->encryptAll()
 2013-04-23 18:41:01 +02:00
Sam Tuke
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
Florin Peter
8ab9433fdf fix wrong file path in proxy 2013-04-22 18:54:23 +02:00