Skip to content

Set outputLength correctly on open ended range requests to encryptedBlobStore #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaul merged 3 commits into from
Oct 16, 2024
Merged

Set outputLength correctly on open ended range requests to encryptedBlobStore #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06c80d1
Set outputLength correctly on open ended range requests to encryptedB…
ptemarvelde Oct 11, 2024
9abd4de
Test open-ended range requests in EncryptedBlobStoreLiveTest.testPart…
ptemarvelde Oct 12, 2024
da26a5d
fix encryptedBlobStoreLiveTest linelength
ptemarvelde Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/gaul/s3proxy/crypto/Decryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ public Decryption(SecretKeySpec key, BlobStore blobStore,
// calculate the offset
calculateOffset(offset);

// if there is a offset and a length set the output length
if (offset > 0 && length == 0) {
// if there is a offset and no length set the output length
if (offset > 0 && length <= 0) {
outputLength = unencryptedSize - offset;
}
}
Expand Down
26 changes: 22 additions & 4 deletions src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,29 @@ public void testPartialContent() throws InterruptedException, IOException {
options.range(0, 19);
object = this.getApi().getObject(containerName, blobName, options);

InputStreamReader r =
new InputStreamReader(object.getPayload().openStream());
InputStreamReader r = new InputStreamReader(
object.getPayload().openStream());
BufferedReader reader = new BufferedReader(r);
String partialContent = reader.lines().collect(Collectors.joining());
assertThat(partialContent).isEqualTo(content.substring(0, 20));
String partialContent = reader.lines()
.collect(Collectors.joining());

assertThat(partialContent).isEqualTo(
content.substring(0, 20));
assertThat((long) partialContent.length()).isEqualTo(
object.getMetadata().getContentMetadata().getContentLength());

// open ended range request
options = new GetOptions();
options.startAt(10);
object = this.getApi().getObject(containerName, blobName, options);

r = new InputStreamReader(object.getPayload().openStream());
reader = new BufferedReader(r);
partialContent = reader.lines().collect(Collectors.joining());

assertThat(partialContent).isEqualTo(content.substring(10));
assertThat((long) partialContent.length()).isEqualTo(
object.getMetadata().getContentMetadata().getContentLength());
}

@Test
Expand Down