Skip to content

Role Management - use ES Builtin Privilege API to drive list of privileges #40270

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
merged 5 commits into from
Jul 10, 2019
Merged

Role Management - use ES Builtin Privilege API to drive list of privileges #40270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94b1967
use ES builtin privileges API for role management
legrego Jul 3, 2019
7c5f601
Exclude 'none' from privilege lists
legrego Jul 3, 2019
a7f4d57
Merge branch 'master' of github.com:elastic/kibana into security/es-p…
legrego Jul 8, 2019
4dc6721
additional cleanup
legrego Jul 8, 2019
1350fd8
Merge branch 'master' of github.com:elastic/kibana into security/es-p…
legrego Jul 10, 2019
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
10 changes: 10 additions & 0 deletions x-pack/legacy/plugins/security/common/model/builtin_es_privileges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* 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.
*/

export interface BuiltinESPrivileges {
Copy link
Member Author

@legrego legrego Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not married to the name, but I thought I'd keep it consistent with what ES chose to call this.

cluster: string[];
index: string[];
}
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/security/common/model/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ export { RawKibanaPrivileges, RawKibanaFeaturePrivileges } from './raw_kibana_pr
export { KibanaPrivileges } from './kibana_privileges';
export { User, EditUser, getUserDisplayName } from './user';
export { AuthenticatedUser, canUserChangePassword } from './authenticated_user';
export { BuiltinESPrivileges } from './builtin_es_privileges';
2 changes: 2 additions & 0 deletions x-pack/legacy/plugins/security/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { initUsersApi } from './server/routes/api/v1/users';
import { initExternalRolesApi } from './server/routes/api/external/roles';
import { initPrivilegesApi } from './server/routes/api/external/privileges';
import { initIndicesApi } from './server/routes/api/v1/indices';
import { initGetBuiltinPrivilegesApi } from './server/routes/api/v1/builtin_privileges';
import { initOverwrittenSessionView } from './server/routes/views/overwritten_session';
import { initLoginView } from './server/routes/views/login';
import { initLogoutView } from './server/routes/views/logout';
Expand Down Expand Up @@ -212,6 +213,7 @@ export const security = (kibana) => new kibana.Plugin({
initExternalRolesApi(server);
initIndicesApi(server);
initPrivilegesApi(server);
initGetBuiltinPrivilegesApi(server);
initLoginView(server, xpackMainPlugin);
initLogoutView(server);
initLoggedOutView(server);
Expand Down
18 changes: 0 additions & 18 deletions x-pack/legacy/plugins/security/public/services/application_privilege.js
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions x-pack/legacy/plugins/security/public/services/role_privileges.js
View file
Open in desktop

This file was deleted.

79 changes: 55 additions & 24 deletions ...acy/plugins/security/public/views/management/edit_role/components/edit_role_page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ const buildRawKibanaPrivileges = () => {
return privilegesFactory(actions, xpackMainPlugin as any).get();
};

const buildBuiltinESPrivileges = () => {
return {
cluster: ['all', 'manage', 'monitor'],
index: ['all', 'read', 'write', 'index'],
};
};

const buildUICapabilities = (canManageSpaces = true) => {
return {
catalogue: {},
Expand Down Expand Up @@ -132,7 +139,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const spaces: Space[] = buildSpaces();
const uiCapabilities: UICapabilities = buildUICapabilities();

Expand All @@ -146,7 +154,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={spaces}
spacesEnabled={true}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -180,7 +189,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const spaces: Space[] = buildSpaces();
const uiCapabilities: UICapabilities = buildUICapabilities();

Expand All @@ -194,7 +204,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={spaces}
spacesEnabled={true}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -222,7 +233,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const spaces: Space[] = buildSpaces();
const uiCapabilities: UICapabilities = buildUICapabilities();

Expand All @@ -236,7 +248,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={spaces}
spacesEnabled={true}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -280,7 +293,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const spaces: Space[] = buildSpaces();
const uiCapabilities: UICapabilities = buildUICapabilities();

Expand All @@ -294,7 +308,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={spaces}
spacesEnabled={true}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -327,7 +342,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const spaces: Space[] = buildSpaces();
const uiCapabilities: UICapabilities = buildUICapabilities(false);

Expand All @@ -341,7 +357,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={spaces}
spacesEnabled={true}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -374,7 +391,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const spaces: Space[] = buildSpaces();
const uiCapabilities: UICapabilities = buildUICapabilities(false);

Expand All @@ -388,7 +406,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={spaces}
spacesEnabled={true}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -424,7 +443,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const uiCapabilities: UICapabilities = buildUICapabilities();

const wrapper = mountWithIntl(
Expand All @@ -437,7 +457,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={[]}
spacesEnabled={false}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -471,7 +492,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const uiCapabilities: UICapabilities = buildUICapabilities();

const wrapper = mountWithIntl(
Expand All @@ -484,7 +506,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={[]}
spacesEnabled={false}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -512,7 +535,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const uiCapabilities: UICapabilities = buildUICapabilities();

const wrapper = mountWithIntl(
Expand All @@ -525,7 +549,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={[]}
spacesEnabled={false}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -568,7 +593,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const uiCapabilities: UICapabilities = buildUICapabilities();

const wrapper = mountWithIntl(
Expand All @@ -581,7 +607,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={[]}
spacesEnabled={false}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -613,7 +640,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const uiCapabilities: UICapabilities = buildUICapabilities(false);

const wrapper = mountWithIntl(
Expand All @@ -626,7 +654,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={[]}
spacesEnabled={false}
uiCapabilities={uiCapabilities}
Expand Down Expand Up @@ -659,7 +688,8 @@ describe('<EditRolePage />', () => {
const features: Feature[] = buildFeatures();
const mockHttpClient = jest.fn();
const indexPatterns: string[] = ['foo*', 'bar*'];
const privileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const kibanaPrivileges: RawKibanaPrivileges = buildRawKibanaPrivileges();
const builtinESPrivileges = buildBuiltinESPrivileges();
const uiCapabilities: UICapabilities = buildUICapabilities(false);

const wrapper = mountWithIntl(
Expand All @@ -672,7 +702,8 @@ describe('<EditRolePage />', () => {
features={features}
httpClient={mockHttpClient}
indexPatterns={indexPatterns}
privileges={privileges}
kibanaPrivileges={kibanaPrivileges}
builtinESPrivileges={builtinESPrivileges}
spaces={[]}
spacesEnabled={false}
uiCapabilities={uiCapabilities}
Expand Down
Loading