Tomaz Canabrava
7d68fa17e7
Merge pull request #107 from dantti/clientSideEncryptionV3
...
Prepend "nextcloud" for all logging categories
2017-12-29 11:52:40 +01:00
Jenkins for ownCloud
b80ba97154
[tx-robot] updated from transifex
2017-12-29 02:18:34 +01:00
Daniel Nicoletti
a63d34f870
Prepend "nextcloud" for all logging categories
...
Thus making easier to exclude logging from kio, qt
and only enable "nextcloud.*"
2017-12-28 17:33:10 -02:00
Tomaz Canabrava
c772857054
Merge pull request #106 from dantti/clientSideEncryptionV3
...
Fix URL in dialog that requests password
2017-12-28 13:08:33 +01:00
Daniel Nicoletti
c963259bfb
Fix URL in dialog that requests password
...
An URL that had base like "http://localhost/nextcloud/ "
would get the last slash '/' removed and then appended
with "index.php..." resulting in
http://localhost/nextcloudindex.php
2017-12-28 10:00:17 -02:00
Jenkins for ownCloud
e3e38f3eac
[tx-robot] updated from transifex
2017-12-28 02:18:36 +01:00
Jürgen Weigert
6e445033c7
OBS publishing details added
...
OBS has two pubishing swithces: one per package and one per project,
we always only switch per project! we have too many dependency packages to keep that in sync manually!
2017-12-27 12:37:02 +01:00
Jenkins for ownCloud
93c9f4316b
[tx-robot] updated from transifex
2017-12-27 02:18:35 +01:00
Jenkins for ownCloud
47a7000121
[tx-robot] updated from transifex
2017-12-26 02:18:36 +01:00
Jenkins for ownCloud
6c9026e330
[tx-robot] updated from transifex
2017-12-25 02:18:36 +01:00
Tomaz Canabrava
efc039863b
[CSE] Tons of debugs.
2017-12-24 17:08:04 +01:00
Tomaz Canabrava
da9f1c412d
[CSE] Remove debug
2017-12-24 16:36:57 +01:00
Tomaz Canabrava
06c34ed617
[CSE] Assorted fixes
...
- Unlock the folder even on error
- Use the correct name of the file for upload
2017-12-24 16:30:39 +01:00
Jenkins for ownCloud
d59c609a73
[tx-robot] updated from transifex
2017-12-24 02:18:35 +01:00
Jenkins for ownCloud
6ee48c8f15
[tx-robot] updated from transifex
2017-12-23 02:18:34 +01:00
Tomaz Canabrava
60ef722b60
[CSE] Update the metadata when a file is being uploaded.
2017-12-22 23:05:39 +01:00
Tomaz Canabrava
e70bf44aaf
[CSE] Fix the generation of the data for the update Metadata
2017-12-22 22:39:45 +01:00
Tomaz Canabrava
124a7253a4
[CSE] Create job to Update Metadata
2017-12-22 22:02:16 +01:00
Jenkins for ownCloud
6af823b36a
[tx-robot] updated from transifex
2017-12-22 02:18:56 +01:00
Olivier Goffart
a642d99d4b
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
VERSION.cmake
src/CMakeLists.txt
2017-12-21 12:51:01 +01:00
Roeland Jago Douma
65dfc47ac7
Set public key once certificate is retrieved
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-21 10:20:03 +01:00
Roeland Jago Douma
0dc7831336
Key is already base64 decoded
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-21 09:49:31 +01:00
Jenkins for ownCloud
8c7ea61623
[tx-robot] updated from transifex
2017-12-21 02:18:35 +01:00
Tomaz Canabrava
b72113a53d
[CSE] Prepare the beginning of the upload.
...
I still need to send the metadata.
2017-12-21 00:35:23 +01:00
Tomaz Canabrava
df5fd3fbe6
[CSE] More debug output, fix input file path
2017-12-21 00:00:27 +01:00
Tomaz Canabrava
7be5f0a736
[CSE] Update the finished signal
2017-12-20 23:36:49 +01:00
Tomaz Canabrava
d87648c99a
[CSE] Use the metadata as pointer.
2017-12-20 23:30:51 +01:00
Tomaz Canabrava
25d58ccd58
Revert "Store metadata keys as keys"
...
This commit broke decryption.
This reverts commit b9f094cd94
2017-12-20 23:16:42 +01:00
Tomaz Canabrava
dd0528037d
[CSE] Generate a random name for the temporary file
2017-12-20 23:09:28 +01:00
Tomaz Canabrava
7e83f0591b
[CSE] Create the Encrypted File on Disk
2017-12-20 22:32:38 +01:00
Tomaz Canabrava
3760b86e07
[CSE] Mobe fileEncryption to a static function
...
and I'll move all of those to a namespace latter.
2017-12-20 22:28:01 +01:00
Tomaz Canabrava
20198c5c7b
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-20 22:11:46 +01:00
Roeland Jago Douma
3c301a8282
Add missing FolderMetadata functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 22:08:57 +01:00
Roeland Jago Douma
74bc9213c5
Generate encrypted metadata on the fly
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 22:04:26 +01:00
Tomaz Canabrava
679bb1f18e
[CSE] Expose EncryptionHelper
2017-12-20 21:33:25 +01:00
Tomaz Canabrava
14b18b146d
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-20 21:29:54 +01:00
Roeland Jago Douma
5e23ca9658
FolderMetaData: store metadataKeys in a QMap
...
* This allows us to pick the right key for files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 21:25:27 +01:00
Roeland Jago Douma
b9f094cd94
Store metadata keys as keys
...
Don't store them base64 encoded. But store them directly useable
2017-12-20 21:17:41 +01:00
Roeland Jago Douma
c35b57cfba
Parse the files in the metadata
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 20:49:16 +01:00
Tomaz Canabrava
1e899f4172
[CSE] Do not create QPointer from raw pointers
2017-12-20 20:00:59 +01:00
Tomaz Canabrava
0347cf4e9e
[CSE] Store the sharing keys in memory
2017-12-20 19:40:58 +01:00
Roeland Jago Douma
fc73ad7476
Salt should not be hardcoded
...
We append the salt (just like the IV) to the ciphertext of the private
key. This means we also have to split it off properly.
This breaks compartibility with currently stored keys on your server.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 16:07:33 +01:00
Markus Goetz
067508c082
VERSION.cmake: This branch is now 2.4.1
2017-12-20 16:03:35 +01:00
Roeland Jago Douma
b924ad7282
Lower mnemonic when generating password
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 15:41:38 +01:00
Roeland Jago Douma
4551bbe0e0
Forget key + cert + mnemonic on account removal
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 15:35:23 +01:00
Roeland Jago Douma
a48a3e0acc
Cleanup old functions
...
Those functions had no use anymore since we store the key and cert in
the keychain. Removed them so we don't use them by accident.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 13:41:13 +01:00
Roeland Jago Douma
ee281963fe
Base64 magic:
...
* metadata keys: bin -> b64 -> enc -> b64
* sharing metadat: string -> b64 -> enc -> b64
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 10:22:35 +01:00
Jenkins for ownCloud
79065ba5c6
[tx-robot] updated from transifex
2017-12-20 02:18:53 +01:00
Tomaz Canabrava
ab89231ca2
[CSE] Remove unused debug
2017-12-20 00:25:56 +01:00
Tomaz Canabrava
d26ade1870
[CSE] Fix the result of the decryption
...
However the text still looks like encrypted.
2017-12-20 00:25:39 +01:00
