Skip to content

Commit c864c6c

Browse files
Return failure store privileges via get built-in privileges API (#125852)
Return `read_failure_store` and `manage_failure_store` via `GET /_security/privilege/_builtin` API.
1 parent 8bbd474 commit c864c6c

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler;
2929

3030
import java.io.IOException;
31-
import java.util.Arrays;
3231
import java.util.List;
33-
import java.util.Set;
3432

3533
import static org.elasticsearch.rest.RestRequest.Method.GET;
3634

@@ -41,8 +39,6 @@
4139
public class RestGetBuiltinPrivilegesAction extends SecurityBaseRestHandler {
4240

4341
private static final Logger logger = LogManager.getLogger(RestGetBuiltinPrivilegesAction.class);
44-
// TODO remove this once we can update docs tests again
45-
private static final Set<String> FAILURE_STORE_PRIVILEGES_TO_EXCLUDE = Set.of("read_failure_store", "manage_failure_store");
4642
private final GetBuiltinPrivilegesResponseTranslator responseTranslator;
4743

4844
public RestGetBuiltinPrivilegesAction(
@@ -75,20 +71,14 @@ public RestResponse buildResponse(GetBuiltinPrivilegesResponse response, XConten
7571
final var translatedResponse = responseTranslator.translate(response);
7672
builder.startObject();
7773
builder.array("cluster", translatedResponse.getClusterPrivileges());
78-
builder.array("index", filterOutFailureStorePrivileges(translatedResponse));
74+
builder.array("index", translatedResponse.getIndexPrivileges());
7975
String[] remoteClusterPrivileges = translatedResponse.getRemoteClusterPrivileges();
8076
if (remoteClusterPrivileges.length > 0) { // remote clusters are not supported in stateless mode, so hide entirely
8177
builder.array("remote_cluster", remoteClusterPrivileges);
8278
}
8379
builder.endObject();
8480
return new RestResponse(RestStatus.OK, builder);
8581
}
86-
87-
private static String[] filterOutFailureStorePrivileges(GetBuiltinPrivilegesResponse translatedResponse) {
88-
return Arrays.stream(translatedResponse.getIndexPrivileges())
89-
.filter(p -> false == FAILURE_STORE_PRIVILEGES_TO_EXCLUDE.contains(p))
90-
.toArray(String[]::new);
91-
}
9282
}
9383
);
9484
}

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/11_builtin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ setup:
1616
# I would much prefer we could just check that specific entries are in the array, but we don't have
1717
# an assertion for that
1818
- length: { "cluster" : 62 }
19-
- length: { "index" : 22 }
19+
- length: { "index" : 24 }

0 commit comments

Comments
 (0)