Skip to content

[ES 9.0] Remove body workaround (@elastic/kibana-security) #217222

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
afharo merged 3 commits into from
Apr 7, 2025
Merged

[ES 9.0] Remove body workaround (@elastic/kibana-security) #217222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0edbf1
[ES 9.0] Remove body workaround (`@elastic/kibana-security`)
afharo Apr 4, 2025
d547014
Fix tests
afharo Apr 7, 2025
cc69921
Merge branch 'main' into es-9.0/remove-body-workaround/elastic/kibana…
afharo Apr 7, 2025
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
90 changes: 41 additions & 49 deletions x-pack/platform/plugins/shared/security/server/authentication/api_keys/api_keys.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,16 +483,14 @@ describe('API Keys', () => {
});
expect(mockValidateKibanaPrivileges).not.toHaveBeenCalled(); // this is only called if kibana_role_descriptors is defined
expect(mockClusterClient.asInternalUser.security.grantApiKey).toHaveBeenCalledWith({
body: {
api_key: {
name: 'test_api_key',
role_descriptors: { foo: true },
expiration: '1d',
},
grant_type: 'password',
username: 'foo',
password: 'bar',
api_key: {
name: 'test_api_key',
role_descriptors: { foo: true },
expiration: '1d',
},
grant_type: 'password',
username: 'foo',
password: 'bar',
});
});

Expand Down Expand Up @@ -522,15 +520,13 @@ describe('API Keys', () => {
});
expect(mockValidateKibanaPrivileges).not.toHaveBeenCalled(); // this is only called if kibana_role_descriptors is defined
expect(mockClusterClient.asInternalUser.security.grantApiKey).toHaveBeenCalledWith({
body: {
api_key: {
name: 'test_api_key',
role_descriptors: roleDescriptors,
expiration: '1d',
},
grant_type: 'access_token',
access_token: 'foo-access-token',
api_key: {
name: 'test_api_key',
role_descriptors: roleDescriptors,
expiration: '1d',
},
grant_type: 'access_token',
access_token: 'foo-access-token',
});
});

Expand Down Expand Up @@ -563,18 +559,16 @@ describe('API Keys', () => {
});
expect(mockValidateKibanaPrivileges).not.toHaveBeenCalled(); // this is only called if kibana_role_descriptors is defined
expect(mockClusterClient.asInternalUser.security.grantApiKey).toHaveBeenCalledWith({
body: {
api_key: {
name: 'test_api_key',
role_descriptors: { foo: true },
expiration: '1d',
},
grant_type: 'access_token',
access_token: 'foo-access-token',
client_authentication: {
scheme: 'SharedSecret',
value: 'secret',
},
api_key: {
name: 'test_api_key',
role_descriptors: { foo: true },
expiration: '1d',
},
grant_type: 'access_token',
access_token: 'foo-access-token',
client_authentication: {
scheme: 'SharedSecret',
value: 'secret',
},
});
});
Expand Down Expand Up @@ -857,29 +851,27 @@ describe('API Keys', () => {
name: 'key-name',
});
expect(mockClusterClient.asInternalUser.security.grantApiKey).toHaveBeenCalledWith({
body: {
api_key: {
name: 'key-name',
role_descriptors: {
synthetics_writer: {
applications: [
{
application: 'kibana-.kibana',
privileges: ['feature_uptime.all'],
resources: ['*'],
},
],
cluster: ['manage'],
indices: [],
run_as: [],
},
api_key: {
name: 'key-name',
role_descriptors: {
synthetics_writer: {
applications: [
{
application: 'kibana-.kibana',
privileges: ['feature_uptime.all'],
resources: ['*'],
},
],
cluster: ['manage'],
indices: [],
run_as: [],
},
expiration: '1d',
},
grant_type: 'password',
password: 'bar',
username: 'foo',
expiration: '1d',
},
grant_type: 'password',
password: 'bar',
username: 'foo',
});
});

Expand Down
3 changes: 1 addition & 2 deletions x-pack/platform/plugins/shared/security/server/authentication/api_keys/api_keys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,7 @@ export class APIKeys implements APIKeysType {
// User needs `manage_api_key` or `grant_api_key` privilege to use this API
let result: GrantAPIKeyResult;
try {
// @ts-expect-error [email protected] https://github.com/elastic/elasticsearch-js/issues/2584 (client_authentication)
result = await this.clusterClient.asInternalUser.security.grantApiKey({ body: params });
result = await this.clusterClient.asInternalUser.security.grantApiKey(params);
this.logger.debug('API key was granted successfully');
} catch (e) {
this.logger.error(`Failed to grant API key: ${e.message}`);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/platform/plugins/shared/security/server/session_management/session_index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ describe('Session index', () => {
expect(mockElasticsearchClient.indices.putMapping).toHaveBeenCalledTimes(1);
expect(mockElasticsearchClient.indices.putMapping).toHaveBeenCalledWith({
index: aliasName,
body: getSessionIndexSettings({ indexName, aliasName }).mappings,
...getSessionIndexSettings({ indexName, aliasName }).mappings,
});
});

Expand All @@ -367,7 +367,7 @@ describe('Session index', () => {
expect(mockElasticsearchClient.indices.putMapping).toHaveBeenCalledTimes(1);
expect(mockElasticsearchClient.indices.putMapping).toHaveBeenCalledWith({
index: aliasName,
body: getSessionIndexSettings({ indexName, aliasName }).mappings,
...getSessionIndexSettings({ indexName, aliasName }).mappings,
});
});

Expand Down
3 changes: 1 addition & 2 deletions x-pack/platform/plugins/shared/security/server/session_management/session_index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,7 @@ export class SessionIndex {
try {
await this.options.elasticsearchClient.indices.putMapping({
index: this.aliasName,
// @ts-expect-error [email protected] https://github.com/elastic/elasticsearch-js/issues/2584
body: sessionIndexSettings.mappings,
...sessionIndexSettings.mappings,
});
this.options.logger.debug('Successfully updated session index mappings.');
} catch (err) {
Expand Down