简柏林 / thingskit · Commits

Commit 160aa7ac04ed5956e6125ae54bafdf22ff352e17

Authored by Unknown
Committed by Andrew Shvayka
1 parent bfec9156

Protect against bogus interval

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -128,8 +128,9 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler { @@ -128,8 +128,9 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler {
128 Optional<Long> interval = request.getLongParamValue("interval"); 128 Optional<Long> interval = request.getLongParamValue("interval");
129 Optional<Integer> limit = request.getIntParamValue("limit"); 129 Optional<Integer> limit = request.getIntParamValue("limit");
130 130
  131 + // If some of these params are specified, they all must be
131 if (startTs.isPresent() || endTs.isPresent() || interval.isPresent() || limit.isPresent()) { 132 if (startTs.isPresent() || endTs.isPresent() || interval.isPresent() || limit.isPresent()) {
132 - if (!startTs.isPresent() || !endTs.isPresent() || !interval.isPresent()) { 133 + if (!startTs.isPresent() || !endTs.isPresent() || !interval.isPresent() || interval.get() < 0) {
133 msg.getResponseHolder().setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); 134 msg.getResponseHolder().setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
134 return; 135 return;
135 } 136 }