Roeland Jago Douma
131fd4e483
Fix encryptJSON and descryptJSON
...
Now working with tag
Basically we called EVP_*Update to much which resulted in weird output.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-03 18:00:05 +01:00
Tomaz Canabrava
be9cd358d4
[CSE] Bypass Qt DELETE Bug
...
It appears that Qt implementation of the DELETE http request
does not send bodyData, and we need that for Nextcloud.
Currently I changed the http request on the server side
to accept a POST instead of a DELETE, so I can actually
develop.
Also, I already poked the Qt developers that did this code.
2017-11-03 17:00:28 +01:00
Tomaz Canabrava
6ad6852045
[CSE] Cleanup - remove commented metadata.
2017-11-03 16:59:39 +01:00
Tomaz Canabrava
832cbef8e7
[CMAKE] Bump minimum version to 3.2
...
Removes a lot of warnings.
2017-11-03 15:43:57 +01:00
Tomaz Canabrava
5514f14e88
[CSE] Get and send the lock - token
2017-11-03 15:12:12 +01:00
Tomaz Canabrava
ea9e2135a1
[CSE] Remove uneeded comments.
2017-11-03 14:28:13 +01:00
Tomaz Canabrava
b53003792f
[CSE] Removed lambdas for Metadata / Lock / Unlock
2017-11-03 12:34:30 +01:00
Tomaz Canabrava
6facd29663
[CSE] Start to break the lambdas
...
Lambda within a lambda is a terrible idea,
Use default signal / slot connections with a
method instead.
2017-11-03 12:00:25 +01:00
Tomaz Canabrava
3b157caf09
[CSE] Handle encrypt / lock / unlock
2017-11-03 11:21:01 +01:00
Tomaz Canabrava
d7e05c9b05
[CSE] Comment out broken code.
...
But why it's broken?
2017-11-03 11:20:44 +01:00
Christian Kamm
3608114ec1
Journal: Fix low-disk space errors
...
Fixes a regression from 4dbe9d4113
2017-11-03 10:44:47 +01:00
Christian Kamm
c9d5a9cea2
HttpCreds: Don't create empty client cert keychain entries #5752
...
This doesn't do anything about deleting the client cert keychain
entries when the whole account is removed though.
2017-11-03 10:28:56 +01:00
Jenkins for ownCloud
354cdfdbc1
[tx-robot] updated from transifex
2017-11-03 02:19:05 +01:00
Jürgen Weigert
d903afc4bf
Adding post-release checks to template ( #6109 )
...
copied 3 items from https://github.com/owncloud/client/issues/5889
2017-11-02 16:57:02 +01:00
Christian Kamm
4dbe9d4113
Journal: Don't crash if the db file is readonly #6050
...
Surprisingly sqlite3_open_v2() returns ok on readonly files with
SQLITE_OPEN_READWRITE. Probably due to the journal mode?
2017-11-02 16:36:51 +01:00
Roeland Jago Douma
8e3e3a4575
Be java compatible and store the tag at the end of the cipher text
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-02 12:39:42 +01:00
Christian Kamm
c743cc171a
Client certs: Improve error message #6128
...
"Could not load certificate" can very well just be a bad password.
2017-11-02 11:30:44 +01:00
Jenkins for ownCloud
7963a8322d
[tx-robot] updated from transifex
2017-11-02 02:18:48 +01:00
Tomaz Canabrava
8d537fdd3c
[CSE] Get Metadata from the server
2017-11-01 18:32:33 +01:00
Tomaz Canabrava
4a66cf11d2
[CSE] Send Metadata to the server
2017-11-01 18:21:30 +01:00
Tomaz Canabrava
2698759525
[CSE] Implement the Folder Unlock api job
2017-11-01 17:54:17 +01:00
Tomaz Canabrava
1b1add5ead
[CSE] Add api to lock file
2017-11-01 17:36:54 +01:00
Christian Kamm
6ac44f05cd
Credentials: Namespace windows cred keys #6125
...
The application name is prepended to the key. QtKeychain doesn't
do that automatically on the platform.
2017-11-01 17:03:30 +01:00
Tomaz Canabrava
e5fdcd2f38
[CSE] Add TODO:
2017-11-01 16:48:19 +01:00
Tomaz Canabrava
ef2529ca44
[CSE] Set padding to 0 for the Rsa encryption
...
Also, commented out the finalization of the decrypt operation
because that was messing with the encryption. There's something
wrong here but I need to get this working and I can fix stuff
later.
2017-11-01 16:13:17 +01:00
Christian Kamm
64a84fda38
Wizard: Don't report confusing error message #6116
...
For historical reasons CheckServerJob doesn't just check url/ but also
url/owncloud/. However, that means if url/status.php is a 404 and
url/owncloud/status.php is a 404, the user will see the latter url
appear in the error message. That's potentially confusing.
Instead, just show the account url which will be closer to what the
user typed into the account wizard, while being adjusted for protocol
and possible redirects.
2017-11-01 15:57:58 +01:00
Tomaz Canabrava
1a891423e5
[CSE] Call the decryption function to test.
2017-11-01 15:48:40 +01:00
Tomaz Canabrava
41ebcd0b7e
[CSE] Decryption of the metadata blob
2017-11-01 15:29:14 +01:00
Tomaz Canabrava
77ec3b086d
[CSE] Remember to finalize encryption
2017-11-01 15:24:19 +01:00
Tomaz Canabrava
88d87bf0ca
[CSE] Convert encrypted bitearray to Base64
...
also, start the decrypt.
2017-11-01 14:46:32 +01:00
Jenkins for ownCloud
8eec79680c
[tx-robot] updated from transifex
2017-11-01 02:19:02 +01:00
Tomaz Canabrava
eb43fa1459
[CSE] Internal metadata encryption working
2017-10-31 17:52:01 +01:00
Tomaz Canabrava
8793fdbc69
[CSE] Remember to actually use the correct variable
2017-10-31 16:06:01 +01:00
Tomaz Canabrava
4bb7ebb6aa
[CSE] Convert the base64 data to raw, for the decyrption
2017-10-31 13:17:22 +01:00
Tomaz Canabrava
3628f3739d
[CSE] Start the decryption of the metadata
2017-10-31 13:06:20 +01:00
Tomaz Canabrava
b28b4705de
[CSE] Correctly store the encrypted metadata
...
Missing the conversion to base64.
2017-10-31 12:07:47 +01:00
Tomaz Canabrava
560ce958de
[CSE] Remove warning.
2017-10-31 11:24:10 +01:00
Tomaz Canabrava
69d73162aa
[CSE] functions for encrypt / decrypt folder
...
The code was scattered around the slot for the context
menu request and had already too many indentation levels.
2017-10-31 11:09:34 +01:00
Tomaz Canabrava
69dc099b17
[CSE] Dedicated function for the subfolder menu
2017-10-31 11:03:24 +01:00
Tomaz Canabrava
c7d9abbea3
[CSE] Rework pubkeyPath to be able to fetch pubKey
2017-10-30 20:02:55 +01:00
Tomaz Canabrava
a986532442
[CSE] Generate a random password for the metadata.
2017-10-30 19:08:03 +01:00
Tomaz Canabrava
cf56d58241
[CSE] Start the encryption of the metadataKey
2017-10-30 19:05:55 +01:00
Tomaz Canabrava
edb04c137c
[CSE] Call the FolderMetadata
2017-10-30 19:05:32 +01:00
Tomaz Canabrava
c695c50c33
[CSE] Implement the empty metadata
...
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-30 15:40:05 +01:00
Tomaz Canabrava
5420741edb
Merge branch 'master' into clientSideEncryptionV3
2017-10-30 11:21:36 +01:00
Jenkins for ownCloud
0968d74dad
[tx-robot] updated from transifex
2017-10-30 02:27:13 +01:00
Jenkins for ownCloud
876a1c5140
[tx-robot] updated from transifex
2017-10-29 02:18:42 +01:00
Jenkins for ownCloud
1455636169
[tx-robot] updated from transifex
2017-10-29 02:21:41 +02:00
Jenkins for ownCloud
7ea9a5ca4e
[tx-robot] updated from transifex
2017-10-28 02:18:51 +02:00
Christian Kamm
05c1bfb6cf
Merge remote-tracking branch 'origin/2.4'
2017-10-27 10:29:31 +02:00
