Skip to content

[Fleet] Do not generate agent.protection and signed part full policy for standalone policies #217897

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

Merged
nchaulet merged 3 commits into from
Apr 14, 2025
Merged

[Fleet] Do not generate agent.protection and signed part full policy for standalone policies #217897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4ab91c
[Fleet] Do not generate agent.protection and signed part full policy …
nchaulet Apr 10, 2025
e5227f0
Merge branch 'main' into feature-no-signed-protection-full-standalone
elasticmachine Apr 10, 2025
8b2a042
Merge branch 'main' into feature-no-signed-protection-full-standalone
elasticmachine Apr 14, 2025
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
12 changes: 12 additions & 0 deletions ...ck/platform/plugins/shared/fleet/server/services/agent_policies/full_agent_policy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,18 @@ describe('getFullAgentPolicy', () => {
});
});

it('should not populate agent.protection and signed properties for standalone policies', async () => {
appContextService.start(createAppContextStartContractMock());

mockAgentPolicy({});
const agentPolicy = await getFullAgentPolicy(savedObjectsClientMock.create(), 'agent-policy', {
standalone: true,
});

expect(agentPolicy!.agent!.protection).toBeUndefined();
expect(agentPolicy!.signed).toBeUndefined();
});

it('should compile full policy with correct namespaces', async () => {
mockedGetPackageInfo.mockResolvedValue({
data_streams: [
Expand Down
7 changes: 6 additions & 1 deletion x-pack/platform/plugins/shared/fleet/server/services/agent_policies/full_agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ export async function getFullAgentPolicy(

// populate protection and signed properties
const messageSigningService = appContextService.getMessageSigningService();
if (messageSigningService && fullAgentPolicy.agent) {
if (options?.standalone !== true && messageSigningService && fullAgentPolicy.agent) {
const publicKey = await messageSigningService.getPublicKey();
const tokenHash =
(await appContextService
Expand Down Expand Up @@ -345,6 +345,11 @@ export async function getFullAgentPolicy(
if (agentPolicy.overrides) {
return deepMerge<FullAgentPolicy>(fullAgentPolicy, agentPolicy.overrides);
}
if (options?.standalone) {
delete fullAgentPolicy.agent?.protection;
delete fullAgentPolicy.signed;
Copy link
Copy Markdown
Contributor

@juliaElastic juliaElastic Apr 11, 2025

Choose a reason for hiding this comment

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

nit: do we need this line if signed is not set in the previous conditional?

}

return fullAgentPolicy;
}

Expand Down
Loading