Addressing second round of feedback

elastic · Sep 3, 2020 · 987c6f4 · 987c6f4
1 parent 19e1e00
commit 987c6f4
Show file tree

Hide file tree

Showing 9 changed files with 913 additions and 75 deletions.
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
@@ -168,9 +168,8 @@ export function disableUICapabilitiesFactory(
       const isCatalogueFeature = featureId === 'catalogue';
       const isManagementFeature = featureId === 'management';
 
-      let hasRequiredKibanaPrivileges = false;
       if (!isElasticsearchFeature) {
-        hasRequiredKibanaPrivileges = checkPrivilegesResponse.privileges.kibana.some(
+        const hasRequiredKibanaPrivileges = checkPrivilegesResponse.privileges.kibana.some(
           (x) => x.privilege === action && x.authorized === true
         );
 

diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
@@ -4,14 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { FeatureKibanaPrivileges } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeApiBuilder extends BaseFeaturePrivilegeBuilder {
-  public getActions(
-    privilegeDefinition: FeatureKibanaPrivileges,
-    feature: KibanaFeature
-  ): string[] {
+  public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
     if (privilegeDefinition.api) {
       return privilegeDefinition.api.map((operation) => this.actions.api.get(operation));
     }

diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
@@ -4,14 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { FeatureKibanaPrivileges } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeAppBuilder extends BaseFeaturePrivilegeBuilder {
-  public getActions(
-    privilegeDefinition: FeatureKibanaPrivileges,
-    feature: KibanaFeature
-  ): string[] {
+  public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
     const appIds = privilegeDefinition.app;
 
     if (!appIds) {

diff --git a/...k/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts b/...k/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
@@ -4,14 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { FeatureKibanaPrivileges } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeCatalogueBuilder extends BaseFeaturePrivilegeBuilder {
-  public getActions(
-    privilegeDefinition: FeatureKibanaPrivileges,
-    feature: KibanaFeature
-  ): string[] {
+  public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
     const catalogueEntries = privilegeDefinition.catalogue;
 
     if (!catalogueEntries) {

diff --git a/.../plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts b/.../plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
@@ -4,14 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { FeatureKibanaPrivileges } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeManagementBuilder extends BaseFeaturePrivilegeBuilder {
-  public getActions(
-    privilegeDefinition: FeatureKibanaPrivileges,
-    feature: KibanaFeature
-  ): string[] {
+  public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
     const managementSections = privilegeDefinition.management;
 
     if (!managementSections) {

diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
@@ -4,14 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { FeatureKibanaPrivileges } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeNavlinkBuilder extends BaseFeaturePrivilegeBuilder {
-  public getActions(
-    privilegeDefinition: FeatureKibanaPrivileges,
-    feature: KibanaFeature
-  ): string[] {
+  public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
     return (privilegeDefinition.app ?? []).map((app) => this.actions.ui.get('navLinks', app));
   }
 }
diff --git a/...lugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts b/...lugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
@@ -5,18 +5,15 @@
  */
 
 import { flatten, uniq } from 'lodash';
-import { KibanaFeature, FeatureKibanaPrivileges } from '../../../../../features/server';
+import { FeatureKibanaPrivileges } from '../../../../../features/server';
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 const readOperations: string[] = ['bulk_get', 'get', 'find'];
 const writeOperations: string[] = ['create', 'bulk_create', 'update', 'bulk_update', 'delete'];
 const allOperations: string[] = [...readOperations, ...writeOperations];
 
 export class FeaturePrivilegeSavedObjectBuilder extends BaseFeaturePrivilegeBuilder {
-  public getActions(
-    privilegeDefinition: FeatureKibanaPrivileges,
-    feature: KibanaFeature
-  ): string[] {
+  public getActions(privilegeDefinition: FeatureKibanaPrivileges): string[] {
     return uniq([
       ...flatten(
         privilegeDefinition.savedObject.all.map((type) => [

diff --git a/...ver/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts b/...ver/authorization/privileges/feature_privilege_iterator/sub_feature_privilege_iterator.ts
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SubFeaturePrivilegeConfig } from '../../../../../features/common';
-import { KibanaFeature } from '../../../../../features/server';
+import { KibanaFeature, SubFeaturePrivilegeConfig } from '../../../../../features/common';
 
 export function* subFeaturePrivilegeIterator(
   feature: KibanaFeature