Merge branch '7.x' into backport/7.x/pr-78403

src/core/server/capabilities/capabilities_service.mock.ts

@@ -18,6 +18,7 @@
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { CapabilitiesService, CapabilitiesSetup, CapabilitiesStart } from './capabilities_service';
+import { Capabilities } from './types';
 
 const createSetupContractMock = () => {
   const setupContract: jest.Mocked<CapabilitiesSetup> = {
@@ -34,6 +35,14 @@ const createStartContractMock = () => {
   return setupContract;
 };
 
+const createCapabilitiesMock = (): Capabilities => {
+  return {
+    navLinks: {},
+    management: {},
+    catalogue: {},
+  };
+};
+
 type CapabilitiesServiceContract = PublicMethodsOf<CapabilitiesService>;
 const createMock = () => {
   const mocked: jest.Mocked<CapabilitiesServiceContract> = {
@@ -47,4 +56,5 @@ export const capabilitiesServiceMock = {
   create: createMock,
   createSetupContract: createSetupContractMock,
   createStartContract: createStartContractMock,
+  createCapabilities: createCapabilitiesMock,
 };

src/core/server/mocks.ts

@@ -54,6 +54,7 @@ export { metricsServiceMock } from './metrics/metrics_service.mock';
 export { renderingMock } from './rendering/rendering_service.mock';
 export { statusServiceMock } from './status/status_service.mock';
 export { contextServiceMock } from './context/context_service.mock';
+export { capabilitiesServiceMock } from './capabilities/capabilities_service.mock';
 
 export function pluginInitializerContextConfigMock<T>(config: T) {
   const globalConfig: SharedGlobalConfig = {

x-pack/plugins/enterprise_search/public/plugin.ts

@@ -59,11 +59,11 @@ export class EnterpriseSearchPlugin implements Plugin {
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params);
-        const pluginData = this.getPluginData();
-
         const { chrome, http } = kibanaDeps.core;
         chrome.docTitle.change(ENTERPRISE_SEARCH_PLUGIN.NAME);
+
         await this.getInitialData(http);
+        const pluginData = this.getPluginData();
 
         const { renderApp } = await import('./applications');
         const { EnterpriseSearch } = await import('./applications/enterprise_search');
@@ -80,11 +80,11 @@ export class EnterpriseSearchPlugin implements Plugin {
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params);
-        const pluginData = this.getPluginData();
-
         const { chrome, http } = kibanaDeps.core;
         chrome.docTitle.change(APP_SEARCH_PLUGIN.NAME);
+
         await this.getInitialData(http);
+        const pluginData = this.getPluginData();
 
         const { renderApp } = await import('./applications');
         const { AppSearch } = await import('./applications/app_search');
@@ -101,11 +101,11 @@ export class EnterpriseSearchPlugin implements Plugin {
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params);
-        const pluginData = this.getPluginData();
-
         const { chrome, http } = kibanaDeps.core;
         chrome.docTitle.change(APP_SEARCH_PLUGIN.NAME);
+
         await this.getInitialData(http);
+        const pluginData = this.getPluginData();
 
         const { renderApp, renderHeaderActions } = await import('./applications');
         const { WorkplaceSearch } = await import('./applications/workplace_search');

x-pack/plugins/global_search/server/services/context.mock.ts

@@ -4,14 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { of } from 'rxjs';
+import { Capabilities } from 'src/core/server';
 import {
   savedObjectsTypeRegistryMock,
   savedObjectsClientMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
+  capabilitiesServiceMock,
 } from '../../../../../src/core/server/mocks';
 
-const createContextMock = () => {
+const createContextMock = (capabilities: Partial<Capabilities> = {}) => {
   return {
     core: {
       savedObjects: {
@@ -26,6 +29,10 @@ const createContextMock = () => {
       uiSettings: {
         client: uiSettingsServiceMock.createClient(),
       },
+      capabilities: of({
+        ...capabilitiesServiceMock.createCapabilities(),
+        ...capabilities,
+      } as Capabilities),
     },
   };
 };

x-pack/plugins/global_search/server/services/context.test.ts

@@ -27,11 +27,15 @@ describe('getContextFactory', () => {
     expect(coreStart.uiSettings.asScopedToClient).toHaveBeenCalledTimes(1);
     expect(coreStart.uiSettings.asScopedToClient).toHaveBeenCalledWith(soClient);
 
+    expect(coreStart.capabilities.resolveCapabilities).toHaveBeenCalledTimes(1);
+    expect(coreStart.capabilities.resolveCapabilities).toHaveBeenCalledWith(request);
+
     expect(context).toEqual({
       core: {
         savedObjects: expect.any(Object),
         elasticsearch: expect.any(Object),
         uiSettings: expect.any(Object),
+        capabilities: expect.any(Object),
       },
     });
   });

x-pack/plugins/global_search/server/services/context.ts

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { from } from 'rxjs';
 import { CoreStart, KibanaRequest } from 'src/core/server';
 import { GlobalSearchProviderContext } from '../types';
 
@@ -30,6 +31,7 @@ export const getContextFactory = (coreStart: CoreStart) => (
       uiSettings: {
         client: coreStart.uiSettings.asScopedToClient(soClient),
       },
+      capabilities: from(coreStart.capabilities.resolveCapabilities(request)),
     },
   };
 };

x-pack/plugins/global_search/server/types.ts

@@ -10,6 +10,7 @@ import {
   ILegacyScopedClusterClient,
   IUiSettingsClient,
   SavedObjectsClientContract,
+  Capabilities,
 } from 'src/core/server';
 import {
   GlobalSearchBatchedResults,
@@ -52,6 +53,7 @@ export interface GlobalSearchProviderContext {
     uiSettings: {
       client: IUiSettingsClient;
     };
+    capabilities: Observable<Capabilities>;
   };
 }
 

x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts

@@ -4,7 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsFindResult, SavedObjectsType, SavedObjectTypeRegistry } from 'src/core/server';
+import {
+  SavedObjectsFindResult,
+  SavedObjectsType,
+  SavedObjectTypeRegistry,
+  Capabilities,
+} from 'src/core/server';
 import { mapToResult, mapToResults } from './map_object_to_result';
 
 const createType = (props: Partial<SavedObjectsType>): SavedObjectsType => {
@@ -111,18 +116,17 @@ describe('mapToResult', () => {
 
 describe('mapToResults', () => {
   let typeRegistry: SavedObjectTypeRegistry;
+  let capabilities: Capabilities;
 
   beforeEach(() => {
     typeRegistry = new SavedObjectTypeRegistry();
-  });
 
-  it('converts savedObjects to results', () => {
     typeRegistry.registerType(
       createType({
         name: 'typeA',
         management: {
           defaultSearchField: 'title',
-          getInAppUrl: (obj) => ({ path: `/type-a/${obj.id}`, uiCapabilitiesPath: '' }),
+          getInAppUrl: (obj) => ({ path: `/type-a/${obj.id}`, uiCapabilitiesPath: 'test.typeA' }),
         },
       })
     );
@@ -131,7 +135,7 @@ describe('mapToResults', () => {
         name: 'typeB',
         management: {
           defaultSearchField: 'description',
-          getInAppUrl: (obj) => ({ path: `/type-b/${obj.id}`, uiCapabilitiesPath: 'foo' }),
+          getInAppUrl: (obj) => ({ path: `/type-b/${obj.id}`, uiCapabilitiesPath: 'test.typeB' }),
         },
       })
     );
@@ -140,11 +144,37 @@ describe('mapToResults', () => {
         name: 'typeC',
         management: {
           defaultSearchField: 'excerpt',
-          getInAppUrl: (obj) => ({ path: `/type-c/${obj.id}`, uiCapabilitiesPath: 'bar' }),
+          getInAppUrl: (obj) => ({ path: `/type-c/${obj.id}`, uiCapabilitiesPath: 'test.typeC' }),
         },
       })
     );
+    typeRegistry.registerType(
+      createType({
+        name: 'inaccessibleType',
+        management: {
+          defaultSearchField: 'excerpt',
+          getInAppUrl: (obj) => ({
+            path: `/inaccessible-type/${obj.id}`,
+            uiCapabilitiesPath: 'test.inaccessibleType',
+          }),
+        },
+      })
+    );
+
+    capabilities = {
+      navLinks: {},
+      management: {},
+      catalogue: {},
+      test: {
+        typeA: true,
+        typeB: true,
+        typeC: true,
+        inacessibleType: false,
+      },
+    };
+  });
 
+  it('converts savedObjects to results', () => {
     const results = [
       createObject(
         {
@@ -181,7 +211,7 @@ describe('mapToResults', () => {
       ),
     ];
 
-    expect(mapToResults(results, typeRegistry)).toEqual([
+    expect(mapToResults(results, typeRegistry, capabilities)).toEqual([
       {
         id: 'resultA',
         title: 'titleA',
@@ -205,4 +235,41 @@ describe('mapToResults', () => {
       },
     ]);
   });
+
+  it('filters results without permissions', () => {
+    const results = [
+      createObject(
+        {
+          id: 'resultA',
+          type: 'typeA',
+          score: 100,
+        },
+        {
+          title: 'titleA',
+          field: 'noise',
+        }
+      ),
+      createObject(
+        {
+          id: 'inaccessibleResult',
+          type: 'inaccessibleType',
+          score: 92,
+        },
+        {
+          excerpt: 'inaccessibleTitle',
+          title: 'inaccessible',
+        }
+      ),
+    ];
+
+    expect(mapToResults(results, typeRegistry, capabilities)).toEqual([
+      {
+        id: 'resultA',
+        title: 'titleA',
+        type: 'typeA',
+        url: '/type-a/resultA',
+        score: 100,
+      },
+    ]);
+  });
 });

x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts

@@ -4,18 +4,36 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import get from 'lodash/get';
 import {
   SavedObjectsType,
   ISavedObjectTypeRegistry,
   SavedObjectsFindResult,
+  Capabilities,
 } from 'src/core/server';
 import { GlobalSearchProviderResult } from '../../../../global_search/server';
 
 export const mapToResults = (
   objects: Array<SavedObjectsFindResult<unknown>>,
-  registry: ISavedObjectTypeRegistry
+  registry: ISavedObjectTypeRegistry,
+  capabilities: Capabilities
 ): GlobalSearchProviderResult[] => {
-  return objects.map((obj) => mapToResult(obj, registry.getType(obj.type)!));
+  return objects
+    .filter((obj) => isAccessible(obj, registry.getType(obj.type)!, capabilities))
+    .map((obj) => mapToResult(obj, registry.getType(obj.type)!));
+};
+
+const isAccessible = (
+  object: SavedObjectsFindResult<unknown>,
+  type: SavedObjectsType,
+  capabilities: Capabilities
+): boolean => {
+  const { getInAppUrl } = type.management ?? {};
+  if (getInAppUrl === undefined) {
+    throw new Error('Trying to map an object from a type without management metadata');
+  }
+  const { uiCapabilitiesPath } = getInAppUrl(object);
+  return Boolean(get(capabilities, uiCapabilitiesPath) ?? false);
 };
 
 export const mapToResult = (

x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts

@@ -33,16 +33,20 @@ const createFindResponse = (
   total: results.length,
 });
 
-const createType = (props: Partial<SavedObjectsType>): SavedObjectsType => {
+const createType = (
+  props: Pick<SavedObjectsType, 'name'> & Partial<SavedObjectsType>
+): SavedObjectsType => {
   return {
-    name: 'type',
     hidden: false,
     namespaceType: 'single',
     mappings: { properties: {} },
     ...props,
     management: {
       defaultSearchField: 'field',
-      getInAppUrl: (obj) => ({ path: `/object/${obj.id}`, uiCapabilitiesPath: '' }),
+      getInAppUrl: (obj) => ({
+        path: `/object/${obj.id}`,
+        uiCapabilitiesPath: `types.${props.name}`,
+      }),
       ...props.management,
     },
   };
@@ -82,7 +86,7 @@ describe('savedObjectsResultProvider', () => {
         name: 'typeA',
         management: {
           defaultSearchField: 'title',
-          getInAppUrl: (obj) => ({ path: `/type-a/${obj.id}`, uiCapabilitiesPath: '' }),
+          getInAppUrl: (obj) => ({ path: `/type-a/${obj.id}`, uiCapabilitiesPath: 'test.typeA' }),
         },
       })
     );
@@ -91,12 +95,17 @@ describe('savedObjectsResultProvider', () => {
         name: 'typeB',
         management: {
           defaultSearchField: 'description',
-          getInAppUrl: (obj) => ({ path: `/type-b/${obj.id}`, uiCapabilitiesPath: 'foo' }),
+          getInAppUrl: (obj) => ({ path: `/type-b/${obj.id}`, uiCapabilitiesPath: 'test.typeB' }),
         },
       })
     );
 
-    context = globalSearchPluginMock.createProviderContext();
+    context = globalSearchPluginMock.createProviderContext({
+      test: {
+        typeA: true,
+        typeB: true,
+      },
+    });
     context.core.savedObjects.client.find.mockResolvedValue(createFindResponse([]));
     context.core.savedObjects.typeRegistry = registry as any;
   });