-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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] Handle missing permissions when creating standalone agent API keys #193218
Merged
nchaulet
merged 1 commit into
elastic:main
from
nchaulet:fix-create-policy-api-key-error-handling
Sep 18, 2024
+131
−23
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,10 +12,10 @@ import type { | |
|
||
import { API_VERSIONS, CREATE_STANDALONE_AGENT_API_KEY_ROUTE } from '../../../common/constants'; | ||
|
||
import { sendRequest } from './use_request'; | ||
import { sendRequestForRq } from './use_request'; | ||
|
||
export function sendCreateStandaloneAgentAPIKey(body: PostStandaloneAgentAPIKeyRequest['body']) { | ||
return sendRequest<PostStandaloneAgentAPIKeyResponse>({ | ||
return sendRequestForRq<PostStandaloneAgentAPIKeyResponse>({ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use |
||
method: 'post', | ||
path: CREATE_STANDALONE_AGENT_API_KEY_ROUTE, | ||
version: API_VERSIONS.internal.v1, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ export const registerRoutes = (router: FleetAuthzRouter) => { | |
path: CREATE_STANDALONE_AGENT_API_KEY_ROUTE, | ||
access: 'internal', | ||
fleetAuthz: { | ||
fleet: { all: true }, | ||
fleet: { addAgents: true }, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should only have the addAgents permission and not all |
||
}, | ||
}) | ||
.addVersion( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
x-pack/test/fleet_api_integration/apis/agent_policy/create_standalone_api_key.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import expect from '@kbn/expect'; | ||
|
||
import { FtrProviderContext } from '../../../api_integration/ftr_provider_context'; | ||
import { skipIfNoDockerRegistry } from '../../helpers'; | ||
import { SpaceTestApiClient } from '../space_awareness/api_helper'; | ||
import { expectToRejectWithError } from '../space_awareness/helpers'; | ||
import { setupTestUsers, testUsers } from '../test_users'; | ||
|
||
export default function (providerContext: FtrProviderContext) { | ||
const { getService } = providerContext; | ||
|
||
const supertestWithoutAuth = getService('supertestWithoutAuth'); | ||
const supertest = getService('supertest'); | ||
|
||
describe('create standalone api key', function () { | ||
skipIfNoDockerRegistry(providerContext); | ||
|
||
before(async () => { | ||
await setupTestUsers(getService('security')); | ||
}); | ||
|
||
describe('POST /internal/fleet/create_standalone_agent_api_key', () => { | ||
it('should work with a user with the correct permissions', async () => { | ||
const apiClient = new SpaceTestApiClient(supertest); | ||
const res = await apiClient.postStandaloneApiKey('test'); | ||
expect(res.item.name).to.eql('standalone_agent-test'); | ||
}); | ||
it('should return a 403 if the user cannot create the api key', async () => { | ||
const apiClient = new SpaceTestApiClient(supertestWithoutAuth, { | ||
username: testUsers.fleet_all_int_all.username, | ||
password: testUsers.fleet_all_int_all.password, | ||
}); | ||
await expectToRejectWithError( | ||
() => apiClient.postStandaloneApiKey('tata'), | ||
/403 Forbidden Missing permissions to create standalone API key/ | ||
); | ||
}); | ||
}); | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a loading state, as it was weird to me to not have feedback while the API key is creating