From 4a575e70b16bf88e19a358a98b4ea8ba852d4849 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Tue, 25 Oct 2022 14:30:04 -0500 Subject: [PATCH] Remove getUser from examples (#91123) https://github.com/elastic/elasticsearch/pull/91069 removed this method. This commit removes the usage from the examples. --- .../example/CustomAuthorizationEngine.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/examples/security-authorization-engine/src/main/java/org/elasticsearch/example/CustomAuthorizationEngine.java b/plugins/examples/security-authorization-engine/src/main/java/org/elasticsearch/example/CustomAuthorizationEngine.java index c668ad088fb2b..276a7112ef4df 100644 --- a/plugins/examples/security-authorization-engine/src/main/java/org/elasticsearch/example/CustomAuthorizationEngine.java +++ b/plugins/examples/security-authorization-engine/src/main/java/org/elasticsearch/example/CustomAuthorizationEngine.java @@ -50,9 +50,10 @@ public void resolveAuthorizationInfo(RequestInfo requestInfo, ActionListener listener) { - if (isSuperuser(requestInfo.getAuthentication().getUser())) { + if (isSuperuser(requestInfo.getAuthentication().getEffectiveSubject().getUser())) { listener.onResponse(AuthorizationResult.granted()); } else { listener.onResponse(AuthorizationResult.deny()); @@ -85,7 +86,7 @@ public void authorizeIndexAction(RequestInfo requestInfo, AuthorizationInfo auth AsyncSupplier indicesAsyncSupplier, Map aliasOrIndexLookup, ActionListener listener) { - if (isSuperuser(requestInfo.getAuthentication().getUser())) { + if (isSuperuser(requestInfo.getAuthentication().getEffectiveSubject().getUser())) { indicesAsyncSupplier.getAsync(ActionListener.wrap(resolvedIndices -> { Map indexAccessControlMap = new HashMap<>(); for (String name : resolvedIndices.getLocal()) { @@ -103,7 +104,7 @@ public void authorizeIndexAction(RequestInfo requestInfo, AuthorizationInfo auth @Override public void loadAuthorizedIndices(RequestInfo requestInfo, AuthorizationInfo authorizationInfo, Map indicesLookup, ActionListener> listener) { - if (isSuperuser(requestInfo.getAuthentication().getUser())) { + if (isSuperuser(requestInfo.getAuthentication().getEffectiveSubject().getUser())) { listener.onResponse(indicesLookup.keySet()); } else { listener.onResponse(Collections.emptySet()); @@ -114,7 +115,7 @@ public void loadAuthorizedIndices(RequestInfo requestInfo, AuthorizationInfo aut public void validateIndexPermissionsAreSubset(RequestInfo requestInfo, AuthorizationInfo authorizationInfo, Map> indexNameToNewNames, ActionListener listener) { - if (isSuperuser(requestInfo.getAuthentication().getUser())) { + if (isSuperuser(requestInfo.getAuthentication().getEffectiveSubject().getUser())) { listener.onResponse(AuthorizationResult.granted()); } else { listener.onResponse(AuthorizationResult.deny());