E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API. #329

a-andreyev · 2019-06-25T11:51:55Z

Contributes to matrix-org/matrix-spec-proposals#87 matrix-org/matrix-spec-proposals#88 matrix-org/matrix-spec-proposals#95

This allows to detect if a room has been encrypted (no room state, just an event as of yet). Closes quotient-im#84.

KitsuneRal

Thanks for a great start! This is part 1 of the review, only dealing with code organisation but not with the source code itself. You've got some work to do before this can be merged :)

.gitmodules

.travis.yml

CMakeLists.txt

KitsuneRal

A few comments on the source code. Might bring more, but first let's deal with the base class of EncryptionEvent.

lib/events/encryptionevent.h

lib/events/simplestateevents.h

lib/room.cpp

lib/settings.cpp

KitsuneRal

I finally really got to seriously reviewing your code - and you've got more work as a result :)

.gitmodules

lib/connection.cpp

lib/encryptionmanager.cpp

KitsuneRal

Ok, a few last brushes and it seems we're good to go.

lib/connection.cpp

lib/encryptionmanager.cpp

lib/events/encryptionevent.h

KitsuneRal

...and a few more brushes below, to satisfy CI.

By the way, Travis fails because https://stackoverflow.com/questions/50061678/cmake-the-following-imported-targets-are-referenced-but-are-missing. cmake/QMatrixClientConfig.cmake is already there, you just have to add the dependency there, as described in the answer.

CMakeLists.txt

lib/encryptionmanager.cpp

.travis.yml

…ckle logic.

a-andreyev · 2019-07-05T08:50:43Z

https://stackoverflow.com/questions/50061678/cmake-the-following-imported-targets-are-referenced-but-are-missing

tried to follow the logic (also tried with QtOlmConfig.cmake), no luck yet. I got stuck a bit with the CI, but the local build is working. So I'm focusing at next main tasks (but would be happy to check some more hints and fix the CI too :)

KitsuneRal · 2019-07-06T00:57:49Z

tried to follow the logic (also tried with QtOlmConfig.cmake), no luck yet. I got stuck a bit with the CI, but the local build is working. So I'm focusing at next main tasks (but would be happy to check some more hints and fix the CI too :)

Yep, don't spend more time on this. Looking forward to messages receiving code.

a-andreyev · 2019-07-06T12:58:23Z

lib/encryptionmanager.cpp

+static const auto ed25519Name = QStringLiteral("ed25519");
+static const auto Curve25519Name = QStringLiteral("curve25519");
+static const auto SignedCurve25519Name = QStringLiteral("signed_curve25519");
+static const auto OlmCurve25519AesSha256AlgoName = QStringLiteral("m.olm.curve25519-aes-sha256");


Note to myself

found an issue with the naming: https://github.com/matrix-org/matrix-doc/issues/1733#issuecomment-446179169 (point 2)

KitsuneRal · 2019-07-07T05:45:00Z

Congratulations, the first E2EE PR comes in :)

Fxrh and others added 2 commits June 25, 2019 14:48

Include olm via cmake (should work on Linux and MinGW)

90623dd

Introduce EncryptionEvent class

1cf6773

This allows to detect if a room has been encrypted (no room state, just an event as of yet). Closes quotient-im#84.

a-andreyev requested a review from KitsuneRal June 25, 2019 11:52

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch from d31a839 to 590a59a Compare June 25, 2019 13:50

KitsuneRal requested changes Jun 26, 2019

View reviewed changes

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch 3 times, most recently from 45d417b to 2939a05 Compare June 26, 2019 15:49

KitsuneRal requested changes Jun 26, 2019

View reviewed changes

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch 6 times, most recently from a5e444c to ee6281e Compare June 28, 2019 00:07

KitsuneRal requested changes Jun 29, 2019

View reviewed changes

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch from ee6281e to d49fa06 Compare July 2, 2019 00:15

KitsuneRal requested changes Jul 3, 2019

View reviewed changes

