Avoid string out of bounds error in snapshot delete

Test failure #8771 shows cases where certain random seeds trigger this case. The bug is clear: the substring() call should happen after the startsWith() check in case the blob name is shorter than the prefix length being used as the start index of the substring call. I don't yet know if/how this manifests in real deployments. Signed-off-by: Andrew Ross <[email protected]>
opensearch-project · Feb 15, 2024 · 20aaa8d · 20aaa8d
1 parent f73c82a
commit 20aaa8d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java
@@ -1592,8 +1592,11 @@ private void executeOneStaleIndexDelete(
                                 Map<String, BlobMetadata> shardLevelBlobs = shardBlob.getValue().listBlobs();
                                 for (Map.Entry<String, BlobMetadata> shardLevelBlob : shardLevelBlobs.entrySet()) {
                                     String blob = shardLevelBlob.getKey();
-                                    String snapshotUUID = blob.substring(SHALLOW_SNAPSHOT_PREFIX.length(), blob.length() - ".dat".length());
                                     if (blob.startsWith(SHALLOW_SNAPSHOT_PREFIX) && blob.endsWith(".dat")) {
+                                        String snapshotUUID = blob.substring(
+                                            SHALLOW_SNAPSHOT_PREFIX.length(),
+                                            blob.length() - ".dat".length()
+                                        );
                                         RemoteStoreShardShallowCopySnapshot remoteStoreShardShallowCopySnapshot =
                                             REMOTE_STORE_SHARD_SHALLOW_COPY_SNAPSHOT_FORMAT.read(
                                                 shardBlob.getValue(),