Browse Source

added validation on space key

pull/9229/head
dashevchenko 3 years ago
parent
commit
88a17e3cfa
  1. 13
      application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
  2. 4
      dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java

13
application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java

@ -149,6 +149,19 @@ public class TelemetryControllerTest extends AbstractControllerTest {
doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
}
@Test
public void testEmptyKeyIsProhibited() throws Exception {
loginTenantAdmin();
Device device = createDevice();
String invalidRequestBody = "{\"\": \"value\"}";
doPostAsync("/api/plugins/telemetry/" + device.getId() + "/SHARED_SCOPE", invalidRequestBody, String.class, status().isBadRequest());
doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
String invalidRequestBody2 = "{\" \": \"value\"}";
doPostAsync("/api/plugins/telemetry/" + device.getId() + "/SHARED_SCOPE", invalidRequestBody2, String.class, status().isBadRequest());
doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody2, String.class, status().isBadRequest());
}
private Device createDevice() throws Exception {
String testToken = "TEST_TOKEN";

4
dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java

@ -48,8 +48,8 @@ public class KvUtils {
String key = tsKvEntry.getKey();
if (key == null) {
throw new DataValidationException("Key can't be null");
if (key == null || key.isBlank()) {
throw new DataValidationException("Key can't be null or empty");
}
if (key.length() > 255) {

Loading…
Cancel
Save