Skip to content
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

Jump to bottom

Added Response to restrict cache storing #22480

Closed
wants to merge 1 commit into from
Closed

Added Response to restrict cache storing #22480

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
44 changes: 37 additions & 7 deletions core/trino-main/src/main/java/io/trino/server/ui/UiQueryResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public UiQueryResource(DispatchManager dispatchManager, AccessControl accessCont

@ResourceSecurity(WEB_UI)
@GET
public List<TrimmedBasicQueryInfo> getAllQueryInfo(@QueryParam("state") String stateFilter, @Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
public Response getAllQueryInfo(@QueryParam("state") String stateFilter, @Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
{
QueryState expectedState = stateFilter == null ? null : QueryState.valueOf(stateFilter.toUpperCase(Locale.ENGLISH));

Expand All @@ -80,7 +80,12 @@ public List<TrimmedBasicQueryInfo> getAllQueryInfo(@QueryParam("state") String s
builder.add(new TrimmedBasicQueryInfo(queryInfo));
}
}
return builder.build();
return Response.ok(builder.build())
.header("X-Download-Options", "noopen")
.header("Cache-Control", "no-cache, no-store, max-age=0")
.header("Pragma", "no-cache")
.header("Expires", "-1")
.build();
}

@ResourceSecurity(WEB_UI)
Expand All @@ -94,13 +99,23 @@ public Response getQueryInfo(@PathParam("queryId") QueryId queryId, @Context Htt
if (queryInfo.isPresent()) {
try {
checkCanViewQueryOwnedBy(sessionContextFactory.extractAuthorizedIdentity(servletRequest, httpHeaders), queryInfo.get().getSession().toIdentity(), accessControl);
return Response.ok(queryInfo.get()).build();
return Response.ok(queryInfo.get())
.header("X-Download-Options", "noopen")
.header("Cache-Control", "no-cache, no-store, max-age=0")
.header("Pragma", "no-cache")
.header("Expires", "-1")
.build();
}
catch (AccessDeniedException e) {
throw new ForbiddenException();
}
}
return Response.status(Status.GONE).build();
return Response.status(Status.GONE)
.header("X-Download-Options", "noopen")
.header("Cache-Control", "no-cache, no-store, max-age=0")
.header("Pragma", "no-cache")
.header("Expires", "-1")
.build();
}

@ResourceSecurity(WEB_UI)
Expand Down Expand Up @@ -130,18 +145,33 @@ private Response failQuery(QueryId queryId, TrinoException queryException, HttpS

// check before killing to provide the proper error code (this is racy)
if (queryInfo.getState().isDone()) {
return Response.status(Status.CONFLICT).build();
return Response.status(Status.CONFLICT)
.header("X-Download-Options", "noopen")
.header("Cache-Control", "no-cache, no-store, max-age=0")
.header("Pragma", "no-cache")
.header("Expires", "-1")
.build();
}

dispatchManager.failQuery(queryId, queryException);

return Response.status(Status.ACCEPTED).build();
return Response.status(Status.ACCEPTED)
.header("X-Download-Options", "noopen")
.header("Cache-Control", "no-cache, no-store, max-age=0")
.header("Pragma", "no-cache")
.header("Expires", "-1")
.build();
}
catch (AccessDeniedException e) {
throw new ForbiddenException();
}
catch (NoSuchElementException e) {
return Response.status(Status.GONE).build();
return Response.status(Status.GONE)
.header("X-Download-Options", "noopen")
.header("Cache-Control", "no-cache, no-store, max-age=0")
.header("Pragma", "no-cache")
.header("Expires", "-1")
.build();
}
}
}