From 1f794312a053ab799870931d5584b34fa362042e Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Wed, 16 Aug 2023 11:45:45 -0700 Subject: [PATCH] Change the field name reason in obo endpoint to description Signed-off-by: Ryan Liang --- .../security/http/OnBehalfOfJwtAuthenticationTest.java | 4 ++-- .../security/action/onbehalf/CreateOnBehalfOfTokenAction.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/integrationTest/java/org/opensearch/security/http/OnBehalfOfJwtAuthenticationTest.java b/src/integrationTest/java/org/opensearch/security/http/OnBehalfOfJwtAuthenticationTest.java index 72fc2c8c60..27acfe8ec0 100644 --- a/src/integrationTest/java/org/opensearch/security/http/OnBehalfOfJwtAuthenticationTest.java +++ b/src/integrationTest/java/org/opensearch/security/http/OnBehalfOfJwtAuthenticationTest.java @@ -59,7 +59,7 @@ public class OnBehalfOfJwtAuthenticationTest { public static final String NEW_PASSWORD = "testPassword123!!"; public static final String OBO_TOKEN_REASON = "{\"reason\":\"Test generation\"}"; public static final String OBO_ENDPOINT_PREFIX = "_plugins/_security/api/user/onbehalfof"; - public static final String OBO_REASON = "{\"reason\":\"Testing\", \"service\":\"self-issued\"}"; + public static final String OBO_DESCRIPTION = "{\"description\":\"Testing\", \"service\":\"self-issued\"}"; public static final String CURRENT_AND_NEW_PASSWORDS = "{ \"current_password\": \"" + DEFAULT_PASSWORD + "\", \"password\": \"" @@ -103,7 +103,7 @@ public void shouldNotAuthenticateForUsingOBOTokenToAccessOBOEndpoint() { Header adminOboAuthHeader = new BasicHeader("Authorization", "Bearer " + oboToken); try (TestRestClient client = cluster.getRestClient(adminOboAuthHeader)) { - TestRestClient.HttpResponse response = client.getOnBehalfOfToken(OBO_REASON, adminOboAuthHeader); + TestRestClient.HttpResponse response = client.getOnBehalfOfToken(OBO_DESCRIPTION, adminOboAuthHeader); response.assertStatusCode(401); } } diff --git a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java index 7e276b9e48..88d21c6794 100644 --- a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java +++ b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java @@ -118,7 +118,7 @@ public void accept(RestChannel channel) throws Exception { final String clusterIdentifier = clusterService.getClusterName().value(); final Map requestBody = request.contentOrSourceParamParser().map(); - final String reason = (String) requestBody.getOrDefault("reason", null); + final String description = (String) requestBody.getOrDefault("description", null); final Integer tokenDuration = Optional.ofNullable(requestBody.get("duration")) .map(value -> (String) value)