Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ const createSecuritySolutionRequestContextMock = (
getAssetCriticalityDataClient: jest.fn(() => clients.assetCriticalityDataClient),
getAuditLogger: jest.fn(() => mockAuditLogger),
getDataViewsService: jest.fn(),
getEntityStoreApiKeyManager: jest.fn(),
getEntityStoreDataClient: jest.fn(() => clients.entityStoreDataClient),
getSiemRuleMigrationsClient: jest.fn(() => clients.siemRuleMigrationsClient),
getInferenceClient: jest.fn(() => clients.getInferenceClient()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ export const applyDataViewIndicesEntityEngineRoute = (
});
}

const apiKeyManager = secSol.getEntityStoreApiKeyManager();
await apiKeyManager.generate();

if (errors.length === 0) {
return response.ok({
body: {
Expand All @@ -75,7 +78,7 @@ export const applyDataViewIndicesEntityEngineRoute = (
});
}
} catch (e) {
logger.error('Error in ApplyEntityEngineDataViewIndices:', e);
logger.error(`Error in ApplyEntityEngineDataViewIndices: ${e.message}`);
const error = transformError(e);
return siemResponse.error({
statusCode: error.statusCode,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,13 @@ export const registerEntityStoreDataViewRefreshTask = ({
request,
});

await entityStoreClient.applyDataViewIndices();
const { errors } = await entityStoreClient.applyDataViewIndices();

if (errors.length > 0) {
logger.error(
`Errors applying data view changes to the entity store. Errors: \n${errors.join('\n\n')}`
);
}
};

taskManager.registerTaskDefinitions({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ export class RequestContextFactory implements IRequestContextFactory {

const getAuditLogger = () => security?.audit.asScoped(request);

const getEntityStoreApiKeyManager = () =>
getApiKeyManager({
core: coreStart,
logger: options.logger,
security: startPlugins.security,
encryptedSavedObjects: startPlugins.encryptedSavedObjects,
request,
namespace: getSpaceId(),
});

// List of endpoint authz for the current request's user. Will be initialized the first
// time it is requested (see `getEndpointAuthz()` below)
let endpointAuthz: Immutable<EndpointAuthz>;
Expand Down Expand Up @@ -145,6 +155,8 @@ export class RequestContextFactory implements IRequestContextFactory {

getDataViewsService: () => dataViewsService,

getEntityStoreApiKeyManager,

getDetectionRulesClient: memoize(() => {
const mlAuthz = buildMlAuthz({
license: licensing.license,
Expand Down Expand Up @@ -258,14 +270,7 @@ export class RequestContextFactory implements IRequestContextFactory {
config: config.entityAnalytics.entityStore,
experimentalFeatures: config.experimentalFeatures,
telemetry: core.analytics,
apiKeyManager: getApiKeyManager({
core: coreStart,
logger,
security: startPlugins.security,
encryptedSavedObjects: startPlugins.encryptedSavedObjects,
request,
namespace: getSpaceId(),
}),
apiKeyManager: getEntityStoreApiKeyManager(),
security: startPlugins.security,
request,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import type { IDetectionRulesClient } from './lib/detection_engine/rule_manageme
import type { EntityStoreDataClient } from './lib/entity_analytics/entity_store/entity_store_data_client';
import type { SiemRuleMigrationsClient } from './lib/siem_migrations/rules/siem_rule_migrations_service';
import type { AssetInventoryDataClient } from './lib/asset_inventory/asset_inventory_data_client';
import type { ApiKeyManager } from './lib/entity_analytics/entity_store/auth/api_key';
export { AppClient };

export interface SecuritySolutionApiRequestHandlerContext {
Expand All @@ -56,6 +57,7 @@ export interface SecuritySolutionApiRequestHandlerContext {
getRacClient: (req: KibanaRequest) => Promise<AlertsClient>;
getAuditLogger: () => AuditLogger | undefined;
getDataViewsService: () => DataViewsService;
getEntityStoreApiKeyManager: () => ApiKeyManager;
getExceptionListClient: () => ExceptionListClient | null;
getInternalFleetServices: () => EndpointInternalFleetServicesInterface;
getRiskEngineDataClient: () => RiskEngineDataClient;
Expand Down