dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix space inside EncryptionUtil and fix failed-test, while doing validation

Browse Source
This commit is contained in:
Andrii Landiak 2023-03-23 15:20:08 +02:00
parent 82c95f519d
commit 24d69651cb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/message/src/main/java/org/thingsboard/server/common/msg/EncryptionUtil.java
View File

@ -39,7 +39,8 @@ public class EncryptionUtil {
return input.replaceAll("\n", "") return input.replaceAll("\n", "")
.replaceAll("\r", "") .replaceAll("\r", "")
.replaceAll("-----BEGIN CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\n") .replaceAll("-----BEGIN CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\n")
.replaceAll("-----END CERTIFICATE-----", "\n-----END CERTIFICATE-----\n"); .replaceAll("-----END CERTIFICATE-----", "\n-----END CERTIFICATE-----\n")
.trim();
} }
public static String pubkTrimNewLines(String input) { public static String pubkTrimNewLines(String input) {

2
dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
View File

@ -136,7 +136,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
public DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile) { public DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile) {
log.trace("Executing saveDeviceProfile [{}]", deviceProfile); log.trace("Executing saveDeviceProfile [{}]", deviceProfile);
X509CertificateChainProvisionConfiguration x509Configuration = new X509CertificateChainProvisionConfiguration(); X509CertificateChainProvisionConfiguration x509Configuration = new X509CertificateChainProvisionConfiguration();
if (deviceProfile.getProfileData().getProvisionConfiguration() instanceof X509CertificateChainProvisionConfiguration) { if (deviceProfile.getProfileData() != null && deviceProfile.getProfileData().getProvisionConfiguration() instanceof X509CertificateChainProvisionConfiguration) {
x509Configuration = (X509CertificateChainProvisionConfiguration) deviceProfile.getProfileData().getProvisionConfiguration(); x509Configuration = (X509CertificateChainProvisionConfiguration) deviceProfile.getProfileData().getProvisionConfiguration();
} }
if (x509Configuration.getCertificateValue() != null) { if (x509Configuration.getCertificateValue() != null) {

2
transport/mqtt/src/main/resources/tb-mqtt-transport.yml
View File

@ -114,7 +114,7 @@ transport:
# Server SSL credentials # Server SSL credentials
credentials: credentials:
# Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore) # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
type: "${MQTT_SSL_CREDENTIALS_TYPE:PEM}" type: "${MQTT_SSL_CREDENTIALS_TYPE:PEM}"
# PEM server credentials # PEM server credentials
pem: pem:
# Path to the server certificate file (holds server certificate or certificate chain, may include server private key) # Path to the server certificate file (holds server certificate or certificate chain, may include server private key)