Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Osquery] Return proper indices permissions for osquery_manager package #103363

Merged
merged 1 commit into from
Jun 25, 2021
Merged

[Osquery] Return proper indices permissions for osquery_manager package #103363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
104 changes: 104 additions & 0 deletions x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,110 @@ describe('storedPackagePoliciesToAgentPermissions()', () => {
},
});
});

it('Returns the dataset for osquery_manager package', async () => {
getPackageInfoMock.mockResolvedValueOnce({
format_version: '1.0.0',
name: 'osquery_manager',
title: 'Osquery Manager',
version: '0.3.0',
license: 'basic',
description:
'Centrally manage osquery deployments, run live queries, and schedule recurring queries',
type: 'integration',
release: 'beta',
categories: ['security', 'os_system', 'config_management'],
icons: [
{
src: '/img/logo_osquery.svg',
title: 'logo osquery',
size: '32x32',
type: 'image/svg+xml',
},
],
owner: { github: 'elastic/integrations' },
readme: '/package/osquery_manager/0.3.0/docs/README.md',
data_streams: [
{
dataset: 'osquery_manager.result',
package: 'osquery_manager',
ingest_pipeline: 'default',
path: 'result',
streams: [],
title: 'Osquery Manager queries',
type: 'logs',
release: 'experimental',
},
],
latestVersion: '0.3.0',
removable: true,
notice: undefined,
status: 'not_installed',
assets: {
kibana: {
dashboard: [],
visualization: [],
search: [],
index_pattern: [],
map: [],
lens: [],
security_rule: [],
ml_module: [],
},
elasticsearch: {
component_template: [],
ingest_pipeline: [],
ilm_policy: [],
transform: [],
index_template: [],
data_stream_ilm_policy: [],
},
},
});

const packagePolicies: PackagePolicy[] = [
{
id: '12345',
name: 'test-policy',
namespace: 'test',
enabled: true,
package: { name: 'osquery_manager', version: '0.0.0', title: 'Test Package' },
inputs: [
{
type: 'osquery_manager',
enabled: true,
streams: [
{
id: 'test-logs',
enabled: true,
data_stream: { type: 'logs', dataset: 'some-logs' },
compiled_stream: { data_stream: { dataset: 'compiled' } },
},
],
},
],
created_at: '',
updated_at: '',
created_by: '',
updated_by: '',
revision: 1,
policy_id: '',
output_id: '',
},
];

const permissions = await storedPackagePoliciesToAgentPermissions(soClient, packagePolicies);
expect(permissions).toMatchObject({
'test-policy': {
indices: [
{
names: ['logs-osquery_manager.result-test'],
privileges: ['auto_configure', 'create_doc'],
},
],
},
});
});
});

describe('getDataStreamPermissions()', () => {
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ export async function storedPackagePoliciesToAgentPermissions(
dataStreamsForPermissions = pkg.data_streams;
break;

case 'osquery_manager':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could just append this case to L62

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct, but as apm got a separate case as well, I just tried to follow a pattern :)
do you want me to squeeze all 3 into a single case?

// - Osquery manager doesn't store the `data_stream` metadata in
// `packagePolicy.inputs`, so we will use _all_ data_streams from
// the package.
dataStreamsForPermissions = pkg.data_streams;
break;

default:
// - Normal packages store some of the `data_stream` metadata in
// `packagePolicy.inputs[].streams[].data_stream`
Expand Down