-
Notifications
You must be signed in to change notification settings - Fork 25k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add
manage_own_api_key
cluster privilege (#45696)
This commit adds `manage_own_api_key` cluster privilege which only allows api key cluster actions on API keys owned by the currently authenticated user. Relates: #40031
- Loading branch information
Showing
13 changed files
with
367 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
...rg/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
/* | ||
* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
* | ||
*/ | ||
|
||
package org.elasticsearch.xpack.core.security.authz.privilege; | ||
|
||
import org.elasticsearch.common.Strings; | ||
import org.elasticsearch.transport.TransportRequest; | ||
import org.elasticsearch.xpack.core.security.action.CreateApiKeyRequest; | ||
import org.elasticsearch.xpack.core.security.action.GetApiKeyRequest; | ||
import org.elasticsearch.xpack.core.security.action.InvalidateApiKeyRequest; | ||
import org.elasticsearch.xpack.core.security.authc.Authentication; | ||
import org.elasticsearch.xpack.core.security.authz.permission.ClusterPermission; | ||
import org.elasticsearch.xpack.core.security.support.Automatons; | ||
|
||
/** | ||
* Named cluster privilege for managing API keys owned by the current authenticated user. | ||
*/ | ||
public class ManageOwnApiKeyClusterPrivilege implements NamedClusterPrivilege { | ||
public static final ManageOwnApiKeyClusterPrivilege INSTANCE = new ManageOwnApiKeyClusterPrivilege(); | ||
private static final String PRIVILEGE_NAME = "manage_own_api_key"; | ||
private static final String API_KEY_REALM_TYPE = "_es_api_key"; | ||
private static final String API_KEY_ID_KEY = "_security_api_key_id"; | ||
|
||
private ManageOwnApiKeyClusterPrivilege() { | ||
} | ||
|
||
@Override | ||
public String name() { | ||
return PRIVILEGE_NAME; | ||
} | ||
|
||
@Override | ||
public ClusterPermission.Builder buildPermission(ClusterPermission.Builder builder) { | ||
return builder.add(this, ManageOwnClusterPermissionCheck.INSTANCE); | ||
} | ||
|
||
private static final class ManageOwnClusterPermissionCheck extends ClusterPermission.ActionBasedPermissionCheck { | ||
public static final ManageOwnClusterPermissionCheck INSTANCE = new ManageOwnClusterPermissionCheck(); | ||
|
||
private ManageOwnClusterPermissionCheck() { | ||
super(Automatons.patterns("cluster:admin/xpack/security/api_key/*")); | ||
} | ||
|
||
@Override | ||
protected boolean extendedCheck(String action, TransportRequest request, Authentication authentication) { | ||
if (request instanceof CreateApiKeyRequest) { | ||
return true; | ||
} else if (request instanceof GetApiKeyRequest) { | ||
final GetApiKeyRequest getApiKeyRequest = (GetApiKeyRequest) request; | ||
return checkIfUserIsOwnerOfApiKeys(authentication, getApiKeyRequest.getApiKeyId(), getApiKeyRequest.getUserName(), | ||
getApiKeyRequest.getRealmName(), getApiKeyRequest.ownedByAuthenticatedUser()); | ||
} else if (request instanceof InvalidateApiKeyRequest) { | ||
final InvalidateApiKeyRequest invalidateApiKeyRequest = (InvalidateApiKeyRequest) request; | ||
return checkIfUserIsOwnerOfApiKeys(authentication, invalidateApiKeyRequest.getId(), | ||
invalidateApiKeyRequest.getUserName(), invalidateApiKeyRequest.getRealmName(), | ||
invalidateApiKeyRequest.ownedByAuthenticatedUser()); | ||
} | ||
throw new IllegalArgumentException( | ||
"manage own api key privilege only supports API key requests (not " + request.getClass().getName() + ")"); | ||
} | ||
|
||
@Override | ||
protected boolean doImplies(ClusterPermission.ActionBasedPermissionCheck permissionCheck) { | ||
return permissionCheck instanceof ManageOwnClusterPermissionCheck; | ||
} | ||
|
||
private boolean checkIfUserIsOwnerOfApiKeys(Authentication authentication, String apiKeyId, String username, String realmName, | ||
boolean ownedByAuthenticatedUser) { | ||
if (isCurrentAuthenticationUsingSameApiKeyIdFromRequest(authentication, apiKeyId)) { | ||
return true; | ||
} else { | ||
/* | ||
* TODO bizybot we need to think on how we can propagate appropriate error message to the end user when username, realm name | ||
* is missing. This is similar to the problem of propagating right error messages in case of access denied. | ||
*/ | ||
if (authentication.getAuthenticatedBy().getType().equals(API_KEY_REALM_TYPE)) { | ||
// API key cannot own any other API key so deny access | ||
return false; | ||
} else if (ownedByAuthenticatedUser) { | ||
return true; | ||
} else if (Strings.hasText(username) && Strings.hasText(realmName)) { | ||
final String authenticatedUserPrincipal = authentication.getUser().principal(); | ||
final String authenticatedUserRealm = authentication.getAuthenticatedBy().getName(); | ||
return username.equals(authenticatedUserPrincipal) && realmName.equals(authenticatedUserRealm); | ||
} | ||
} | ||
return false; | ||
} | ||
|
||
private boolean isCurrentAuthenticationUsingSameApiKeyIdFromRequest(Authentication authentication, String apiKeyId) { | ||
if (authentication.getAuthenticatedBy().getType().equals(API_KEY_REALM_TYPE)) { | ||
// API key id from authentication must match the id from request | ||
final String authenticatedApiKeyId = (String) authentication.getMetadata().get(API_KEY_ID_KEY); | ||
if (Strings.hasText(apiKeyId)) { | ||
return apiKeyId.equals(authenticatedApiKeyId); | ||
} | ||
} | ||
return false; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
...asticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilegeTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
/* | ||
* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
* | ||
*/ | ||
|
||
package org.elasticsearch.xpack.core.security.authz.privilege; | ||
|
||
import org.elasticsearch.test.ESTestCase; | ||
import org.elasticsearch.transport.TransportRequest; | ||
import org.elasticsearch.xpack.core.security.action.GetApiKeyRequest; | ||
import org.elasticsearch.xpack.core.security.action.InvalidateApiKeyRequest; | ||
import org.elasticsearch.xpack.core.security.authc.Authentication; | ||
import org.elasticsearch.xpack.core.security.authz.permission.ClusterPermission; | ||
import org.elasticsearch.xpack.core.security.user.User; | ||
|
||
import java.util.Map; | ||
|
||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.when; | ||
|
||
public class ManageOwnApiKeyClusterPrivilegeTests extends ESTestCase { | ||
|
||
public void testAuthenticationWithApiKeyAllowsAccessToApiKeyActionsWhenItIsOwner() { | ||
final ClusterPermission clusterPermission = | ||
ManageOwnApiKeyClusterPrivilege.INSTANCE.buildPermission(ClusterPermission.builder()).build(); | ||
|
||
final String apiKeyId = randomAlphaOfLengthBetween(4, 7); | ||
final Authentication authentication = createMockAuthentication("joe","_es_api_key", "_es_api_key", | ||
Map.of("_security_api_key_id", apiKeyId)); | ||
final TransportRequest getApiKeyRequest = GetApiKeyRequest.usingApiKeyId(apiKeyId, randomBoolean()); | ||
final TransportRequest invalidateApiKeyRequest = InvalidateApiKeyRequest.usingApiKeyId(apiKeyId, randomBoolean()); | ||
|
||
assertTrue(clusterPermission.check("cluster:admin/xpack/security/api_key/get", getApiKeyRequest, authentication)); | ||
assertTrue(clusterPermission.check("cluster:admin/xpack/security/api_key/invalidate", invalidateApiKeyRequest, authentication)); | ||
assertFalse(clusterPermission.check("cluster:admin/something", mock(TransportRequest.class), authentication)); | ||
} | ||
|
||
public void testAuthenticationWithApiKeyDeniesAccessToApiKeyActionsWhenItIsNotOwner() { | ||
final ClusterPermission clusterPermission = | ||
ManageOwnApiKeyClusterPrivilege.INSTANCE.buildPermission(ClusterPermission.builder()).build(); | ||
|
||
final String apiKeyId = randomAlphaOfLengthBetween(4, 7); | ||
final Authentication authentication = createMockAuthentication("joe","_es_api_key", "_es_api_key", | ||
Map.of("_security_api_key_id", randomAlphaOfLength(7))); | ||
final TransportRequest getApiKeyRequest = GetApiKeyRequest.usingApiKeyId(apiKeyId, randomBoolean()); | ||
final TransportRequest invalidateApiKeyRequest = InvalidateApiKeyRequest.usingApiKeyId(apiKeyId, randomBoolean()); | ||
|
||
assertFalse(clusterPermission.check("cluster:admin/xpack/security/api_key/get", getApiKeyRequest, authentication)); | ||
assertFalse(clusterPermission.check("cluster:admin/xpack/security/api_key/invalidate", invalidateApiKeyRequest, authentication)); | ||
} | ||
|
||
public void testAuthenticationWithUserAllowsAccessToApiKeyActionsWhenItIsOwner() { | ||
final ClusterPermission clusterPermission = | ||
ManageOwnApiKeyClusterPrivilege.INSTANCE.buildPermission(ClusterPermission.builder()).build(); | ||
|
||
final Authentication authentication = createMockAuthentication("joe","realm1", "native", Map.of()); | ||
final TransportRequest getApiKeyRequest = GetApiKeyRequest.usingRealmAndUserName("realm1", "joe"); | ||
final TransportRequest invalidateApiKeyRequest = InvalidateApiKeyRequest.usingRealmAndUserName("realm1", "joe"); | ||
|
||
assertTrue(clusterPermission.check("cluster:admin/xpack/security/api_key/get", getApiKeyRequest, authentication)); | ||
assertTrue(clusterPermission.check("cluster:admin/xpack/security/api_key/invalidate", invalidateApiKeyRequest, authentication)); | ||
assertFalse(clusterPermission.check("cluster:admin/something", mock(TransportRequest.class), authentication)); | ||
} | ||
|
||
public void testAuthenticationWithUserAllowsAccessToApiKeyActionsWhenItIsOwner_WithOwnerFlagOnly() { | ||
final ClusterPermission clusterPermission = | ||
ManageOwnApiKeyClusterPrivilege.INSTANCE.buildPermission(ClusterPermission.builder()).build(); | ||
|
||
final Authentication authentication = createMockAuthentication("joe","realm1", "native", Map.of()); | ||
final TransportRequest getApiKeyRequest = GetApiKeyRequest.forOwnedApiKeys(); | ||
final TransportRequest invalidateApiKeyRequest = InvalidateApiKeyRequest.forOwnedApiKeys(); | ||
|
||
assertTrue(clusterPermission.check("cluster:admin/xpack/security/api_key/get", getApiKeyRequest, authentication)); | ||
assertTrue(clusterPermission.check("cluster:admin/xpack/security/api_key/invalidate", invalidateApiKeyRequest, authentication)); | ||
assertFalse(clusterPermission.check("cluster:admin/something", mock(TransportRequest.class), authentication)); | ||
} | ||
|
||
public void testAuthenticationWithUserDeniesAccessToApiKeyActionsWhenItIsNotOwner() { | ||
final ClusterPermission clusterPermission = | ||
ManageOwnApiKeyClusterPrivilege.INSTANCE.buildPermission(ClusterPermission.builder()).build(); | ||
|
||
final Authentication authentication = createMockAuthentication("joe", "realm1", "native", Map.of()); | ||
final TransportRequest getApiKeyRequest = randomFrom( | ||
GetApiKeyRequest.usingRealmAndUserName("realm1", randomAlphaOfLength(7)), | ||
GetApiKeyRequest.usingRealmAndUserName(randomAlphaOfLength(5), "joe"), | ||
new GetApiKeyRequest(randomAlphaOfLength(5), randomAlphaOfLength(7), null, null, false)); | ||
final TransportRequest invalidateApiKeyRequest = randomFrom( | ||
InvalidateApiKeyRequest.usingRealmAndUserName("realm1", randomAlphaOfLength(7)), | ||
InvalidateApiKeyRequest.usingRealmAndUserName(randomAlphaOfLength(5), "joe"), | ||
new InvalidateApiKeyRequest(randomAlphaOfLength(5), randomAlphaOfLength(7), null, null, false)); | ||
|
||
assertFalse(clusterPermission.check("cluster:admin/xpack/security/api_key/get", getApiKeyRequest, authentication)); | ||
assertFalse(clusterPermission.check("cluster:admin/xpack/security/api_key/invalidate", invalidateApiKeyRequest, authentication)); | ||
} | ||
|
||
private Authentication createMockAuthentication(String username, String realmName, String realmType, Map<String, Object> metadata) { | ||
final User user = new User(username); | ||
final Authentication authentication = mock(Authentication.class); | ||
final Authentication.RealmRef authenticatedBy = mock(Authentication.RealmRef.class); | ||
when(authentication.getUser()).thenReturn(user); | ||
when(authentication.getAuthenticatedBy()).thenReturn(authenticatedBy); | ||
when(authenticatedBy.getName()).thenReturn(realmName); | ||
when(authenticatedBy.getType()).thenReturn(realmType); | ||
when(authentication.getMetadata()).thenReturn(metadata); | ||
return authentication; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.