[Java] Validate initialTermId and streamId when extending a recording.

happyteeOH · Dec 1, 2019 · c907848 · c907848
1 parent 64e90b0
commit c907848
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/aeron-archive/src/main/java/io/aeron/archive/ArchiveConductor.java b/aeron-archive/src/main/java/io/aeron/archive/ArchiveConductor.java
@@ -718,6 +718,16 @@ Subscription extendRecording(
             return null;
         }
 
+        catalog.recordingSummary(recordingId, recordingSummary);
+        if (streamId != recordingSummary.streamId)
+        {
+            final String msg = "cannot extend recording " + recordingSummary.recordingId +
+                " streamId " + streamId +
+                " not equal to recording streamId " + recordingSummary.streamId;
+            controlSession.sendErrorResponse(correlationId, UNKNOWN_RECORDING, msg, controlResponseProxy);
+            return null;
+        }
+
         if (recordingSessionByIdMap.containsKey(recordingId))
         {
             final String msg = "cannot extend active recording for " + recordingId;
@@ -1497,6 +1507,16 @@ private void validateImageForExtendRecording(
             throw new ArchiveException(msg);
         }
 
+        if (image.initialTermId() != recordingSummary.initialTermId)
+        {
+            final String msg = "cannot extend recording " + recordingSummary.recordingId +
+                " image initialTermId " + image.initialTermId() +
+                " not equal to recording initialTermId " + recordingSummary.initialTermId;
+
+            controlSession.attemptErrorResponse(correlationId, INVALID_EXTENSION, msg, controlResponseProxy);
+            throw new ArchiveException(msg);
+        }
+
         if (image.termBufferLength() != recordingSummary.termBufferLength)
         {
             final String msg = "cannot extend recording " + recordingSummary.recordingId +