check the logId's match before attempting to retrieve old log entry

Olog · Jul 17, 2023 · 68bf84b · 68bf84b
1 parent 459c9b8
commit 68bf84b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/org/phoebus/olog/LogResource.java b/src/main/java/org/phoebus/olog/LogResource.java
@@ -381,6 +381,10 @@ public Log updateLog(@PathVariable String logId,
                          @RequestBody Log log,
                          @AuthenticationPrincipal Principal principal) {
 
+        // In case a client sends a log record where the id does not match the path variable, return HTTP 400 (bad request)
+        if (!logId.equals(Long.toString(log.getId()))) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Log entry id does not match path variable");
+        }
 
         Optional<Log> foundLog = logRepository.findById(logId);
         if (foundLog.isPresent()) {
@@ -390,10 +394,6 @@ public Log updateLog(@PathVariable String logId,
                 persistedLog.setOwner(principal.getName());
             }
 
-            // In case a client sends a log record where the id does not match the path variable, return HTTP 400 (bad request)
-            if (!logId.equals(Long.toString(log.getId()))) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Log entry id does not match path variable");
-            }
             persistedLog.setLevel(log.getLevel());
             persistedLog.setProperties(log.getProperties());
             persistedLog.setModifyDate(Instant.now());