Prevent Kerberos and PKI providers from initiating a new session for unauthenticated XHR/API requests. #82817
There are no files selected for viewing
Validating CODEOWNERS rules …
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 |
|---|---|---|
|
|
@@ -295,6 +295,22 @@ describe('PKIAuthenticationProvider', () => { | |
| expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('does not exchange peer certificate to access token for Ajax requests.', async () => { | ||
| const request = httpServerMock.createKibanaRequest({ | ||
| headers: { 'kbn-xsrf': 'xsrf' }, | ||
| socket: getMockSocket({ | ||
| authorized: true, | ||
| peerCertificate: getMockPeerCertificate(['2A:7A:C2:DD', '3B:8B:D3:EE']), | ||
| }), | ||
| }); | ||
| await expect(provider.authenticate(request)).resolves.toEqual( | ||
| AuthenticationResult.notHandled() | ||
| ); | ||
|
|
||
| expect(mockOptions.client.asScoped).not.toHaveBeenCalled(); | ||
| expect(mockOptions.client.callAsInternalUser).not.toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('fails with non-401 error if state is available, peer is authorized, but certificate is not available.', async () => { | ||
| const request = httpServerMock.createKibanaRequest({ | ||
| socket: getMockSocket({ authorized: true }), | ||
|
|
@@ -383,14 +399,7 @@ describe('PKIAuthenticationProvider', () => { | |
| }); | ||
|
|
||
| it('gets a new access token even if existing token is expired.', async () => { | ||
| const user = mockAuthenticatedUser({ authentication_provider: { type: 'pki', name: 'pki' } }); | ||
|
|
||
| const mockScopedClusterClient = elasticsearchServiceMock.createLegacyScopedClusterClient(); | ||
| mockScopedClusterClient.callAsCurrentUser | ||
|
|
@@ -399,55 +408,102 @@ describe('PKIAuthenticationProvider', () => { | |
| LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error()) | ||
| ) | ||
| // In response to a call with a new token. | ||
| .mockResolvedValueOnce(user) // In response to call with an expired token. | ||
|
There was a problem hiding this comment. note: I'll remove this stupid setup in the scope of #80952 soon. |
||
| .mockRejectedValueOnce( | ||
| LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error()) | ||
| ) | ||
| // In response to a call with a new token. | ||
| .mockResolvedValueOnce(user) // In response to call with an expired token. | ||
| .mockRejectedValueOnce( | ||
| LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error()) | ||
| ) | ||
| // In response to a call with a new token. | ||
| .mockResolvedValueOnce(user); | ||
| mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient); | ||
| mockOptions.client.callAsInternalUser.mockResolvedValue({ access_token: 'access-token' }); | ||
|
|
||
| const nonAjaxRequest = httpServerMock.createKibanaRequest({ | ||
| socket: getMockSocket({ | ||
| authorized: true, | ||
| peerCertificate: getMockPeerCertificate(['2A:7A:C2:DD', '3B:8B:D3:EE']), | ||
| }), | ||
| }); | ||
| const nonAjaxState = { | ||
| accessToken: 'existing-token', | ||
| peerCertificateFingerprint256: '2A:7A:C2:DD', | ||
| }; | ||
| await expect(provider.authenticate(nonAjaxRequest, nonAjaxState)).resolves.toEqual( | ||
| AuthenticationResult.succeeded(user, { | ||
| authHeaders: { authorization: 'Bearer access-token' }, | ||
| state: { accessToken: 'access-token', peerCertificateFingerprint256: '2A:7A:C2:DD' }, | ||
| }) | ||
| ); | ||
|
|
||
| const ajaxRequest = httpServerMock.createKibanaRequest({ | ||
| headers: { 'kbn-xsrf': 'xsrf' }, | ||
| socket: getMockSocket({ | ||
| authorized: true, | ||
| peerCertificate: getMockPeerCertificate(['3A:7A:C2:DD', '3B:8B:D3:EE']), | ||
| }), | ||
| }); | ||
| const ajaxState = { | ||
| accessToken: 'existing-token', | ||
| peerCertificateFingerprint256: '3A:7A:C2:DD', | ||
| }; | ||
| await expect(provider.authenticate(ajaxRequest, ajaxState)).resolves.toEqual( | ||
| AuthenticationResult.succeeded(user, { | ||
| authHeaders: { authorization: 'Bearer access-token' }, | ||
| state: { accessToken: 'access-token', peerCertificateFingerprint256: '3A:7A:C2:DD' }, | ||
| }) | ||
| ); | ||
|
|
||
| const optionalAuthRequest = httpServerMock.createKibanaRequest({ | ||
| routeAuthRequired: false, | ||
| socket: getMockSocket({ | ||
| authorized: true, | ||
| peerCertificate: getMockPeerCertificate(['4A:7A:C2:DD', '3B:8B:D3:EE']), | ||
| }), | ||
| }); | ||
| const optionalAuthState = { | ||
| accessToken: 'existing-token', | ||
| peerCertificateFingerprint256: '4A:7A:C2:DD', | ||
| }; | ||
| await expect(provider.authenticate(optionalAuthRequest, optionalAuthState)).resolves.toEqual( | ||
| AuthenticationResult.succeeded(user, { | ||
| authHeaders: { authorization: 'Bearer access-token' }, | ||
| state: { accessToken: 'access-token', peerCertificateFingerprint256: '4A:7A:C2:DD' }, | ||
| }) | ||
| ); | ||
|
|
||
| expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledTimes(3); | ||
| expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', { | ||
| body: { | ||
| x509_certificate_chain: [ | ||
| 'fingerprint:2A:7A:C2:DD:base64', | ||
| 'fingerprint:3B:8B:D3:EE:base64', | ||
| ], | ||
| }, | ||
| }); | ||
| expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', { | ||
| body: { | ||
| x509_certificate_chain: [ | ||
| 'fingerprint:3A:7A:C2:DD:base64', | ||
| 'fingerprint:3B:8B:D3:EE:base64', | ||
| ], | ||
| }, | ||
| }); | ||
| expect(mockOptions.client.callAsInternalUser).toHaveBeenCalledWith('shield.delegatePKI', { | ||
| body: { | ||
| x509_certificate_chain: [ | ||
| 'fingerprint:4A:7A:C2:DD:base64', | ||
| 'fingerprint:3B:8B:D3:EE:base64', | ||
| ], | ||
| }, | ||
| }); | ||
|
|
||
| expect(nonAjaxRequest.headers).not.toHaveProperty('authorization'); | ||
| expect(ajaxRequest.headers).not.toHaveProperty('authorization'); | ||
| expect(optionalAuthRequest.headers).not.toHaveProperty('authorization'); | ||
| }); | ||
|
|
||
| it('fails with 401 if existing token is expired, but certificate is not present.', async () => { | ||
|
|
||
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.
note: just continue moving the remaining tests whenever I have chance.