Skip to content

internal/Bitstream HEAD response #956

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
milanmajchrak merged 4 commits into from
May 7, 2025
Merged

internal/Bitstream HEAD response #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9b2f0c
Merge pull request #9256 from DSpace/backport-9248-to-dspace-7_x
alanorth Jan 11, 2024
9787582
Added IT for content type (mimetype) of bitstream
jr-rk May 7, 2025
faec4b6
removed duplicit integration test
jr-rk May 7, 2025
9eecab6
removed unused import
jr-rk May 7, 2025
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
7 changes: 7 additions & 0 deletions dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ public ResponseEntity retrieve(@PathVariable UUID uuid, HttpServletResponse resp
.withBufferSize(BUFFER_SIZE)
.withFileName(name)
.withChecksum(bit.getChecksum())
.withLength(bit.getSizeBytes())
.withMimetype(mimetype)
.with(request)
.with(response);
Expand Down Expand Up @@ -189,6 +190,12 @@ public ResponseEntity retrieve(@PathVariable UUID uuid, HttpServletResponse resp
if (s3DirectDownload) {
return redirectToS3DownloadUrl(httpHeaders, name, bit.getInternalId());
}

if (RequestMethod.HEAD.name().equals(request.getMethod())) {
log.debug("HEAD request - no response body");
return ResponseEntity.ok().headers(httpHeaders).build();
}

return ResponseEntity.ok().headers(httpHeaders).body(bitstreamResource);
}

Expand Down
19 changes: 10 additions & 9 deletions dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

Expand All @@ -33,7 +34,6 @@ public class HttpHeadersInitializer {

protected final Logger log = LoggerFactory.getLogger(this.getClass());

private static final String METHOD_HEAD = "HEAD";
private static final String MULTIPART_BOUNDARY = "MULTIPART_BYTERANGES";
private static final String CONTENT_TYPE_MULTITYPE_WITH_BOUNDARY = "multipart/byteranges; boundary=" +
MULTIPART_BOUNDARY;
Expand Down Expand Up @@ -144,6 +144,9 @@ public HttpHeaders initialiseHeaders() throws IOException {
if (checksum != null) {
httpHeaders.put(ETAG, Collections.singletonList(checksum));
}
if (Objects.nonNull((Long.valueOf(this.length)))) {
httpHeaders.put(HttpHeaders.CONTENT_LENGTH, Collections.singletonList(String.valueOf(this.length)));
}
httpHeaders.put(LAST_MODIFIED, Collections.singletonList(FastHttpDateFormat.formatDate(lastModified)));
httpHeaders.put(EXPIRES, Collections.singletonList(FastHttpDateFormat.formatDate(
System.currentTimeMillis() + DEFAULT_EXPIRE_TIME)));
Expand All @@ -165,16 +168,14 @@ public HttpHeaders initialiseHeaders() throws IOException {

httpHeaders.put(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS,
Collections.singletonList(HttpHeaders.ACCEPT_RANGES));
httpHeaders.put(CONTENT_DISPOSITION, Collections.singletonList(String.format(CONTENT_DISPOSITION_FORMAT,
disposition,
encodeText(fileName))));
log.debug("Content-Disposition : {}", disposition);

// Content phase
if (METHOD_HEAD.equals(request.getMethod())) {
log.debug("HEAD request - skipping content");
return null;
// distposition may be null here if contentType is null
if (!isNullOrEmpty(disposition)) {
httpHeaders.put(CONTENT_DISPOSITION, Collections.singletonList(String.format(CONTENT_DISPOSITION_FORMAT,
disposition,
encodeText(fileName))));
}
log.debug("Content-Disposition : {}", disposition);

return httpHeaders;

Expand Down
14 changes: 13 additions & 1 deletion dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,18 @@ public void retrieveFullBitstream() throws Exception {
}
context.restoreAuthSystemState();

//** WHEN **
// we want to know what we are downloading before we download it
getClient().perform(head("/api/core/bitstreams/" + bitstream.getID() + "/content"))
//** THEN **
.andExpect(status().isOk())

//The Content Length must match the full length
.andExpect(header().longValue("Content-Length", bitstreamContent.getBytes().length))
.andExpect(header().string("Content-Type", "text/plain;charset=UTF-8"))
.andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
.andExpect(content().bytes(new byte[] {}));

//** WHEN **
//We download the bitstream
getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
Expand All @@ -245,7 +257,7 @@ public void retrieveFullBitstream() throws Exception {
.andExpect(status().isNotModified());

//The download and head request should also be logged as a statistics record
checkNumberOfStatsRecords(bitstream, 2);
checkNumberOfStatsRecords(bitstream, 3);
}

@Test
Expand Down