Feature/e2ee use hardware token secure storage #5877

mgallien · 2023-07-10T13:14:43Z

Close #5685

github-actions

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

sonarcloud · 2023-07-27T13:43:19Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
6 Code Smells

61.9% Coverage
0.0% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

codecov · 2023-07-27T13:46:48Z

Codecov Report

Attention: Patch coverage is 30.88235% with 188 lines in your changes missing coverage. Please review.

Project coverage is 59.59%. Comparing base (3dc583c) to head (d254c34).
Report is 1054 commits behind head on master.

❗ Current head d254c34 differs from pull request most recent head 2000d62

Please upload reports for the commit 2000d62 to get more accurate results.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #5877      +/-   ##
==========================================
- Coverage   60.79%   59.59%   -1.21%     
==========================================
  Files         145      145              
  Lines       18836    19011     +175     
==========================================
- Hits        11451    11329     -122     
- Misses       7385     7682     +297

Files	Coverage Δ
src/libsync/account.h	`42.85% <ø> (ø)`
src/libsync/clientsideencryption.h	`47.05% <100.00%> (+11.34%)`	⬆️
src/libsync/clientsideencryptionjobs.h	`10.00% <ø> (ø)`
src/libsync/discovery.cpp	`86.39% <ø> (-0.14%)`	⬇️
src/libsync/updatefiledropmetadata.cpp	`58.77% <100.00%> (ø)`
...libsync/abstractpropagateremotedeleteencrypted.cpp	`0.00% <0.00%> (ø)`
src/libsync/encryptfolderjob.cpp	`0.00% <0.00%> (ø)`
src/libsync/propagateuploadencrypted.cpp	`0.00% <0.00%> (ø)`
src/libsync/syncengine.cpp	`80.05% <0.00%> (+0.13%)`	⬆️
src/libsync/account.cpp	`42.75% <0.00%> (-1.69%)`	⬇️
... and 2 more

... and 32 files with indirect coverage changes

mgallien · 2023-08-25T14:19:48Z

updating the linux CI images to add support for this PR
nextcloud/docker-ci#582

src/libsync/clientsideencryption.cpp

mgallien · 2023-08-31T09:24:02Z

add support to build libp11 in KDE's Craft nextcloud/desktop-client-blueprints#8
temporarily put into our own blueprints repository
pending review upstream

mgallien · 2023-08-31T09:30:31Z

upstream review of the Craft blueprint
https://invent.kde.org/packaging/craft-blueprints-kde/-/merge_requests/654

sonarcloud · 2023-09-04T14:12:02Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
1 Security Hotspot
64 Code Smells

24.3% Coverage
0.0% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

NEXTCLOUD.cmake

claucambra · 2023-09-09T06:37:13Z

Realised this was still a draft half-way through

Close #5685 Signed-off-by: Matthieu Gallien <[email protected]>

Signed-off-by: Matthieu Gallien <[email protected]>

if we cannot encrypt because that is not working or because we lack keys and certificate needed to enable the feature makes no difference Signed-off-by: Matthieu Gallien <[email protected]>

Signed-off-by: Matthieu Gallien <[email protected]>

ensure we do not emit a "certificate migration is needed" signal when this is not the case Signed-off-by: Matthieu Gallien <[email protected]>

…lector will prevent access to internal objects not meant for reuse outside internal code Signed-off-by: Matthieu Gallien <[email protected]>

better check that PKCS11 keys can be converted to use them improve logs to be able to get a better insight on crypto operations during testing of crypto improve some API method names fix some log output that were using teh worng category Signed-off-by: Matthieu Gallien <[email protected]>

should avoid calling a crash prone libp11 API to get public key from hardware token Signed-off-by: Matthieu Gallien <[email protected]>

even if the certificate already exists abnd is stored on USB token hardware, we need to upload the certificate to allow sharing between users Signed-off-by: Matthieu Gallien <[email protected]>

