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

[Fleet] Allow exclamation mark in enrollment token name #191807

Merged
merged 2 commits into from
Aug 30, 2024
Merged

[Fleet] Allow exclamation mark in enrollment token name #191807

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
729aa9a
[Fleet] Allow exclamation mark in enrollment token name
jillguyonnet Aug 30, 2024
2a55742
Merge branch 'main' into fleet/191719-allow-exclamation-mark-in-enrol…
elasticmachine Aug 30, 2024
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
11 changes: 9 additions & 2 deletions x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export async function generateEnrollmentAPIKey(
const id = uuidv4();
const { name: providedKeyName, forceRecreate, agentPolicyId } = data;
const logger = appContextService.getLogger();
logger.debug(`Creating enrollment API key ${data}`);
logger.debug(`Creating enrollment API key ${JSON.stringify(data)}`);

const agentPolicy = await retrieveAgentPolicyId(soClient, agentPolicyId);

Expand Down Expand Up @@ -360,7 +360,14 @@ function getQueryForExistingKeyNameOnPolicy(agentPolicyId: string, providedKeyNa
},
{
bool: {
should: [{ query_string: { fields: ['name'], query: `(${providedKeyName}) *` } }],
should: [
{
query_string: {
fields: ['name'],
query: `(${providedKeyName.replace('!', '\\!')}) *`,
},
},
],
minimum_should_match: 1,
},
},
Expand Down
Loading