Skip to content

Commit

Permalink
Merge branch 'main' into task/olm-update-fleet-agent-status-API-5620
Browse files Browse the repository at this point in the history
  • Loading branch information
@ashokaditya
ashokaditya authored Jan 3, 2023
2 parents f0cd886 + 55f6006 commit b229f74
Show file tree
Hide file tree
Showing 6 changed files with 261 additions and 22 deletions.
11 changes: 6 additions & 5 deletions ...plugins/aiops/public/components/change_point_detection/change_point_detection_context.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import React, {
} from 'react';
import { type DataViewField } from '@kbn/data-views-plugin/public';
import { startWith } from 'rxjs';
import useMount from 'react-use/lib/useMount';
import type { Query, Filter } from '@kbn/es-query';
import { usePageUrlState } from '@kbn/ml-url-state';
import {
Expand Down Expand Up @@ -129,7 +128,7 @@ export const ChangePointDetectionContextProvider: FC = ({ children }) => {

const timeRange = useTimeRangeUpdates();

useMount(function updateIntervalOnTimeBoundsChange() {
useEffect(function updateIntervalOnTimeBoundsChange() {
const timeUpdateSubscription = timefilter
.getTimeUpdate$()
.pipe(startWith(timefilter.getTime()))
Expand All @@ -145,7 +144,8 @@ export const ChangePointDetectionContextProvider: FC = ({ children }) => {
return () => {
timeUpdateSubscription.unsubscribe();
};
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const metricFieldOptions = useMemo<DataViewField[]>(() => {
return dataView.fields.filter(({ aggregatable, type }) => aggregatable && type === 'number');
Expand Down Expand Up @@ -195,15 +195,16 @@ export const ChangePointDetectionContextProvider: FC = ({ children }) => {
[filterManager]
);

useMount(() => {
useEffect(() => {
setResultFilter(filterManager.getFilters());
const sub = filterManager.getUpdates$().subscribe(() => {
setResultFilter(filterManager.getFilters());
});
return () => {
sub.unsubscribe();
};
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

useEffect(
function syncFilters() {
Expand Down
Binary file added x-pack/test/fleet_api_integration/apis/fixtures/test_packages/endpoint/endpoint-8.6.1.zip
View file
Binary file not shown.
131 changes: 120 additions & 11 deletions x-pack/test/fleet_api_integration/apis/package_policy/get.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
import { skipIfNoDockerRegistry } from '../../helpers';
import { testUsers } from '../test_users';

export default function (providerContext: FtrProviderContext) {
const { getService } = providerContext;
const supertest = getService('supertest');
const superTestWithoutAuth = getService('supertestWithoutAuth');
const dockerServers = getService('dockerServers');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

const server = dockerServers.get('registry');
// use function () {} and not () => {} here
Expand All @@ -23,23 +27,19 @@ export default function (providerContext: FtrProviderContext) {
skipIfNoDockerRegistry(providerContext);

before(async () => {
await getService('kibanaServer').savedObjects.cleanStandardList();

await getService('esArchiver').load(
'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
);
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
});

after(async () => {
await getService('esArchiver').unload(
'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
);
await getService('kibanaServer').savedObjects.cleanStandardList();
await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
await kibanaServer.savedObjects.cleanStandardList();
});

describe('get by id', async function () {
let agentPolicyId: string;
let packagePolicyId: string;
let endpointPackagePolicyId: string;

before(async function () {
if (!server.enabled) {
Expand Down Expand Up @@ -72,6 +72,25 @@ export default function (providerContext: FtrProviderContext) {
},
});
packagePolicyId = packagePolicyResponse.item.id;

const { body: endpointPackagePolicyResponse } = await supertest
.post(`/api/fleet/package_policies`)
.set('kbn-xsrf', 'xxxx')
.send({
name: 'endpoint-1',
description: '',
namespace: 'default',
policy_id: agentPolicyId,
enabled: true,
inputs: [],
force: true,
package: {
name: 'endpoint',
title: 'Elastic Defend',
version: '8.6.1',
},
});
endpointPackagePolicyId = endpointPackagePolicyResponse.item.id;
});

after(async function () {
Expand All @@ -88,14 +107,48 @@ export default function (providerContext: FtrProviderContext) {
await supertest
.post(`/api/fleet/package_policies/delete`)
.set('kbn-xsrf', 'xxxx')
.send({ packagePolicyIds: [packagePolicyId] })
.send({ packagePolicyIds: [packagePolicyId, endpointPackagePolicyId] })
.expect(200);

// uninstall endpoint package
await supertest
.delete(`/api/fleet/epm/packages/endpoint-8.6.1`)
.set('kbn-xsrf', 'xxxx')
.send({ force: true })
.expect(200);
});

it('should succeed with a valid id', async function () {
await supertest.get(`/api/fleet/package_policies/${packagePolicyId}`).expect(200);
});

it('should succeed when requesting with policy ids that match package names allowed by package privileges', async function () {
await superTestWithoutAuth
.get(`/api/fleet/package_policies/${endpointPackagePolicyId}`)
.set('kbn-xsrf', 'xxxx')
.auth(
testUsers.endpoint_integr_read_policy.username,
testUsers.endpoint_integr_read_policy.password
)
.expect(200);
});

it('should return 403 for requests with authenticated role but not allowed packages', async function () {
await superTestWithoutAuth
.get(`/api/fleet/package_policies/${packagePolicyId}`)
.set('kbn-xsrf', 'xxxx')
.auth(
testUsers.endpoint_integr_read_policy.username,
testUsers.endpoint_integr_read_policy.password
)
.expect(403, {
statusCode: 403,
error: 'Forbidden',
message:
"Authorization denied to [package.name=filetest]. Allowed package.name's: endpoint",
});
});

it('should return a 404 with an invalid id', async function () {
await supertest.get(`/api/fleet/package_policies/IS_NOT_PRESENT`).expect(404);
});
Expand All @@ -104,6 +157,7 @@ export default function (providerContext: FtrProviderContext) {
describe('POST /api/fleet/package_policies/_bulk_get', async function () {
let agentPolicyId: string;
let packagePolicyId: string;
let endpointPackagePolicyId: string;

before(async function () {
if (!server.enabled) {
Expand Down Expand Up @@ -136,6 +190,25 @@ export default function (providerContext: FtrProviderContext) {
},
});
packagePolicyId = packagePolicyResponse.item.id;

const { body: endpointPackagePolicyResponse } = await supertest
.post(`/api/fleet/package_policies`)
.set('kbn-xsrf', 'xxxx')
.send({
name: 'endpoint-1',
description: '',
namespace: 'default',
policy_id: agentPolicyId,
enabled: true,
inputs: [],
force: true,
package: {
name: 'endpoint',
title: 'Elastic Defend',
version: '8.6.1',
},
});
endpointPackagePolicyId = endpointPackagePolicyResponse.item.id;
});

after(async function () {
Expand All @@ -152,7 +225,14 @@ export default function (providerContext: FtrProviderContext) {
await supertest
.post(`/api/fleet/package_policies/delete`)
.set('kbn-xsrf', 'xxxx')
.send({ packagePolicyIds: [packagePolicyId] })
.send({ packagePolicyIds: [packagePolicyId, endpointPackagePolicyId] })
.expect(200);

// uninstall endpoint package
await supertest
.delete(`/api/fleet/epm/packages/endpoint-8.6.1`)
.set('kbn-xsrf', 'xxxx')
.send({ force: true })
.expect(200);
});

Expand All @@ -176,6 +256,35 @@ export default function (providerContext: FtrProviderContext) {
.expect(404);
});

it('should return 403 without allowed package names', async function () {
await superTestWithoutAuth
.post(`/api/fleet/package_policies/_bulk_get`)
.set('kbn-xsrf', 'xxxx')
.auth(
testUsers.endpoint_integr_read_policy.username,
testUsers.endpoint_integr_read_policy.password
)
.send({ ids: [packagePolicyId] })
.expect(403, {
error: 'Forbidden',
message:
"Authorization denied to [package.name=filetest]. Allowed package.name's: endpoint",
statusCode: 403,
});
});

it('should succeed when bulk requesting with policy ids that match package names allowed by package privileges', async function () {
await superTestWithoutAuth
.post(`/api/fleet/package_policies/_bulk_get`)
.set('kbn-xsrf', 'xxxx')
.auth(
testUsers.endpoint_integr_read_policy.username,
testUsers.endpoint_integr_read_policy.password
)
.send({ ids: [endpointPackagePolicyId] })
.expect(200);
});

it('should succeed with mixed valid ids and invalid ids and ignoreMissing flag ', async function () {
const {
body: { items },
Expand Down
Loading

0 comments on commit b229f74

Please sign in to comment.