lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Hotfix for DMF UPDATE_ATTRIBUTES message

Browse Source
This commit is contained in:
Stefan Behl
2018-07-31 12:01:14 +02:00
parent 13d8c6461c
commit 7ae941e290
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
View File

@@ -252,6 +252,7 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
private void updateAttributes(final Message message) { private void updateAttributes(final Message message) {
final DmfAttributeUpdate attributeUpdate = convertMessage(message, DmfAttributeUpdate.class); final DmfAttributeUpdate attributeUpdate = convertMessage(message, DmfAttributeUpdate.class);
final String thingId = getStringHeaderKey(message, MessageHeaderKey.THING_ID, "ThingId is null"); final String thingId = getStringHeaderKey(message, MessageHeaderKey.THING_ID, "ThingId is null");
// reject messages with invalid attributes
if (attributeUpdate.getAttributes().entrySet().stream() if (attributeUpdate.getAttributes().entrySet().stream()
.anyMatch(e -> !AmqpMessageHandlerService.isAttributeEntryValid(e))) { .anyMatch(e -> !AmqpMessageHandlerService.isAttributeEntryValid(e))) {
throw new MessageConversionException( throw new MessageConversionException(
@@ -262,9 +263,18 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
} }
private static boolean isAttributeEntryValid(final Entry<String, String> e) { private static boolean isAttributeEntryValid(final Entry<String, String> e) {
if (e == null) return true; if (e == null) {
return e.getKey() != null && e.getKey().length() <= 32 && (e.getValue() == null || (e.getValue() != null return true;
&& e.getValue().length() <= 128)); }
return isAttributeKeyValid(e.getKey()) && isAttributeValueValid(e.getValue());
}
private static boolean isAttributeKeyValid(final String key) {
return key != null && key.length() <= 32;
}
private static boolean isAttributeValueValid(final String value) {
return value == null || value.length() <= 128;
} }
/** /**