Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Https subscription and root certs #341

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Https subscription and root certs #341

merged 1 commit into from
Feb 27, 2024

Conversation

ablepharus
Copy link
Contributor

@ablepharus ablepharus commented Feb 26, 2024 •
edited
Loading

Implement https subscriptions and fix a bug related to our handling regarding the https client.

Https subscriptions were just not handled, initialise a client and reuse the existing code for http subscriptions.
There was a bug in our certificate store handling. The SSLClient owns its certificate store and deletes it on destruction.
We can not share one store with all clients, so every client gets its own now.

@ablepharus ablepharus force-pushed the https-subscription-and-root-certs branch from 5fc78e2 to a4bb850 Compare February 26, 2024 14:14
@ablepharus ablepharus force-pushed the https-subscription-and-root-certs branch from a4bb850 to 0499b8c Compare February 26, 2024 14:17
@ablepharus ablepharus force-pushed the https-subscription-and-root-certs branch from 0499b8c to dfd13b3 Compare February 26, 2024 14:19
@ablepharus ablepharus force-pushed the https-subscription-and-root-certs branch from dfd13b3 to 78a0184 Compare February 26, 2024 14:22
@codecov Codecov
Copy link

codecov bot commented Feb 26, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 17.77778% with 37 lines in your changes are missing coverage. Please review.

Project coverage is 57.03%. Comparing base (a7a7c5c) to head (2bd9294).

Files Patch % Lines
src/client/include/RestClientNative.hpp 21.62% 5 Missing and 24 partials ⚠️
...c/client/include/RestDefaultClientCertificates.hpp 0.00% 7 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #341      +/-   ##
==========================================
- Coverage   57.15%   57.03%   -0.13%     
==========================================
  Files          69       69              
  Lines        7310     7324      +14     
  Branches     2703     2710       +7     
==========================================
- Hits         4178     4177       -1     
- Misses       1322     1324       +2     
- Partials     1810     1823      +13

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ablepharus ablepharus linked an issue Feb 26, 2024 that may be closed by this pull request
[2SP,2SP] Make OpenDigitizer Service and UI work with https fair-acc/opendigitizer#162
Closed
wirew0rm
wirew0rm requested changes Feb 26, 2024
View reviewed changes
Copy link
Member

@wirew0rm wirew0rm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general.
I think it would be good to persist the findings about how the certstore is handled. Please update the PR description and commit messages accordingly.

Also this adds quite some new uncovered new code paths which I think should be easy to fix, since RestClient_tests.cpp already has http(s) tests for get/set and a http only test for subscribe.

Handle https subscriptions, fix cert store bug
2bd9294 
https subscriptions were not handled, create a SSLCLient and reuse
existing code for subscribing.

the certificate store was shared between all SslClients in our
RestClient, this does not work, because the client owns the store and
deletes it on its own destruction.

this patch also adds the certificate specified by OPENCMW_REST_CERT_FILE
to our RestDefaultCLientCertificates to make it trusted.
@ablepharus ablepharus force-pushed the https-subscription-and-root-certs branch from ccc993d to 2bd9294 Compare February 27, 2024 09:30
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Feb 27, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
22.4% Coverage on New Code (required ≥ 80%)
51.0% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

wirew0rm
wirew0rm approved these changes Feb 27, 2024
View reviewed changes
Copy link
Member

@wirew0rm wirew0rm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for the additional documentation.

I've looked into the coverage, it seems most of it is due to coverage not being properly configured in this project, the majority of the missed lines is in the unit-test that seems to be excluded from coverage collection but not coverage calculation :/

@wirew0rm wirew0rm merged commit ac69eaf into main Feb 27, 2024
8 of 11 checks passed
@wirew0rm wirew0rm deleted the https-subscription-and-root-certs branch February 27, 2024 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wirew0rm wirew0rm wirew0rm approved these changes

@ivan-cukic ivan-cukic Awaiting requested review from ivan-cukic

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[2SP,2SP] Make OpenDigitizer Service and UI work with https
2 participants
@ablepharus @wirew0rm