Skip to content

Commit 987c6f4

Browse files
committed
Addressing second round of feedback
1 parent 19e1e00 commit 987c6f4

File tree

9 files changed

+913
-75
lines changed

9 files changed

+913
-75
lines changed

x-pack/plugins/security/server/authorization/check_privileges.test.ts

Lines changed: 899 additions & 41 deletions
Large diffs are not rendered by default.

x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ export function disableUICapabilitiesFactory(
168168
const isCatalogueFeature = featureId === 'catalogue';
169169
const isManagementFeature = featureId === 'management';
170170

171-
let hasRequiredKibanaPrivileges = false;
172171
if (!isElasticsearchFeature) {
173-
hasRequiredKibanaPrivileges = checkPrivilegesResponse.privileges.kibana.some(
172+
const hasRequiredKibanaPrivileges = checkPrivilegesResponse.privileges.kibana.some(
174173
(x) => x.privilege === action && x.authorized === true
175174
);
176175

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
7+
import { FeatureKibanaPrivileges } from '../../../../../features/server';
88
import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
99

1010
export class FeaturePrivilegeApiBuilder extends BaseFeaturePrivilegeBuilder {
11-
public getActions(
12-
privilegeDefinition: FeatureKibanaPrivileges,
13-
feature: KibanaFeature
14-
): string[] {
11+
public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
1512
if (privilegeDefinition.api) {
1613
return privilegeDefinition.api.map((operation) => this.actions.api.get(operation));
1714
}

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
7+
import { FeatureKibanaPrivileges } from '../../../../../features/server';
88
import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
99

1010
export class FeaturePrivilegeAppBuilder extends BaseFeaturePrivilegeBuilder {
11-
public getActions(
12-
privilegeDefinition: FeatureKibanaPrivileges,
13-
feature: KibanaFeature
14-
): string[] {
11+
public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
1512
const appIds = privilegeDefinition.app;
1613

1714
if (!appIds) {

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
7+
import { FeatureKibanaPrivileges } from '../../../../../features/server';
88
import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
99

1010
export class FeaturePrivilegeCatalogueBuilder extends BaseFeaturePrivilegeBuilder {
11-
public getActions(
12-
privilegeDefinition: FeatureKibanaPrivileges,
13-
feature: KibanaFeature
14-
): string[] {
11+
public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
1512
const catalogueEntries = privilegeDefinition.catalogue;
1613

1714
if (!catalogueEntries) {

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
7+
import { FeatureKibanaPrivileges } from '../../../../../features/server';
88
import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
99

1010
export class FeaturePrivilegeManagementBuilder extends BaseFeaturePrivilegeBuilder {
11-
public getActions(
12-
privilegeDefinition: FeatureKibanaPrivileges,
13-
feature: KibanaFeature
14-
): string[] {
11+
public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
1512
const managementSections = privilegeDefinition.management;
1613

1714
if (!managementSections) {

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
7+
import { FeatureKibanaPrivileges } from '../../../../../features/server';
88
import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
99

1010
export class FeaturePrivilegeNavlinkBuilder extends BaseFeaturePrivilegeBuilder {
11-
public getActions(
12-
privilegeDefinition: FeatureKibanaPrivileges,
13-
feature: KibanaFeature
14-
): string[] {
11+
public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
1512
return (privilegeDefinition.app ?? []).map((app) => this.actions.ui.get('navLinks', app));
1613
}
1714
}

x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55
*/
66

77
import { flatten, uniq } from 'lodash';
8-
import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
8+
import { FeatureKibanaPrivileges } from '../../../../../features/server';
99
import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
1010

1111
const readOperations: string[] = ['bulk_get', 'get', 'find'];
1212
const writeOperations: string[] = ['create', 'bulk_create', 'update', 'bulk_update', 'delete'];
1313
const allOperations: string[] = [...readOperations, ...writeOperations];
1414

1515
export class FeaturePrivilegeSavedObjectBuilder extends BaseFeaturePrivilegeBuilder {
16-
public getActions(
17-
privilegeDefinition: FeatureKibanaPrivileges,
18-
feature: KibanaFeature
19-
): string[] {
16+
public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
2017
return uniq([
2118
...flatten(
2219
privilegeDefinition.savedObject.all.map((type) => [

x-pack/plugins/security/server/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { SubFeaturePrivilegeConfig } from '../../../../../features/common';
8-
import { KibanaFeature } from '../../../../../features/server';
7+
import { KibanaFeature, SubFeaturePrivilegeConfig } from '../../../../../features/common';
98

109
export function* subFeaturePrivilegeIterator(
1110
feature: KibanaFeature

0 commit comments

Comments
 (0)