Skip to content

Secure nextUri with a slug #13110

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
rschlussel merged 1 commit into from
Jul 23, 2019
Merged

Secure nextUri with a slug #13110

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
9 changes: 9 additions & 0 deletions presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@
import static io.airlift.concurrent.MoreFutures.addSuccessCallback;
import static io.airlift.concurrent.MoreFutures.addTimeout;
import static java.lang.String.format;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static java.util.UUID.randomUUID;

@ThreadSafe
class Query
Expand All @@ -94,6 +96,7 @@ class Query

private final QueryManager queryManager;
private final QueryId queryId;
private final String slug = "x" + randomUUID().toString().toLowerCase(ENGLISH).replace("-", "");

@GuardedBy("this")
private final ExchangeClient exchangeClient;
Expand Down Expand Up @@ -242,6 +245,11 @@ public QueryId getQueryId()
return queryId;
}

public boolean isSlugValid(String slug)
{
return this.slug.equals(slug);
}

public synchronized Optional<String> getSetCatalog()
{
return setCatalog;
Expand Down Expand Up @@ -571,6 +579,7 @@ private synchronized URI createNextResultsUri(String scheme, UriInfo uriInfo)
.scheme(scheme)
.replacePath("/v1/statement")
.path(queryId.toString())
.path(slug)
.path(String.valueOf(resultId.incrementAndGet()))
.replaceQuery("")
.build();
Expand Down
24 changes: 19 additions & 5 deletions presto-main/src/main/java/com/facebook/presto/server/protocol/StatementResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.weakref.jmx.Managed;
import org.weakref.jmx.Nested;

import javax.annotation.Nullable;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -171,18 +172,19 @@ public Response createQuery(
}

@GET
@Path("{queryId}/{token}")
@Path("{queryId}/{slug}/{token}")
@Produces(MediaType.APPLICATION_JSON)
public void getQueryResults(
@PathParam("queryId") QueryId queryId,
@PathParam("slug") String slug,
@PathParam("token") long token,
@QueryParam("maxWait") Duration maxWait,
@QueryParam("targetResultSize") DataSize targetResultSize,
@HeaderParam(X_FORWARDED_PROTO) String proto,
@Context UriInfo uriInfo,
@Suspended AsyncResponse asyncResponse)
{
Query query = queries.get(queryId);
Query query = getQuery(queryId, slug);
if (query == null) {
asyncResponse.resume(Response.status(Status.NOT_FOUND).build());
return;
Expand All @@ -194,6 +196,16 @@ public void getQueryResults(
asyncQueryResults(query, OptionalLong.of(token), maxWait, targetResultSize, uriInfo, proto, asyncResponse);
}

@Nullable
private Query getQuery(QueryId queryId, String slug)
{
Query query = queries.get(queryId);
if (query != null && query.isSlugValid(slug)) {
return query;
}
return null;
}

private void asyncQueryResults(
Query query,
OptionalLong token,
Expand Down Expand Up @@ -262,12 +274,14 @@ private static Response toResponse(Query query, QueryResults queryResults)
}

@DELETE
@Path("{queryId}/{token}")
@Path("{queryId}/{slug}/{token}")
@Produces(MediaType.APPLICATION_JSON)
public Response cancelQuery(@PathParam("queryId") QueryId queryId,
public Response cancelQuery(
@PathParam("queryId") QueryId queryId,
@PathParam("slug") String slug,
@PathParam("token") long token)
{
Query query = queries.get(queryId);
Query query = getQuery(queryId, slug);
if (query == null) {
return Response.status(Status.NOT_FOUND).build();
}
Expand Down