Skip to content

Return HTTP OK on token drop for oauth2 authentication #10929

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
kokosing merged 2 commits into from
Feb 3, 2022
Merged

Return HTTP OK on token drop for oauth2 authentication #10929

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
9fbcb1c
Return HTTP OK on token drop for oauth2 authentication
wendigo Feb 3, 2022
816cebc
Retry token removal only on 5xx response codes
wendigo 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
3 changes: 2 additions & 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 @@ -37,6 +37,7 @@
import static io.trino.client.JsonCodec.jsonCodec;
import static io.trino.client.JsonResponse.execute;
import static java.lang.String.format;
import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
import static java.net.HttpURLConnection.HTTP_OK;
import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
import static java.time.temporal.ChronoUnit.MILLIS;
Expand Down Expand Up @@ -96,7 +97,7 @@ public void tokenReceived(URI tokenUri)
.withMaxAttempts(-1)
.withMaxDuration(Duration.ofSeconds(4))
.withBackoff(100, 500, MILLIS)
.handleResultIf(code -> code != HTTP_OK))
.handleResultIf(code -> code >= HTTP_INTERNAL_ERROR))
Comment thread
wendigo marked this conversation as resolved.
.get(() -> {
Request request = prepareRequestBuilder(tokenUri)
.delete()
Expand Down
8 changes: 2 additions & 6 deletions client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,20 +176,16 @@ public void testTokenReceived()
}

@Test
public void testTokenReceivedRetriesUntilHTTP_OK()
public void testTokenReceivedRetriesUntilNotErrorReturned()
{
server.enqueue(status(HTTP_UNAVAILABLE));
server.enqueue(status(HTTP_UNAVAILABLE));
server.enqueue(status(HTTP_UNAVAILABLE));
server.enqueue(status(202));
server.enqueue(status(303));
server.enqueue(status(HTTP_OK));
server.enqueue(status(HTTP_OK));
server.enqueue(status(HTTP_OK));

tokenPoller.tokenReceived(tokenUri());

assertThat(server.getRequestCount()).isEqualTo(6);
assertThat(server.getRequestCount()).isEqualTo(4);
}

@Test
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 @@ -114,13 +114,16 @@ 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()
Comment thread
wendigo marked this conversation as resolved.
.build();
}

public static String getTokenUri(UUID authId)
Expand Down