mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
Fixed bug where list index privileges was returned twice instead of list item index (#75256)
## Summary Fixes a bug where the list privileges was returning the `.list` privileges twice instead of returning it once and returning the `.items` privileges second with the call. No UI has to change as the way it was written was dynamic to grab the first key found. This also adds the functional tests to `x-pack/scripts/functional_tests.js` which was not there originally so the end to tend tests should actually run on the CI machine where it was not running on CI before. Adds the functional tests to the code owners file as well. Ensure that you go to the test results page from the Jenkins build: <img width="901" alt="Screen Shot 2020-08-18 at 1 13 18 AM" src="https://user-images.githubusercontent.com/1151048/90482180-13f7c800-e0f0-11ea-92f2-b30a8fffe84e.png"> And ensure you see the tests under: ``` X-Pack Lists Integration Tests ``` Then click through it and ensure they are shown as running and passing ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
This commit is contained in:
parent
7ac929b4cb
commit
02fcbaa794
6 changed files with 270 additions and 1 deletions
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
|
@ -267,6 +267,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
|
|||
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
|
||||
/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
|
||||
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
|
||||
/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
|
||||
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
|
||||
/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
|
||||
/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
|
||||
|
|
181
x-pack/plugins/lists/server/routes/read_privileges_route.mock.ts
Normal file
181
x-pack/plugins/lists/server/routes/read_privileges_route.mock.ts
Normal file
|
@ -0,0 +1,181 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
interface Cluster {
|
||||
monitor_ml: boolean;
|
||||
manage_ccr: boolean;
|
||||
manage_index_templates: boolean;
|
||||
monitor_watcher: boolean;
|
||||
monitor_transform: boolean;
|
||||
read_ilm: boolean;
|
||||
manage_security: boolean;
|
||||
manage_own_api_key: boolean;
|
||||
manage_saml: boolean;
|
||||
all: boolean;
|
||||
manage_ilm: boolean;
|
||||
manage_ingest_pipelines: boolean;
|
||||
read_ccr: boolean;
|
||||
manage_rollup: boolean;
|
||||
monitor: boolean;
|
||||
manage_watcher: boolean;
|
||||
manage: boolean;
|
||||
manage_transform: boolean;
|
||||
manage_api_key: boolean;
|
||||
manage_token: boolean;
|
||||
manage_ml: boolean;
|
||||
manage_pipeline: boolean;
|
||||
monitor_rollup: boolean;
|
||||
transport_client: boolean;
|
||||
create_snapshot: boolean;
|
||||
}
|
||||
|
||||
interface Index {
|
||||
[indexName: string]: {
|
||||
all: boolean;
|
||||
manage_ilm: boolean;
|
||||
read: boolean;
|
||||
create_index: boolean;
|
||||
read_cross_cluster: boolean;
|
||||
index: boolean;
|
||||
monitor: boolean;
|
||||
delete: boolean;
|
||||
manage: boolean;
|
||||
delete_index: boolean;
|
||||
create_doc: boolean;
|
||||
view_index_metadata: boolean;
|
||||
create: boolean;
|
||||
manage_follow_index: boolean;
|
||||
manage_leader_index: boolean;
|
||||
write: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
interface IndexPrivilege {
|
||||
application: {};
|
||||
cluster: Cluster;
|
||||
has_all_requested: boolean;
|
||||
index: Index;
|
||||
username: string;
|
||||
}
|
||||
|
||||
export interface Privilege {
|
||||
listItems: IndexPrivilege;
|
||||
lists: IndexPrivilege;
|
||||
is_authenticated: boolean;
|
||||
}
|
||||
|
||||
export const getReadPrivilegeMock = (
|
||||
listIndex: string = '.lists-default',
|
||||
listItemsIndex: string = '.items-default',
|
||||
username = 'elastic',
|
||||
booleanValues: boolean = true
|
||||
): Privilege => ({
|
||||
is_authenticated: true,
|
||||
listItems: {
|
||||
application: {},
|
||||
cluster: {
|
||||
all: booleanValues,
|
||||
create_snapshot: booleanValues,
|
||||
manage: booleanValues,
|
||||
manage_api_key: booleanValues,
|
||||
manage_ccr: booleanValues,
|
||||
manage_ilm: booleanValues,
|
||||
manage_index_templates: booleanValues,
|
||||
manage_ingest_pipelines: booleanValues,
|
||||
manage_ml: booleanValues,
|
||||
manage_own_api_key: false,
|
||||
manage_pipeline: booleanValues,
|
||||
manage_rollup: booleanValues,
|
||||
manage_saml: booleanValues,
|
||||
manage_security: booleanValues,
|
||||
manage_token: booleanValues,
|
||||
manage_transform: booleanValues,
|
||||
manage_watcher: booleanValues,
|
||||
monitor: booleanValues,
|
||||
monitor_ml: booleanValues,
|
||||
monitor_rollup: booleanValues,
|
||||
monitor_transform: booleanValues,
|
||||
monitor_watcher: booleanValues,
|
||||
read_ccr: booleanValues,
|
||||
read_ilm: booleanValues,
|
||||
transport_client: booleanValues,
|
||||
},
|
||||
has_all_requested: false,
|
||||
index: {
|
||||
[listItemsIndex]: {
|
||||
all: booleanValues,
|
||||
create: booleanValues,
|
||||
create_doc: booleanValues,
|
||||
create_index: booleanValues,
|
||||
delete: booleanValues,
|
||||
delete_index: booleanValues,
|
||||
index: booleanValues,
|
||||
manage: booleanValues,
|
||||
manage_follow_index: booleanValues,
|
||||
manage_ilm: booleanValues,
|
||||
manage_leader_index: booleanValues,
|
||||
monitor: booleanValues,
|
||||
read: booleanValues,
|
||||
read_cross_cluster: booleanValues,
|
||||
view_index_metadata: booleanValues,
|
||||
write: booleanValues,
|
||||
},
|
||||
},
|
||||
username,
|
||||
},
|
||||
lists: {
|
||||
application: {},
|
||||
cluster: {
|
||||
all: booleanValues,
|
||||
create_snapshot: booleanValues,
|
||||
manage: booleanValues,
|
||||
manage_api_key: booleanValues,
|
||||
manage_ccr: booleanValues,
|
||||
manage_ilm: booleanValues,
|
||||
manage_index_templates: booleanValues,
|
||||
manage_ingest_pipelines: booleanValues,
|
||||
manage_ml: booleanValues,
|
||||
manage_own_api_key: false,
|
||||
manage_pipeline: booleanValues,
|
||||
manage_rollup: booleanValues,
|
||||
manage_saml: booleanValues,
|
||||
manage_security: booleanValues,
|
||||
manage_token: booleanValues,
|
||||
manage_transform: booleanValues,
|
||||
manage_watcher: booleanValues,
|
||||
monitor: booleanValues,
|
||||
monitor_ml: booleanValues,
|
||||
monitor_rollup: booleanValues,
|
||||
monitor_transform: booleanValues,
|
||||
monitor_watcher: booleanValues,
|
||||
read_ccr: booleanValues,
|
||||
read_ilm: booleanValues,
|
||||
transport_client: booleanValues,
|
||||
},
|
||||
has_all_requested: false,
|
||||
index: {
|
||||
[listIndex]: {
|
||||
all: booleanValues,
|
||||
create: booleanValues,
|
||||
create_doc: booleanValues,
|
||||
create_index: booleanValues,
|
||||
delete: booleanValues,
|
||||
delete_index: booleanValues,
|
||||
index: booleanValues,
|
||||
manage: booleanValues,
|
||||
manage_follow_index: booleanValues,
|
||||
manage_ilm: booleanValues,
|
||||
manage_leader_index: booleanValues,
|
||||
monitor: booleanValues,
|
||||
read: booleanValues,
|
||||
read_cross_cluster: booleanValues,
|
||||
view_index_metadata: booleanValues,
|
||||
write: booleanValues,
|
||||
},
|
||||
},
|
||||
username,
|
||||
},
|
||||
});
|
|
@ -36,7 +36,7 @@ export const readPrivilegesRoute = (
|
|||
);
|
||||
const clusterPrivilegesListItems = await readPrivileges(
|
||||
clusterClient.callAsCurrentUser,
|
||||
lists.getListIndex()
|
||||
lists.getListItemIndex()
|
||||
);
|
||||
const privileges = merge(
|
||||
{
|
||||
|
|
|
@ -26,6 +26,7 @@ const onlyNotInCoverageTests = [
|
|||
require.resolve('../test/apm_api_integration/trial/config.ts'),
|
||||
require.resolve('../test/detection_engine_api_integration/security_and_spaces/config.ts'),
|
||||
require.resolve('../test/detection_engine_api_integration/basic/config.ts'),
|
||||
require.resolve('../test/lists_api_integration/security_and_spaces/config.ts'),
|
||||
require.resolve('../test/plugin_api_integration/config.ts'),
|
||||
require.resolve('../test/kerberos_api_integration/config.ts'),
|
||||
require.resolve('../test/kerberos_api_integration/anonymous_access.config.ts'),
|
||||
|
|
|
@ -33,5 +33,6 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
|
|||
loadTestFile(require.resolve('./delete_exception_list_items'));
|
||||
loadTestFile(require.resolve('./find_exception_lists'));
|
||||
loadTestFile(require.resolve('./find_exception_list_items'));
|
||||
loadTestFile(require.resolve('./read_list_privileges'));
|
||||
});
|
||||
};
|
||||
|
|
|
@ -0,0 +1,85 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import expect from '@kbn/expect';
|
||||
|
||||
import { getReadPrivilegeMock } from '../../../../plugins/lists/server/routes/read_privileges_route.mock';
|
||||
import { FtrProviderContext } from '../../common/ftr_provider_context';
|
||||
import { LIST_PRIVILEGES_URL } from '../../../../plugins/lists/common/constants';
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default ({ getService }: FtrProviderContext) => {
|
||||
const supertest = getService('supertest');
|
||||
const security = getService('security');
|
||||
const spacesService = getService('spaces');
|
||||
const supertestWithoutAuth = getService('supertestWithoutAuth');
|
||||
|
||||
describe('read_list_privileges', () => {
|
||||
const space1Id = 'space_1';
|
||||
|
||||
const user1 = {
|
||||
username: 'user_1',
|
||||
roleName: 'user_1',
|
||||
password: 'user_1-password',
|
||||
};
|
||||
|
||||
beforeEach(async () => {
|
||||
await spacesService.create({
|
||||
id: space1Id,
|
||||
name: space1Id,
|
||||
disabledFeatures: [],
|
||||
});
|
||||
|
||||
await security.role.create(user1.roleName, {
|
||||
kibana: [
|
||||
{
|
||||
feature: {
|
||||
dashboard: ['all'],
|
||||
siem: ['all', 'read'],
|
||||
},
|
||||
spaces: [space1Id],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await security.user.create(user1.username, {
|
||||
password: user1.password,
|
||||
roles: [user1.roleName],
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await spacesService.delete(space1Id);
|
||||
});
|
||||
|
||||
it('should return true for all privileges when its the system user of "elastic" in space of "default"', async () => {
|
||||
const { body } = await supertest.get(LIST_PRIVILEGES_URL).set('kbn-xsrf', 'true').expect(200);
|
||||
expect(body).to.eql(getReadPrivilegeMock());
|
||||
});
|
||||
|
||||
it('should return true for all privileges when its the system user of "elastic" in space of "space_1"', async () => {
|
||||
const { body } = await supertest.get(LIST_PRIVILEGES_URL).set('kbn-xsrf', 'true').expect(200);
|
||||
expect(body).to.eql(getReadPrivilegeMock());
|
||||
});
|
||||
|
||||
it('should return false for all privileges when its the system user of "user_1" in a space of "space_1"', async () => {
|
||||
const { body } = await supertestWithoutAuth
|
||||
.get(`/s/${space1Id}${LIST_PRIVILEGES_URL}`)
|
||||
.auth(user1.username, user1.password)
|
||||
.send()
|
||||
.expect(200);
|
||||
|
||||
const privilege = getReadPrivilegeMock(
|
||||
`.lists-${space1Id}`,
|
||||
`.items-${space1Id}`,
|
||||
user1.username,
|
||||
false
|
||||
);
|
||||
|
||||
expect(body).to.eql(privilege);
|
||||
});
|
||||
});
|
||||
};
|
Loading…
Add table
Add a link
Reference in a new issue