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

Renamed mqtts ca file for device connectivity #9401

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Renamed mqtts ca file for device connectivity #9401

merged 3 commits into from
Oct 16, 2023

Conversation

dashevchenko
Copy link
Contributor

@dashevchenko dashevchenko commented Oct 12, 2023 •
edited
Loading

Pull Request description

Renamed mqtts ca file for device connectivity

General checklist

  • You have reviewed the guidelines document.
  • Labels that classify your pull request have been added.
  • The milestone is specified and corresponds to fix version.
  • Description references specific issue.
  • Description contains human-readable scope of changes.
  • Description contains brief notes about what needs to be added to the documentation.
  • No merge conflicts, commented blocks of code, code formatting issues.
  • Changes are backward compatible or upgrade script is provided.
  • Similar PR is opened for PE version to simplify merge. Crosslinks between PRs added. Required for internal contributors only.

Front-End feature checklist

  • Screenshots with affected component(s) are added. The best option is to provide 2 screens: before and after changes;
  • If you change the widget or other API, ensure it is backward-compatible or upgrade script is present.
  • Ensure new API is documented here

Back-End feature checklist

  • Added corresponding unit and/or integration test(s). Provide written explanation in the PR description if you have failed to add tests.
  • If new dependency was added: the dependency tree is checked for conflicts.
  • If new service was added: the service is marked with corresponding @TbCoreComponent, @TbRuleEngineComponent, @TbTransportComponent, etc.
  • If new REST API was added: the RestClient.java was updated, issue for Python REST client is created.
  • If new yml property was added: make sure a description is added (above or near the property).

ashvayka
ashvayka reviewed Oct 13, 2023
View reviewed changes
application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java Outdated
@@ -50,7 +50,7 @@
import static org.thingsboard.server.controller.ControllerConstants.PROTOCOL;
import static org.thingsboard.server.controller.ControllerConstants.PROTOCOL_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.PEM_CERT_FILE_NAME;
import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.CA_FILE_PEM;
Copy link
Member

Choose a reason for hiding this comment

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

CA_ROOT_CERT_PEM

ashvayka
ashvayka reviewed Oct 13, 2023
View reviewed changes
application/src/main/resources/thingsboard.yml Outdated
# Path to the server certificate file
pem_cert_file: "${DEVICE_CONNECTIVITY_MQTT_SSL_PEM_CERT:mqttserver.pem}"
# Path to the mqtt certificate authority file
pem_cert_file: "${DEVICE_CONNECTIVITY_MQTT_SSL_PEM_CERT:cafile.pem}"
Copy link
Member

Choose a reason for hiding this comment

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

DEVICE_CONNECTIVITY_MQTTS_CA_ROOT_CERT

ashvayka
ashvayka reviewed Oct 13, 2023
View reviewed changes
application/src/main/resources/thingsboard.yml Outdated
@@ -1179,8 +1179,8 @@ device:
host: "${DEVICE_CONNECTIVITY_MQTTS_HOST:}"
# Port of mqtt transport service. If empty default port for mqtts will be used.
port: "${DEVICE_CONNECTIVITY_MQTTS_PORT:8883}"
# Path to the server certificate file
pem_cert_file: "${DEVICE_CONNECTIVITY_MQTT_SSL_PEM_CERT:mqttserver.pem}"
# Path to the mqtt certificate authority file
Copy link
Member

Choose a reason for hiding this comment

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

Path to the MQTT CA root certificate file

ashvayka
ashvayka reviewed Oct 13, 2023
View reviewed changes
dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java Outdated
@@ -31,7 +31,7 @@ public class DeviceConnectivityUtil {
public static final String MQTTS = "mqtts";
public static final String COAP = "coap";
public static final String COAPS = "coaps";
public static final String PEM_CERT_FILE_NAME = "tb-server-chain.pem";
public static final String CA_FILE_PEM = "cafile.pem";
Copy link
Member

@ashvayka ashvayka Oct 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

CA_ROOT_CERT_PEM = "ca-root.pem"

@ashvayka ashvayka merged commit 16757b7 into thingsboard:master Oct 16, 2023
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashvayka ashvayka ashvayka left review comments

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@dashevchenko @ashvayka