hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Alphonse Bendt
2024-06-24 17:51:58 +02:00
parent 977ec534ff
commit 7d197a81b1
2 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamResource.java
View File

@@ -10,10 +10,13 @@ package org.dspace.app.rest.utils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.SQLException;
import java.util.Set;
import java.util.UUID;
import jakarta.xml.bind.DatatypeConverter;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -28,7 +31,6 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
import org.dspace.eperson.service.EPersonService;
import org.dspace.utils.DSpace;
import org.springframework.core.io.AbstractResource;
import org.springframework.util.DigestUtils;
/**
* This class acts as a {@link AbstractResource} used by Spring's framework to send the data in a proper and
@@ -123,7 +125,7 @@ public class BitstreamResource extends AbstractResource {
if (shouldGenerateCoverPage) {
var coverPage = getCoverpageByteArray(context, bitstream);
this.document = new BitstreamDocument(etag(coverPage),
this.document = new BitstreamDocument(etag(bitstream),
coverPage.length,
new ByteArrayInputStream(coverPage));
} else {
@@ -134,14 +136,33 @@ public class BitstreamResource extends AbstractResource {
} catch (SQLException | AuthorizeException | IOException e) {
throw new RuntimeException(e);
}
LOG.info("fetched document {} {}", shouldGenerateCoverPage, document);
}
private String etag(byte[] data) {
var builder = new StringBuilder();
builder.append("\"0");
DigestUtils.appendMd5DigestAsHex(data, builder);
builder.append('"');
return builder.toString();
private String etag(Bitstream bitstream) {
/* Ideally we would calculate the md5 checksum based on the document with coverpage.
However it looks like the coverpage generation is not stable (e.g. if invoked twice it will return
different results). This means we cannot use it for etag calculation/comparison!
Instead we will create the MD5 based off the original checksum plus fixed prefix. This ensures
that checksums will differ when coverpage is on/off.
However the checksum will _not_ change if the coverpage content changes.
*/
try {
MessageDigest md = MessageDigest.getInstance("MD5");
var content = "coverpage:" + bitstream.getChecksum();
md.update(content.getBytes());
md.update(bitstream.getChecksum().getBytes());
byte[] digest = md.digest();
return DatatypeConverter
.printHexBinary(digest).toUpperCase();
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
}
private Context initializeContext() throws SQLException {

36
dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
View File

@@ -929,6 +929,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
//2. A public item with a bitstream
File originalPdf = new File(testProps.getProperty("test.bitstream"));
System.out.println(originalPdf);
try (InputStream is = new FileInputStream(originalPdf)) {
@@ -966,20 +967,23 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
// The citation cover page contains the item title.
// We will now verify that the pdf text contains this title.
String pdfText = extractPDFText(content);
System.out.println(pdfText);
assertTrue(StringUtils.contains(pdfText,"Public item citation cover page test 1"));
// The dspace-api/src/test/data/dspaceFolder/assetstore/ConstitutionofIreland.pdf file contains 64 pages,
// manually counted + 1 citation cover page
assertEquals(65,getNumberOfPdfPages(content));
var etagHeader = getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
.andReturn().getResponse().getHeader("ETag");
etagHeader = etagHeader.substring(1, etagHeader.length() - 1);
//A If-None-Match HEAD request on the ETag must tell is the bitstream is not modified
getClient().perform(head("/api/core/bitstreams/" + bitstream.getID() + "/content")
.header("If-None-Match", bitstream.getChecksum()))
.header("If-None-Match", etagHeader))
.andExpect(status().isNotModified());
//The download and head request should also be logged as a statistics record
checkNumberOfStatsRecords(bitstream, 2);
checkNumberOfStatsRecords(bitstream, 3);
}
private String extractPDFText(byte[] content) throws IOException {
@@ -1426,6 +1430,32 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
});
}
@Test
public void etagAndContentLengthIsStable() {
givenPdf(false, ignored -> {
var etag1 = getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
.andReturn().getResponse().getHeader("Etag");
var etag2 = getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
.andReturn().getResponse().getHeader("Etag");
assertThat(etag1, equalTo(etag2));
});
}
@Test
public void withCoverPageEtagAndContentLengthIsStable() {
givenPdf(true, ignored -> {
var etag1 = getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
.andReturn().getResponse().getHeader("Etag");
var etag2 = getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
.andReturn().getResponse().getHeader("Etag");
assertThat(etag1, equalTo(etag2));
});
}
@FunctionalInterface
interface ThrowingConsumer<T> {
void accept(T t) throws Exception;