[Stack Connectors][Microsoft Defender] Improve management of OAuth token to Microsoft's API #208120
Conversation
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
|
/ci |
|
Pinging @elastic/security-defend-workflows (Team:Defend Workflows) |
ashokaditya
approved these changes
Jan 28, 2025
| @@ -52,6 +53,7 @@ export class MicrosoftDefenderEndpointConnector extends SubActionConnector< | |||
| params: ServiceParams<MicrosoftDefenderEndpointConfig, MicrosoftDefenderEndpointSecrets> | |||
| ) { | |||
| super(params); | |||
| this.instanceId = Math.random().toString(36).substr(2); | |||
There was a problem hiding this comment.
nit: maybe use slice(2) instead of substr as it's deprecated.
There was a problem hiding this comment.
ohhh. actually. this was supposed to be deleted. I added it only while trying to understand how the instances of these connectors are created by the sub-actions framework. Thanks for point it out.
…connector-token-improvements
…en-improvements' into task/olm-microsoft-connector-token-improvements
tomsonpl
approved these changes
Jan 28, 2025
|
|
||
| // If error was a 401, then for some reason the token used was not valid (ex. perhaps the connector's credentials | ||
| // were updated). IN this case, we will try again by ensuring a new token is re-generated | ||
| if (err.message.includes('Status code: 401')) { |
There was a problem hiding this comment.
How sure are we that 401 is returned only in this specific case?
Or on second though - it doesn't hurt us to retry anyway :)
Thanks!
There was a problem hiding this comment.
We return this error - its built by the .getResponseErrorMessage() method of this class. Unfortunately the connector framework does not return the original error (Axios) from the .request(), thus why we are relying on the .message property
|
Starting backport for target branches: 8.x https://github.com/elastic/kibana/actions/runs/13019549591 |
💚 Build Succeeded
Metrics [docs]
History
|
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jan 28, 2025
…ken to Microsoft's API (elastic#208120) ## Summary - Add re-try logic to requests to Microsoft's API so that if a `401` (Unauthorized) is encountered, the existing cached access token is regenerated and the request is tried again. - This change should handle (edge) cases where the connector's access settings could be updated and connector would continue to use the cached token (cherry picked from commit 83e2a16)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Jan 28, 2025
…uth token to Microsoft's API (#208120) (#208633) # Backport This will backport the following commits from `main` to `8.x`: - [[Stack Connectors][Microsoft Defender] Improve management of OAuth token to Microsoft's API (#208120)](#208120) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Paul Tavares","email":"56442535+paul-tavares@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-01-28T21:06:28Z","message":"[Stack Connectors][Microsoft Defender] Improve management of OAuth token to Microsoft's API (#208120)\n\n## Summary\r\n\r\n- Add re-try logic to requests to Microsoft's API so that if a `401`\r\n(Unauthorized) is encountered, the existing cached access token is\r\nregenerated and the request is tried again.\r\n- This change should handle (edge) cases where the connector's access\r\nsettings could be updated and connector would continue to use the cached\r\ntoken","sha":"83e2a16bf8889a97dd3a1460c5fbcba34726197a","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Defend Workflows","backport:prev-minor","v8.18.0"],"title":"[Stack Connectors][Microsoft Defender] Improve management of OAuth token to Microsoft's API","number":208120,"url":"https://github.com/elastic/kibana/pull/208120","mergeCommit":{"message":"[Stack Connectors][Microsoft Defender] Improve management of OAuth token to Microsoft's API (#208120)\n\n## Summary\r\n\r\n- Add re-try logic to requests to Microsoft's API so that if a `401`\r\n(Unauthorized) is encountered, the existing cached access token is\r\nregenerated and the request is tried again.\r\n- This change should handle (edge) cases where the connector's access\r\nsettings could be updated and connector would continue to use the cached\r\ntoken","sha":"83e2a16bf8889a97dd3a1460c5fbcba34726197a"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/208120","number":208120,"mergeCommit":{"message":"[Stack Connectors][Microsoft Defender] Improve management of OAuth token to Microsoft's API (#208120)\n\n## Summary\r\n\r\n- Add re-try logic to requests to Microsoft's API so that if a `401`\r\n(Unauthorized) is encountered, the existing cached access token is\r\nregenerated and the request is tried again.\r\n- This change should handle (edge) cases where the connector's access\r\nsettings could be updated and connector would continue to use the cached\r\ntoken","sha":"83e2a16bf8889a97dd3a1460c5fbcba34726197a"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
401(Unauthorized) is encountered, the existing cached access token is regenerated and the request is tried again.Checklist