lib/connection.cpp Outdated Show resolved Hide resolved

lib/encryptionmanager.cpp Show resolved Hide resolved

lib/encryptionmanager.cpp Show resolved Hide resolved

lib/events/encryptionevent.h Outdated Show resolved Hide resolved

lib/events/encryptionevent.h Outdated Show resolved Hide resolved

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch 2 times, most recently from d02c250 to 14c0437 Compare July 3, 2019 20:44

KitsuneRal requested changes Jul 4, 2019

View reviewed changes

CMakeLists.txt Show resolved Hide resolved

lib/encryptionmanager.cpp Show resolved Hide resolved

.travis.yml Show resolved Hide resolved

a-andreyev added 6 commits July 4, 2019 11:21

Add libQtOlm

af623d6

Add full EncryptionEvent to room logic. Issue quotient-im#95

bb98bd2

Update libQtOlm

46a7350

Add EncryptionManager class. Add AccountSettings::encryptionAccountPi…

69ba71c

…ckle logic.

Upload device public keys. Issue quotient-im#87

79f6f33

Upload one-time keys. Issue quotient-im#88

e1bee9d

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch 3 times, most recently from f13cc71 to a5a8d88 Compare July 4, 2019 08:34

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch from a5a8d88 to abe1d95 Compare July 4, 2019 09:44

Change libQtOlm location. Fix .travis.yml and .appveyor.yml

b5f9e1b

a-andreyev force-pushed the aa13q-e2ee-enc-mng branch from abe1d95 to b5f9e1b Compare July 4, 2019 12:28

.appveyor.yml: stick with static libs

a4d1acb

a-andreyev commented Jul 6, 2019

View reviewed changes

KitsuneRal added 2 commits July 6, 2019 23:08

Merge branch 'master' into e2ee-enc-mng

717f3bc

EncryptionEvent: Adjust upon merge from master

4e521ae

KitsuneRal force-pushed the aa13q-e2ee-enc-mng branch 2 times, most recently from 1a48753 to 93044c7 Compare July 7, 2019 04:31

Fix qmake builds in CI

d5b4e64

KitsuneRal force-pushed the aa13q-e2ee-enc-mng branch from 93044c7 to d5b4e64 Compare July 7, 2019 04:52

KitsuneRal approved these changes Jul 7, 2019

View reviewed changes

KitsuneRal merged commit 6c9d895 into quotient-im:master Jul 7, 2019

This was referenced Jul 7, 2019

Upload device public keys #87

Closed

Create and register one-time keys #88

Closed

a-andreyev added E2EE End-to-end encryption is affected GSoC2019 labels Aug 25, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API. #329

E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API. #329

a-andreyev commented Jun 25, 2019

KitsuneRal left a comment

KitsuneRal left a comment •

edited

Loading

KitsuneRal left a comment

KitsuneRal left a comment

KitsuneRal left a comment •

edited

Loading

a-andreyev commented Jul 5, 2019

KitsuneRal commented Jul 6, 2019

a-andreyev Jul 6, 2019 •

edited

Loading

KitsuneRal commented Jul 7, 2019

E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API. #329

E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API. #329

Conversation

a-andreyev commented Jun 25, 2019

KitsuneRal left a comment

Choose a reason for hiding this comment

KitsuneRal left a comment • edited Loading

Choose a reason for hiding this comment

KitsuneRal left a comment

Choose a reason for hiding this comment

KitsuneRal left a comment

Choose a reason for hiding this comment

KitsuneRal left a comment • edited Loading

Choose a reason for hiding this comment

a-andreyev commented Jul 5, 2019

KitsuneRal commented Jul 6, 2019

a-andreyev Jul 6, 2019 • edited Loading

Choose a reason for hiding this comment

KitsuneRal commented Jul 7, 2019

KitsuneRal left a comment •

edited

Loading

KitsuneRal left a comment •

edited

Loading

a-andreyev Jul 6, 2019 •

edited

Loading