Skip to content

Fix timing issue when posting guestbook response and requesting the d… #12341

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

Open
stevenwinship wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −4
Open

Fix timing issue when posting guestbook response and requesting the d… #12341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions doc/release-notes/12340-timing-issue-guestbook-response.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## BUG
Timing issue fixed where user only had a few seconds instead of a minute to call the File download API after POSTing the guestbook response
7 changes: 4 additions & 3 deletions src/main/java/edu/harvard/iq/dataverse/api/Access.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public class Access extends AbstractApiBean {
DataverseFeaturedItemServiceBean dataverseFeaturedItemServiceBean;

private static final String DEFAULT_BUNDLE_NAME = "dataverse_files.zip";
private static final int GUESTBOOK_RESPONSE_SIGNEDURL_TIMEOUT_MINUTES = 1;
//@EJB

// TODO:
Expand Down Expand Up @@ -495,7 +496,7 @@ private Response returnSignedUrl(ContainerRequestContext crc, UriInfo uriInfo, U
ApiToken apiToken = authSvc.findApiTokenByUser(requestor);
if (apiToken == null) {
logger.fine("Generating temporary API token for user " + userIdentifier);
apiToken = authSvc.generateApiTokenForUser(requestor, AuthenticationServiceBean.INTERVAL.MINUTES, 1);
apiToken = authSvc.generateApiTokenForUser(requestor, AuthenticationServiceBean.INTERVAL.MINUTES, GUESTBOOK_RESPONSE_SIGNEDURL_TIMEOUT_MINUTES);
}
if (apiToken != null) {
key = apiToken.getTokenString();
Expand All @@ -517,7 +518,7 @@ private Response returnSignedUrl(ContainerRequestContext crc, UriInfo uriInfo, U
String baseUrl = URLDecoder.decode(baseUrlEncoded, StandardCharsets.UTF_8);
baseUrl = baseUrl.replace(":persistentId", id);
key = JvmSettings.API_SIGNING_SECRET.lookupOptional().orElse("") + key;
String signedUrl = UrlSignerUtil.signUrl(baseUrl, 1, userIdentifier, "GET", key);
String signedUrl = UrlSignerUtil.signUrl(baseUrl, GUESTBOOK_RESPONSE_SIGNEDURL_TIMEOUT_MINUTES, userIdentifier, "GET", key);
return ok(Json.createObjectBuilder().add(URLTokenUtil.SIGNED_URL, signedUrl));
}

Expand Down Expand Up @@ -2004,7 +2005,7 @@ private boolean checkGuestbookRequiredResponse(ContainerRequestContext crc, UriI
throw new NotFoundException("GuestbookResponse Not Found for id:" + gbrids);
}
Long delta = Instant.now().toEpochMilli() - gbr.getResponseTime().getTime();
wasWrittenInPost = gbr.getDataset().getId().equals(df.getOwner().getId()) && delta < 10000;
wasWrittenInPost = gbr.getDataset().getId().equals(df.getOwner().getId()) && delta <= (GUESTBOOK_RESPONSE_SIGNEDURL_TIMEOUT_MINUTES * 60000L);
} catch (NumberFormatException | DateTimeParseException ex) {
throw new BadRequestException(ex.getMessage());
}
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,9 @@ static Response getDownloadFileUrlWithGuestbookResponse(Integer fileId, String a

static Response downloadFilesUrlWithGuestbookResponse(Integer[] fileIds, String apiToken, String body) {
RequestSpecification requestSpecification = given();
requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
if (apiToken != null) {
requestSpecification.header(API_TOKEN_HTTP_HEADER, apiToken);
}
if (body != null) {
requestSpecification.body(body);
}
Expand Down
Loading