should make it clearer what is the code and encryption keys and settings in use should make the code simpler to read and follow Signed-off-by: Matthieu Gallien <[email protected]>

this used to rely on a QSslKey object to convey the receiving user of a shared folder encryption material because we added CertificateInformation that is more generic and can work with USB token hardware stored private keys or pure software keys, we want to use that instead of a simple QSslKey Signed-off-by: Matthieu Gallien <[email protected]>

Signed-off-by: Matthieu Gallien <[email protected]>

will fix some automated tests failing due to stack overflow when creating `ActivityListModel` instances Signed-off-by: Matthieu Gallien <[email protected]>

I may need to ensure other parts behave as expected in case we can only decrypt but not encrypt Signed-off-by: Matthieu Gallien <[email protected]>

the previous certificates were linked to a now invalid libp11 context using any of them will lead to troubles Signed-off-by: Matthieu Gallien <[email protected]>

if you use a new certificate and access metadata of an older one, we pick up this previous certificate to access the metadata Signed-off-by: Matthieu Gallien <[email protected]>

Signed-off-by: Matthieu Gallien <[email protected]>

nextcloud-desktop-bot · 2024-10-02T08:58:32Z

AppImage file: nextcloud-PR-5877-8b9f3252171c5ac11a4cfeaa302a29b2299640a6-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

github-actions bot requested changes Jul 10, 2023

View reviewed changes

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 820e33a to 2273a3f Compare July 27, 2023 13:09

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch 2 times, most recently from 7b12e07 to eb9dcfd Compare July 28, 2023 10:55

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch 4 times, most recently from 13d5810 to bf78e6a Compare August 18, 2023 08:11

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from bf78e6a to 1ce0ffb Compare August 22, 2023 20:10

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 1ce0ffb to 6b3beec Compare August 29, 2023 11:26

github-advanced-security bot found potential problems Aug 29, 2023

View reviewed changes

src/libsync/clientsideencryption.cpp Fixed Show fixed Hide fixed

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch 3 times, most recently from d254c34 to 0567e97 Compare September 4, 2023 13:44

nextcloud deleted a comment from github-actions bot Sep 4, 2023

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 0567e97 to 81d494a Compare September 8, 2023 08:34

claucambra reviewed Sep 9, 2023

View reviewed changes

NEXTCLOUD.cmake Outdated Show resolved Hide resolved

NEXTCLOUD.cmake Outdated Show resolved Hide resolved

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch 2 times, most recently from ff7edeb to 85e00fc Compare September 18, 2023 13:42

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch 4 times, most recently from e5d881d to cd56880 Compare September 21, 2023 21:05

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 2000d62 to 39ff954 Compare June 14, 2024 15:17

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 39ff954 to 45bb571 Compare September 4, 2024 14:06

mgallien marked this pull request as ready for review September 25, 2024 07:17

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 45bb571 to 5cc95f1 Compare September 25, 2024 07:38

mgallien added 24 commits October 2, 2024 09:55

add support to use PKCS#11 harware token to store certifice for e2ee

71550bf

Close #5685 Signed-off-by: Matthieu Gallien <[email protected]>

add support to use PKCS#11 harware token to store certifice for e2ee

386efd0

Close #5685 Signed-off-by: Matthieu Gallien <[email protected]>

temporarily do not check for the certificate fingerprints

7e3f8c9

Signed-off-by: Matthieu Gallien <[email protected]>

libp11 dependency for USB token is really mandatory

99c29d3

Signed-off-by: Matthieu Gallien <[email protected]>

fix compilation by exporting a newly needed function

54ae4ce

Signed-off-by: Matthieu Gallien <[email protected]>

improve logs when build with NEXTCLOUD_DEV enabled

8e9d1d0

Signed-off-by: Matthieu Gallien <[email protected]>

better memory management and better logs for end-to-end encryption

4fe61ea

Signed-off-by: Matthieu Gallien <[email protected]>

fix memory issue ibetween list of token slots and the libp11 context

d8adad6

