Bjoern Schiessle
efe7c4075a
fix path reconstruction for reshares
2013-11-27 23:26:04 +01:00
Bjoern Schiessle
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
Thomas Müller
5b7b053634
Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
...
Encryption work with public gallery
2013-11-27 04:25:54 -08:00
Bjoern Schiessle
7f2bdb0e97
typo fixed
2013-11-27 12:25:04 +01:00
Bjoern Schiessle
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Jenkins for ownCloud
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
Bjoern Schiessle
49038545f8
Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery
2013-11-25 10:29:53 +01:00
Bjoern Schiessle
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
Thomas Mueller
2a465fb20f
Merge branch 'master' into encryption_work_with_public_gallery
2013-11-24 23:20:46 +01:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Jenkins for ownCloud
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
Bjoern Schiessle
6443e570c2
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 16:00:21 +01:00
Bjoern Schiessle
d2e6f7d979
check HTTP Referer to check if we come from public.php or from a internal page.
...
Necessary to detect public access also if a user is logged in.
2013-11-21 15:57:49 +01:00
Bjoern Schiessle
87f2696e6a
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 11:18:53 +01:00
Bjoern Schiessle
c7dc6dc2c2
fix getFileKey() call
2013-11-21 11:11:15 +01:00
Bjoern Schiessle
009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
18c80e47b6
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-11-21 10:24:47 +01:00
Bjoern Schiessle
2b361ea085
better distinction between userID and keyId
2013-11-21 10:09:07 +01:00
Bjoern Schiessle
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
Bjoern Schiessle
318db64b2d
adapt tests to the new code
2013-11-20 23:27:42 +01:00
Bjoern Schiessle
b9c18d16fe
make sure that we always use the correct user id
2013-11-20 23:23:23 +01:00
Bjoern Schiessle
e11afd3066
fix some getShareKey() and getFileKey() calls
2013-11-20 22:44:23 +01:00
Bjoern Schiessle
c5cb4206f5
[wip] make encryption work with public gallery sharing
2013-11-20 18:10:56 +01:00
Vincent Petry
5de5c317c1
Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset
...
Fix for extstorage + encryption where unencrypted size is not kept
2013-11-20 09:04:37 -08:00
Vincent Petry
fe44024868
Fix for extstorage + encryption where unencrypted size is not kept
...
Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
2013-11-20 16:22:55 +01:00
Bjoern Schiessle
f3e2a63712
check if it is a cached file or a version to resolve the correct path to the file key
2013-11-20 12:34:23 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
b823505bd1
make sure that the owners home is mounted correctly
2013-11-19 18:28:51 +01:00
Vincent Petry
d306f5c4cf
Merge pull request #5908 from owncloud/fix_errorpage_call
...
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
Bjoern Schiessle
82f30d37ca
call error page with session as parameter
2013-11-17 13:23:07 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Björn Schießle
3ad546002f
Merge pull request #5833 from owncloud/encryption_fixes
...
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
Bjoern Schiessle
f36ee69855
tests added
2013-11-15 16:49:50 +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
2624a6cb32
remove debug output
2013-11-14 12:13:22 +01:00
Bjoern Schiessle
2df3763675
test encryptAll() and decryptAll() to make sure that mtime and etag stay the same
2013-11-14 12:11:21 +01:00
Bjoern Schiessle
222fa88eec
Merge branch 'master' into encryption_fixes
2013-11-13 12:11:12 +01:00
Vincent Petry
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Bjoern Schiessle
dd0ebcede2
fixPartialFilePath() is now stripPartialFileExtension()
2013-11-12 18:48:31 +01:00
Bjoern Schiessle
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
Bjoern Schiessle
e2fb8d7128
only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry
2013-11-12 15:55:59 +01:00
Bjoern Schiessle
894856ce01
make sure that we keep the correct timestamp and etag after encryoption/decryption
2013-11-12 15:51:51 +01:00
Bjoern Schiessle
fcbb5d6cb3
missed some replacements... now tests should work
2013-11-12 11:17:34 +01:00
Bjoern Schiessle
9f10f15fd4
fixing tests for the new part file handling
2013-11-12 10:24:10 +01:00
Bjoern Schiessle
802213f7ec
let encryption app detect transfer id in path and handle it correctly
2013-11-11 17:47:59 +01:00
Jenkins for ownCloud
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
Jenkins for ownCloud
263603aa4c
[tx-robot] updated from transifex
2013-11-06 21:44:36 -05:00
Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
