|
|
|
@ -15,16 +15,6 @@ |
|
|
|
*/ |
|
|
|
package org.thingsboard.server.controller; |
|
|
|
|
|
|
|
import java.io.IOException; |
|
|
|
import java.nio.file.Files; |
|
|
|
import java.nio.file.Paths; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.regex.Matcher; |
|
|
|
import java.util.regex.Pattern; |
|
|
|
|
|
|
|
import static org.thingsboard.server.common.msg.EncryptionUtil.certTrimNewLinesForChainInDeviceProfile; |
|
|
|
|
|
|
|
public class ControllerConstants { |
|
|
|
|
|
|
|
protected static final String NEW_LINE = "\n\n"; |
|
|
|
@ -246,17 +236,6 @@ public class ControllerConstants { |
|
|
|
" }\n" + |
|
|
|
"}"; |
|
|
|
|
|
|
|
protected static final String[] getCertificateValue() { |
|
|
|
String filePath = "src/test/resources/provision/x509ChainProvisionTest.pem"; |
|
|
|
try { |
|
|
|
String certificateChain = Files.readString(Paths.get(filePath)); |
|
|
|
certificateChain = certTrimNewLinesForChainInDeviceProfile(certificateChain); |
|
|
|
return fetchLeafCertificateFromChain(certificateChain); |
|
|
|
} catch (IOException e) { |
|
|
|
throw new RuntimeException(e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
protected static final String certificateValue = "\"-----BEGIN CERTIFICATE----- " + |
|
|
|
"MIICMTCCAdegAwIBAgIUI9dBuwN6pTtK6uZ03rkiCwV4wEYwCgYIKoZIzj0EAwIwbjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRowGAYDVQQKDBFUaGluZ3NCb2FyZCwgSW5jLjEwMC4GA1UEAwwnZGV2aWNlQ2VydGlmaWNhdGVAWDUwOVByb3Zpc2lvblN0cmF0ZWd5MB4XDTIzMDMyOTE0NTYxN1oXDTI0MDMyODE0NTYxN1owbjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRowGAYDVQQKDBFUaGluZ3NCb2FyZCwgSW5jLjEwMC4GA1UEAwwnZGV2aWNlQ2VydGlmaWNhdGVAWDUwOVByb3Zpc2lvblN0cmF0ZWd5MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9Zo791qKQiGNBm11r4ZGxh+w+ossZL3xc46ufq5QckQHP7zkD2XDAcmP5GvdkM1sBFN9AWaCkQfNnWmfERsOOKNTMFEwHQYDVR0OBBYEFFFc5uyCyglQoZiKhzXzMcQ3BKORMB8GA1UdIwQYMBaAFFFc5uyCyglQoZiKhzXzMcQ3BKORMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhANbA9CuhoOifZMMmqkpuld+65CR+ItKdXeRAhLMZuccuAiB0FSQB34zMutXrZj1g8Gl5OkE7YryFHbei1z0SveHR8g== " + |
|
|
|
"-----END CERTIFICATE-----\""; |
|
|
|
@ -1662,15 +1641,4 @@ public class ControllerConstants { |
|
|
|
MARKDOWN_CODE_BLOCK_START + |
|
|
|
"[{\"ts\":1634712287000,\"values\":{\"temperature\":26, \"humidity\":87}}, {\"ts\":1634712588000,\"values\":{\"temperature\":25, \"humidity\":88}}]" + |
|
|
|
MARKDOWN_CODE_BLOCK_END ; |
|
|
|
|
|
|
|
private static String[] fetchLeafCertificateFromChain(String value) { |
|
|
|
List<String> chain = new ArrayList<>(); |
|
|
|
String regex = "-----BEGIN CERTIFICATE-----\\s*.*?\\s*-----END CERTIFICATE-----"; |
|
|
|
Pattern pattern = Pattern.compile(regex); |
|
|
|
Matcher matcher = pattern.matcher(value); |
|
|
|
while (matcher.find()) { |
|
|
|
chain.add(matcher.group(0)); |
|
|
|
} |
|
|
|
return chain.toArray(new String[0]); |
|
|
|
} |
|
|
|
} |
|
|
|
|