Signed-off-by: Matthieu Gallien <[email protected]>

ensure sane error handling when trying to setup encryption

753456a

if we cannot encrypt because that is not working or because we lack keys and certificate needed to enable the feature makes no difference Signed-off-by: Matthieu Gallien <[email protected]>

clearly indicate in logs which is the selected certificate

8c13f92

Signed-off-by: Matthieu Gallien <[email protected]>

do not claim a certificate migration is needed when it is not the case

2044b7d

ensure we do not emit a "certificate migration is needed" signal when this is not the case Signed-off-by: Matthieu Gallien <[email protected]>

clean public API that could be misused in ClientSideEncryptionTokenSe…

e7ac22e

…lector will prevent access to internal objects not meant for reuse outside internal code Signed-off-by: Matthieu Gallien <[email protected]>

instead of using PKCS#11 API to get public key, read it from certificate

1827b07

should avoid calling a crash prone libp11 API to get public key from hardware token Signed-off-by: Matthieu Gallien <[email protected]>

upload user certificate after end-to-end init with token storage

cd9a6c3

even if the certificate already exists abnd is stored on USB token hardware, we need to upload the certificate to allow sharing between users Signed-off-by: Matthieu Gallien <[email protected]>

remove duplicated confusing encryption helper methods

c560170

should make it clearer what is the code and encryption keys and settings in use should make the code simpler to read and follow Signed-off-by: Matthieu Gallien <[email protected]>

fix issues reported by clazy with default configuration

8aecba4

Signed-off-by: Matthieu Gallien <[email protected]>

prevent stack overflow when creating the systray via singleton access

e4cb2ec

will fix some automated tests failing due to stack overflow when creating `ActivityListModel` instances Signed-off-by: Matthieu Gallien <[email protected]>

allow to start with an expired certificate: migration will be needed

b51d36d

I may need to ensure other parts behave as expected in case we can only decrypt but not encrypt Signed-off-by: Matthieu Gallien <[email protected]>

when discovering certificates: forget previously known ones

1084fe1

the previous certificates were linked to a now invalid libp11 context using any of them will lead to troubles Signed-off-by: Matthieu Gallien <[email protected]>

allow on the fly migration of encryption certificate

b773583

if you use a new certificate and access metadata of an older one, we pick up this previous certificate to access the metadata Signed-off-by: Matthieu Gallien <[email protected]>

fix live migration between certificates and improve logs

3c5ab68

Signed-off-by: Matthieu Gallien <[email protected]>

for now remove this assert until we better understand

8b9f325

Signed-off-by: Matthieu Gallien <[email protected]>

mgallien force-pushed the feature/e2eeUseHardwareTokenSecureStorage branch from 5cc95f1 to 8b9f325 Compare October 2, 2024 07:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/e2ee use hardware token secure storage #5877

Feature/e2ee use hardware token secure storage #5877

mgallien commented Jul 10, 2023

github-actions bot left a comment

sonarcloud bot commented Jul 27, 2023

codecov bot commented Jul 27, 2023 •

edited

Loading

mgallien commented Aug 25, 2023

mgallien commented Aug 31, 2023

mgallien commented Aug 31, 2023

sonarcloud bot commented Sep 4, 2023

claucambra commented Sep 9, 2023

nextcloud-desktop-bot commented Oct 2, 2024

Feature/e2ee use hardware token secure storage #5877

Are you sure you want to change the base?

Feature/e2ee use hardware token secure storage #5877

Conversation

mgallien commented Jul 10, 2023

github-actions bot left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Jul 27, 2023

codecov bot commented Jul 27, 2023 • edited Loading

Codecov Report

mgallien commented Aug 25, 2023

mgallien commented Aug 31, 2023

mgallien commented Aug 31, 2023

sonarcloud bot commented Sep 4, 2023

claucambra commented Sep 9, 2023

nextcloud-desktop-bot commented Oct 2, 2024

codecov bot commented Jul 27, 2023 •

edited

Loading