added part count and content range validation for download request #6353
Conversation
| String actualContentRange = response.contentRange(); | ||
| if (actualContentRange != null && partSize == null) { | ||
| getRangeInfo(actualContentRange); | ||
| log.debug(() -> String.format("Part size of the object to download: " + partSize)); | ||
| log.debug(() -> String.format("Total Content Length of the object to download: " + totalContentLength)); | ||
| } | ||
|
|
||
| validateContentRange(totalComplete, actualContentRange); |
There was a problem hiding this comment.
It looks like there a race on the partSize and totalContentLength, since reading them is done outside of the lock. Or do we know that they won't change per part so it's safe?
Can you explain why it's safe to have multiple get object results modifying the part size and total content length in parallel before we do (again, potentially parallel) validation on them?
There was a problem hiding this comment.
The MultipartDownloaderSubscriber sends request and receives request one at a time in sequence, so it won't receive responses in parallel ideally. Also totalContentLength should be the same for all the responses. However, I realized that the partSize is not the same for different part and the validation for contentRange is removed from the requirement, so I'll update the PR for that
| @@ -117,6 +128,7 @@ public void onNext(AsyncResponseTransformer<GetObjectResponse, GetObjectResponse | |||
|
|
|||
| synchronized (lock) { | |||
| if (totalParts != null && nextPartToGet > totalParts) { | |||
| validatePartsCount(completedParts.get()); | |||
There was a problem hiding this comment.
Can we create a variable for completedParts.get() before line 127 so that we don't have to call .get again here?
Can we also move this line after line 122
...ava/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java
Outdated
Show resolved
Hide resolved
...ava/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java
Outdated
Show resolved
Hide resolved
...ava/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java
Outdated
Show resolved
Hide resolved
|
Motivation and Context
For the part get request for S3 transfer manager, When a response is received, the S3 Transfer Manager MUST check the value of ContentRange and validate that it matches with the expected range for the specific part number. After all requests have been sent, we should validate that the total number of part GET requests sent matches with the expected PartsCount. This PR implements the validation.
Modifications
Added validation method in MultipartDownloaderSubscriber class
Testing
Added wiremock test for failed test
Screenshots (if appropriate)
Types of changes
Checklist
mvn installsucceedsscripts/new-changescript and following the instructions. Commit the new file created by the script in.changes/next-releasewith your changes.License