Skip to content

External token ack hang #10930

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

Closed
s2lomon wants to merge 2 commits into from
Closed

External token ack hang #10930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8bba92
Backoff only on http errors for token ack
s2lomon Feb 3, 2022
06ce85c
Return explicit HTTP OK on token ack
s2lomon Feb 3, 2022
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: 1 addition & 1 deletion client/trino-client/src/main/java/io/trino/client/auth/external/HttpTokenPoller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void tokenReceived(URI tokenUri)
.withMaxAttempts(-1)
.withMaxDuration(Duration.ofSeconds(4))
.withBackoff(100, 500, MILLIS)
.handleResultIf(code -> code != HTTP_OK))
.handleResultIf(code -> code >= 500))
Copy link
Copy Markdown
Member

@kokosing kokosing Feb 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about 4xx or 3xx?

.get(() -> {
Request request = prepareRequestBuilder(tokenUri)
.delete()
Expand Down
5 changes: 4 additions & 1 deletion ...trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import static io.trino.server.security.oauth2.OAuth2TokenExchange.hashAuthId;
import static java.util.Objects.requireNonNull;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;

@Path(OAuth2TokenExchangeResource.TOKEN_ENDPOINT)
public class OAuth2TokenExchangeResource
Expand Down Expand Up @@ -114,13 +115,15 @@ private static Response pendingResponse(HttpServletRequest request)
@ResourceSecurity(PUBLIC)
@DELETE
@Path("{authId}")
public void deleteAuthenticationToken(@PathParam("authId") UUID authId)
public Response deleteAuthenticationToken(@PathParam("authId") UUID authId)
{
if (authId == null) {
throw new BadRequestException();
}

tokenExchange.dropToken(authId);
return Response.ok("Authentication deleted", TEXT_PLAIN_TYPE)
.build();
}

public static String getTokenUri(UUID authId)
Expand Down