github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 02:09:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add telemetry as an automatic privilege grant (#77390)

Browse source 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Larry Gregory 2020-09-17 10:48:08 -04:00 • committed by GitHub
parent e616c1501a
commit fc97a3741c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/plugins/telemetry/server/routes/telemetry_opt_in.ts
View file

@ -26,6 +26,7 @@ import {
StatsGetterConfig, StatsGetterConfig,
TelemetryCollectionManagerPluginSetup, TelemetryCollectionManagerPluginSetup,
} from 'src/plugins/telemetry_collection_manager/server'; } from 'src/plugins/telemetry_collection_manager/server';
import { SavedObjectsErrorHelpers } from '../../../../core/server';
import { getTelemetryAllowChangingOptInStatus } from '../../common/telemetry_config'; import { getTelemetryAllowChangingOptInStatus } from '../../common/telemetry_config';
import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats'; import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
@ -109,7 +110,13 @@ export function registerTelemetryOptInRoutes({
}); });
} }
await updateTelemetrySavedObject(context.core.savedObjects.client, attributes); try {
await updateTelemetrySavedObject(context.core.savedObjects.client, attributes);
} catch (e) {
if (SavedObjectsErrorHelpers.isForbiddenError(e)) {
return res.forbidden();
}
}
return res.ok({ body: optInStatus }); return res.ok({ body: optInStatus });
} }
); );

8
x-pack/plugins/features/server/feature_registry.test.ts
View file

@ -57,7 +57,7 @@ describe('FeatureRegistry', () => {
read: { read: {
savedObject: { savedObject: {
all: [], all: [],
read: ['config', 'url'], read: ['config', 'url', 'telemetry'],
}, },
ui: [], ui: [],
}, },
@ -230,7 +230,7 @@ describe('FeatureRegistry', () => {
expect(allPrivilege?.savedObject.all).toEqual(['telemetry']); expect(allPrivilege?.savedObject.all).toEqual(['telemetry']);
}); });
it(`automatically grants 'read' access to config and url saved objects for both privileges`, () => { it(`automatically grants access to config, url, and telemetry saved objects`, () => {
const feature: KibanaFeatureConfig = { const feature: KibanaFeatureConfig = {
id: 'test-feature', id: 'test-feature',
name: 'Test Feature', name: 'Test Feature',
@ -263,7 +263,7 @@ describe('FeatureRegistry', () => {
const allPrivilege = result[0].privileges?.all; const allPrivilege = result[0].privileges?.all;
const readPrivilege = result[0].privileges?.read; const readPrivilege = result[0].privileges?.read;
expect(allPrivilege?.savedObject.read).toEqual(['config', 'url']); expect(allPrivilege?.savedObject.read).toEqual(['config', 'url']);
expect(readPrivilege?.savedObject.read).toEqual(['config', 'url']); expect(readPrivilege?.savedObject.read).toEqual(['config', 'telemetry', 'url']);
}); });
it(`automatically grants 'all' access to telemetry and 'read' to [config, url] saved objects for the reserved privilege`, () => { it(`automatically grants 'all' access to telemetry and 'read' to [config, url] saved objects for the reserved privilege`, () => {
@ -332,7 +332,7 @@ describe('FeatureRegistry', () => {
const readPrivilege = result[0].privileges!.read; const readPrivilege = result[0].privileges!.read;
expect(allPrivilege?.savedObject.all).toEqual(['telemetry']); expect(allPrivilege?.savedObject.all).toEqual(['telemetry']);
expect(allPrivilege?.savedObject.read).toEqual(['config', 'url']); expect(allPrivilege?.savedObject.read).toEqual(['config', 'url']);
expect(readPrivilege?.savedObject.read).toEqual(['config', 'url']); expect(readPrivilege?.savedObject.read).toEqual(['config', 'url', 'telemetry']);
}); });
it(`does not allow duplicate features to be registered`, () => { it(`does not allow duplicate features to be registered`, () => {

7
x-pack/plugins/features/server/feature_registry.ts
View file

@ -97,7 +97,12 @@ function applyAutomaticReadPrivilegeGrants(
) { ) {
readPrivileges.forEach((readPrivilege) => { readPrivileges.forEach((readPrivilege) => {
if (readPrivilege) { if (readPrivilege) {
readPrivilege.savedObject.read = uniq([...readPrivilege.savedObject.read, 'config', 'url']); readPrivilege.savedObject.read = uniq([
...readPrivilege.savedObject.read,
'config',
'telemetry',
'url',
]);
} }
}); });
} }