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] Use UUID to Ensure Unique Service Token for Fleet Server #193596

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[Fleet] Use UUID to Ensure Unique Service Token for Fleet Server #193596

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
029c0c1
remove custom token and add uuid generates token
swapanmandi Sep 20, 2024
e6c3da4
Merge branch 'main' into fix/unique-service-token-fleet-server
swapanmandi Sep 20, 2024
3f39bf3
Merge branch 'main' into fix/unique-service-token-fleet-server
swapanmandi Sep 20, 2024
5433164
Merge branch 'main' into fix/unique-service-token-fleet-server
swapanmandi Sep 23, 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
3 changes: 2 additions & 1 deletion x-pack/plugins/fleet/server/routes/app/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import type { RequestHandler, RouteValidationResultFactory } from '@kbn/core/server';
import type { TypeOf } from '@kbn/config-schema';
import { v4 as uuidv4 } from 'uuid';

import { parseExperimentalConfigValue } from '../../../common/experimental_features';
import type { FleetAuthzRouter } from '../../services/security';
Expand Down Expand Up @@ -133,7 +134,7 @@ export const generateServiceTokenHandler: RequestHandler<
token?: GenerateServiceTokenResponse;
}>({
method: 'POST',
path: `_security/service/elastic/${serviceAccount}/credential/token/token-${Date.now()}`,
path: `_security/service/elastic/${serviceAccount}/credential/token/token-${uuidv4()}`,
Copy link
Member

@nchaulet nchaulet Sep 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

thanks for the contribution. @swapanmandi it seems elasticsearch is already generating a uuid if the name is not passed, so I think we can use that behaviour and directly call /credential/token without a name

});

if (tokenResponse.created && tokenResponse.token) {
Expand Down