chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-19 20:08:02 +02:00
Code Activity
11,937 Commits 4 Branches 173 Tags
e2e-tech-preview-1
Commit Graph
85 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roeland Jago Douma c04d1f1f69 Make different program so it doesn't mess with existing config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-30 11:53:52 +01:00
Roeland Jago Douma f8d805d78b Use NC windows installer images 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-30 11:25:46 +01:00
Roeland Jago Douma d85c2bf025 Fix building on windows 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-30 11:10:03 +01:00
Roeland Jago Douma 296f46356e If the metadata is empty we should store (and not update). 
Android only creates the metadata file when the first encrypted file is
added. We assumed it would be there.

This hacky code makes us store the metadata if there wasn't any yet.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 22:04:50 +01:00
Roeland Jago Douma 11946d9ef8 Bump 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-28 20:21:12 +01:00
Roeland Jago Douma 3c084bb6eb Bump drone image 
* Bump to 16.04 since 14.04 doesn't auto build here due to openssl fu
* No more gcc7 since gcc5 is new enough

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-28 20:10:04 +01:00
Roeland Jago Douma e2e99da446 Bump appimage drone image 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 14:31:14 +01:00
Roeland Jago Douma aa7e47f525 Fix new icon naming 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 12:19:51 +01:00
Roeland Jago Douma 48bce4c6b0 Merge remote-tracking branch 'oc/master' into oc_up 2018-01-25 11:17:04 +01:00
Roeland Jago Douma 4892b0ec43 Properly fill EncryptedFile 
* Add a mimetype (mobile clients need this)
* Add the tag unencoded as we encode it when we send the metadata
already

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 21:31:00 +01:00
Roeland Jago Douma 21d55c3321 No sharing in metadata yet and PEM as PKCS#8 
* Don't store the metadata yet this crashes android
  - Yes android should be fixed but for now this is quicker ;)
* QSslKey exports PEM as PKCS#1
  - This is not handled properly on android so use PKCS#8 helper

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 21:02:52 +01:00
Roeland Jago Douma 7ce009ef49 If status.php fails check <server>/nextcloud/status.php 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 13:43:44 +01:00
Roeland Jago Douma a2b8724adf Hacky way to drop duplicates (we should really use the fileid!) 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 11:58:05 +01:00
Roeland Jago Douma bb85e2ab2c Reuse existing EncryptedFile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 11:36:15 +01:00
Roeland Jago Douma 33beb7aade Don't generate values after we use them 
* Pregerenate IV
* Pregenerate key
* Pregenerate filename

TODO:
  - Reuse existing file entries and update (we might need logic in the
  metadatahandling to do this properly).
 2018-01-22 15:24:54 +01:00
