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

Added TLS support for MQTT connections. #2459

Merged
merged 25 commits into from
Jan 16, 2024
Merged

Added TLS support for MQTT connections. #2459

merged 25 commits into from
Jan 16, 2024

Conversation

samuelBloch
Copy link
Contributor

In order to use TLS with an MQTT connection, the user has to provide the path to the certificate (.cert.pem), private key (.private.key) and trust store (.der) files under "Controller Api MQTT" in the Apache Felix Web Console Configurator.

The functionality of this feature has been tested with an AWS MQTT test client.

@samuelBloch samuelBloch marked this pull request as draft December 15, 2023 12:39
@samuelBloch samuelBloch marked this pull request as ready for review December 15, 2023 12:40
samuelBloch and others added 14 commits December 21, 2023 13:28
@samuelBloch
begin with implementation of Entes MPR-15S-22 meter
47fd9aa
@samuelBloch
update the mqtt config to inform the user to enter the certificate, p…
5b1485c 
…rivate key and trust store in PEM format
@samuelBloch
update ControllerApiMqttImpl.java and MyConfig.java to match Config.java
1987c3e
@samuelBloch
update parameter names of MqttConnector methods
7588c36
@samuelBloch
reimplement MqttUtils class in order to process certificates and priv…
85a6154 
…ate key as strings
@samuelBloch
remove trustStorePassword, adapt comments
99a9884
@samuelBloch
Merge pull request #1 from inomotech-foss/feature/cert_as_text
dcbe2d8 
Feature/cert as text
@samuelBloch
Merge branch 'feature/implement-MPR-15-S-22-meter' into feature/mqtt_…
8feb917 
…tls_connection
@samuelBloch
Revert "Merge pull request #1 from inomotech-foss/feature/cert_as_text"
bf72d7d 
This reverts commit dcbe2d8, reversing
changes made to 35830c2.
@samuelBloch
revert lost changes
c71c42e
@samuelBloch
refractore files
90dd7aa
@samuelBloch
remove entes meter files
57d4ae4
@sfeilmeier
Merge branch 'develop' into pr/2459
ae01dc5
@sfeilmeier
Review
4079149 
- add dependency for Bouncycastle in pom.xml
- fix bundles in EdgeApp.bndrun
- add handling of Blank config settings
@sfeilmeier
Copy link
Contributor

Thanks for updating! I fixed the build problems locally. Could you please give me write permissions on your branch?

By the way, this PR relates to #1575. Unfortunately back then I did not get feedback from community to finalize the implementation.

@scootermon
Copy link

Thanks for updating! I fixed the build problems locally. Could you please give me write permissions on your branch?

@sfeilmeier, Unfortunately, because the fork sits in an organization and not in a user-owned repo GitHub doesn't allow the setting to be turned on. I invited you directly to the fork so you can push the changes.

@sfeilmeier
Copy link
Contributor

@scootermon Thank you. I pushed changes. Could you have a quick look? From my side its ready to merge.

@github-actions GitHub Actions
Copy link

Code Coverage

@samuelBloch
Copy link
Contributor Author

samuelBloch commented Jan 16, 2024 •
edited
Loading

@scootermon Thank you. I pushed changes. Could you have a quick look? From my side its ready to merge.

@sfeilmeier Thanks for the review and your changes. For me, everything looks fine, connection to the MQTT test client works too.

@sfeilmeier sfeilmeier merged commit 855998c into OpenEMS:develop Jan 16, 2024
2 checks passed
@sfeilmeier sfeilmeier deleted the feature/mqtt_tls_connection branch January 16, 2024 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfeilmeier sfeilmeier sfeilmeier approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@samuelBloch @sfeilmeier @scootermon