Roeland Jago Douma 6d613fb4d5 Quick and dirty way of showing the mnemonic for now 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-18 22:10:55 +01:00
Roeland Jago Douma 5722d29e42 Double encode the metadatakeys 
This is required by a misunderstanding of the RFC.
You need to resetup your test user.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-15 11:26:06 +01:00
Roeland Jago Douma 99aebf292c Yet another drone image 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-12 19:36:09 +01:00
Roeland Jago Douma d1c84fd859 Bump drone docer used for appimage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-12 15:21:30 +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
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
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
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
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
Roeland Jago Douma 99b4381591 Don't try to decrypt twice 
The DecryptMetaDataKeys already base64 decoded

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 23:11:40 +01:00
Roeland Jago Douma 69a201a62d Percentencode the json we send so special chars don't cause trouble 
The + sign was lost in transfer.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 23:11:07 +01:00
Roeland Jago Douma 56028759d5 Merge branch 'master' into clientSideEncryptionV3 2017-12-14 20:47:05 +01:00
Roeland Jago Douma be3afd1291 Add FileEncryptJob and FileDecryptJob 
This handles encryption and decryption of files.
Just create the job and start off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 16:54:56 +01:00
Roeland Jago Douma 76b8d2536b Bump drone images 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 12:57:16 +01:00
Roeland Jago Douma fe4bb52a6d Merge remote-tracking branch 'oc/master' into oc_up 2017-12-14 10:27:11 +01:00
Roeland Jago Douma 25734afd39 First base64 decode 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-12 21:42:37 +01:00
Roeland Jago Douma 529442e0f8 Bump drone images 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 12:34:34 +01:00
Roeland Jago Douma 0f60deb043 Store and retrieve keys in keychain 
* Store privatekey, certificate and mnemonic in keychain
* Retrieve private + public key from server
  - ask for mnemonic to decrypt private key

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-28 12:36:35 +01:00
Roeland Jago Douma ffb9f69cf6 Start with moving data to the keychain 
* Check for cert + privateKey in keychain
* Work with QSslKey and QSslCertificate
* Abstract reading the BIO's a bit more

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-27 16:21:53 +01:00
Roeland Jago Douma 74c4d27ea0 Indent 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-27 16:12:56 +01:00
Roeland Jago Douma 9cbe795045 Move more encryption functions to encryption helper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-25 21:43:15 +01:00
Roeland Jago Douma e0fbdfe175 Remove obsolete encryption functions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-25 15:50:47 +01:00
Roeland Jago Douma 12adff76e2 Properly decrypt private key and send it to the server 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-24 22:10:28 +01:00
Roeland Jago Douma 6d145a676b Added EncryptionHelper 
This is to move generic encryption methods out of the main code and into
small helper functions. So we don't scatter the encryption code all over
the place.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-24 21:05:21 +01:00
Roeland Jago Douma be8b99bf3a Build AppImage on all pushes 
This allows quickly testing of the appimages for feedback

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-21 14:20:09 +01:00
Roeland Jago Douma 26ba89c2a8 No double building on PR's 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-21 09:27:52 +01:00
Roeland Jago Douma 7c5150421c We don't use Jenkins 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-21 09:20:17 +01:00
Roeland Jago Douma 462353d0ee Have correct app password link 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-21 09:17:42 +01:00
Roeland Jago Douma f0537b20d1 Update with NC icons 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-20 16:14:40 +01:00
Roeland Jago Douma 9878559002 Move to NC theme 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-20 15:46:18 +01:00
Roeland Jago Douma 6b3006b325 OwnCloudCPack.cmake to NextcloudCPack.cmake 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-20 14:12:52 +01:00
Roeland Jago Douma 5dc73ffd8b OWNCLOUD.cmake => NEXTCLOUD.cmake 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-20 14:12:52 +01:00
Roeland Jago Douma 725be9ff54 Merge branch 'master' of https://github.com/owncloud/client into oc_master 2017-11-20 13:29:59 +01:00
Roeland Jago Douma 9394fe6e84 Use openssl functions to get random words 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-16 10:45:57 +01:00
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
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
Roeland Jago Douma 238f0b3610 Add note 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 15:53:17 +02:00
Roeland Jago Douma 817baf292d Use EVP_aes_128_gcm 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 15:51:53 +02:00
Roeland Jago Douma ca6fa7b341 Update decryp function 
* Do not use AAD
* Do not try to decrypt the last 16 bytes as Android adds the tag there
by default

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 15:51:53 +02:00
Roeland Jago Douma bacbf337d2 Update encryption function 
* Do not use padding
* Do not use the ADD data
* Append the tag to the ciphertext to be compatible with Android

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 15:51:53 +02:00
Roeland Jago Douma 4946848d08 Out 5.6 container is to old. Lets focus on the others for now 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-18 21:14:19 +02:00
Roeland Jago Douma bc7e65b395 Merge branch 'master' of https://github.com/owncloud/client 2017-10-18 21:03:15 +02:00
Roeland Jago Douma cc7cb6b650 Remove templates for now 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-27 14:02:49 +02:00
Roeland Jago Douma cdc5c1db43 Merge remote-tracking branch 'oc/master' into master-oc 2017-08-23 15:40:35 +02:00
Roeland Jago Douma 067c174e61 Add Qt5.9 to drone 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-05 21:08:45 +02:00
Roeland Jago Douma 6cb4131024 Add qt5.7 and qt5.8 CI tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-05 14:29:13 +02:00
Roeland Jago Douma 53087ac803 Add drone test for Qt-5.6 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-03 22:29:46 +02:00
Roeland Jago Douma 58e0c6c630 Point to NC doc repo 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-06-28 16:40:42 +02:00
Roeland Jago DoumaandMarkus Goetz 68f0f1b404 complete url when using themed wizardUrlPostfix 
Before we would only open the part of the url that the users entered.
Now if the wizardUrlPostfix is used this is should be appended to that
when opening the browser on the result page.
 2017-03-29 18:09:15 +02:00
Roeland Jago DoumaandOlivier Goffart 99aaf22ae5 Update windows docker file to use 2.3 OBS repo 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-02-15 09:49:29 +01:00
Roeland Jago DoumaandRoeland Jago Douma 2fdae6d72f Allow setting op public upload on link shares 2015-10-14 15:30:28 +02:00
Roeland Jago DoumaandRoeland Jago Douma 05471d0acd Also parse capabilitie for public uploads 2015-10-14 15:30:23 +02:00
Roeland Jago DoumaandRoeland Jago Douma 6c8ff7c61a Added capabilities class 2015-07-28 12:04:24 +02:00
Roeland Jago Douma a2f9ba47fb If the OCS Share API returns an url use that 
To avoid us having to construct the URL for public shares just rely on the
server to do it.

This makes it easier to maintain. For example if (in the not do distat future)
the index.php part is removed the server would just server this new url.
 2015-07-23 21:10:53 +02:00
Roeland Jago Douma 7e79a78901 Use already available password field 2015-07-16 20:55:54 +02:00
Roeland Jago DoumaandRoeland Jago Douma b686a3dbdb Sharedialog show thumbnail of file (if available) 2015-07-15 14:33:04 +02:00
Roeland Jago DoumaandRoeland Jago Douma 454e9d9906 Wait until we retrieved shares before showing checkbox 
If we have a slow connection we do now want to show the share checkbox until we
have retrieved the shares (so we know the state). Else we might try to enable
sharing on an already shared file.
 2015-07-15 14:20:35 +02:00
Roeland Jago DoumaandChristian Kamm 5a83636f81 Only show share dialog if we are connected. 2015-04-08 09:53:57 +02:00
Roeland Jago Douma 51c617801d static member QFileInfo::exists is not available on 4.8 2015-02-27 08:43:33 +01:00
Roeland Jago Douma fba9020950 Added copyright header 2015-02-25 18:32:25 +01:00
Roeland Jago Douma 8523803d94 Added push button to sharedialog to set password 
Added button to explicitly set the password (makes is clear the user has to do
somethign!). Patch for #2812
 2015-02-11 22:14:51 +01:00
Roeland Jago Douma c44abf4918 Reset _public_share_id after we delete the share 2015-02-10 07:53:35 +01:00
Roeland Jago Douma 48254579a2 Sharedialog: add copy button text and actually connect the button 2015-02-03 13:02:52 +01:00