[UII] Drop ssl field from output if it's in an invalid format #211848
+56
−8
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
jen-huang
added
release_note:skip
|
Pinging @elastic/fleet (Team:Fleet) |
| @@ -128,7 +128,7 @@ function outputSavedObjectToOutput(so: SavedObject<OutputSOAttributes>): Output | |||
| return { | |||
| id: outputId ?? so.id, | |||
| ...atributes, | |||
| ...(ssl ? { ssl: JSON.parse(ssl as string) } : {}), | |||
| ...(typeof ssl === 'string' ? { ssl: JSON.parse(ssl as string) } : {}), | |||
There was a problem hiding this comment.
ssl can still be an invalid JSON, even though it's a string. Shouldn't we wrap JSON.parse in try catch?
There was a problem hiding this comment.
good point, updated code and added unit tests
💚 Build Succeeded
Metrics [docs]
cc @jen-huang |
|
Starting backport for target branches: 8.16, 8.17, 8.18, 8.x |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Feb 21, 2025
…c#211848) ## Summary Reported in elastic/sdh-beats#5676. When retrieving outputs information, drop the `ssl` field if it's in an invalid format (causing `JSON.parse` to fail). This can happen for ES output with `ssl` field set via API, and then subsequently editing it from the UI (ES output `ssl` fields are currently unsupported, soon to be supported by elastic#207326. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit 0c932fd)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Feb 21, 2025
…c#211848) ## Summary Reported in elastic/sdh-beats#5676. When retrieving outputs information, drop the `ssl` field if it's in an invalid format (causing `JSON.parse` to fail). This can happen for ES output with `ssl` field set via API, and then subsequently editing it from the UI (ES output `ssl` fields are currently unsupported, soon to be supported by elastic#207326. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit 0c932fd)
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Feb 21, 2025
…211848) (#212016) # Backport This will backport the following commits from `main` to `8.x`: - [[UII] Drop ssl field from output if it's in an invalid format (#211848)](#211848) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-02-21T08:52:17Z","message":"[UII] Drop ssl field from output if it's in an invalid format (#211848)\n\n## Summary\n\nReported in elastic/sdh-beats#5676. When\nretrieving outputs information, drop the `ssl` field if it's in an\ninvalid format (causing `JSON.parse` to fail).\n\nThis can happen for ES output with `ssl` field set via API, and then\nsubsequently editing it from the UI (ES output `ssl` fields are\ncurrently unsupported, soon to be supported by\nhttps://github.com//issues/207326.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"0c932fd4aba794767bf2298911e0f2e2ec2bffb3","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-major","v9.1.0"],"title":"[UII] Drop ssl field from output if it's in an invalid format","number":211848,"url":"https://github.com/elastic/kibana/pull/211848","mergeCommit":{"message":"[UII] Drop ssl field from output if it's in an invalid format (#211848)\n\n## Summary\n\nReported in elastic/sdh-beats#5676. When\nretrieving outputs information, drop the `ssl` field if it's in an\ninvalid format (causing `JSON.parse` to fail).\n\nThis can happen for ES output with `ssl` field set via API, and then\nsubsequently editing it from the UI (ES output `ssl` fields are\ncurrently unsupported, soon to be supported by\nhttps://github.com//issues/207326.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"0c932fd4aba794767bf2298911e0f2e2ec2bffb3"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/211848","number":211848,"mergeCommit":{"message":"[UII] Drop ssl field from output if it's in an invalid format (#211848)\n\n## Summary\n\nReported in elastic/sdh-beats#5676. When\nretrieving outputs information, drop the `ssl` field if it's in an\ninvalid format (causing `JSON.parse` to fail).\n\nThis can happen for ES output with `ssl` field set via API, and then\nsubsequently editing it from the UI (ES output `ssl` fields are\ncurrently unsupported, soon to be supported by\nhttps://github.com//issues/207326.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"0c932fd4aba794767bf2298911e0f2e2ec2bffb3"}}]}] BACKPORT--> Co-authored-by: Jen Huang <[email protected]>
kibanamachine
added a commit
that referenced
this pull request
Feb 21, 2025
…211848) (#212015) # Backport This will backport the following commits from `main` to `8.18`: - [[UII] Drop ssl field from output if it's in an invalid format (#211848)](#211848) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Jen Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-02-21T08:52:17Z","message":"[UII] Drop ssl field from output if it's in an invalid format (#211848)\n\n## Summary\n\nReported in elastic/sdh-beats#5676. When\nretrieving outputs information, drop the `ssl` field if it's in an\ninvalid format (causing `JSON.parse` to fail).\n\nThis can happen for ES output with `ssl` field set via API, and then\nsubsequently editing it from the UI (ES output `ssl` fields are\ncurrently unsupported, soon to be supported by\nhttps://github.com//issues/207326.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"0c932fd4aba794767bf2298911e0f2e2ec2bffb3","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-major","v9.1.0"],"title":"[UII] Drop ssl field from output if it's in an invalid format","number":211848,"url":"https://github.com/elastic/kibana/pull/211848","mergeCommit":{"message":"[UII] Drop ssl field from output if it's in an invalid format (#211848)\n\n## Summary\n\nReported in elastic/sdh-beats#5676. When\nretrieving outputs information, drop the `ssl` field if it's in an\ninvalid format (causing `JSON.parse` to fail).\n\nThis can happen for ES output with `ssl` field set via API, and then\nsubsequently editing it from the UI (ES output `ssl` fields are\ncurrently unsupported, soon to be supported by\nhttps://github.com//issues/207326.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"0c932fd4aba794767bf2298911e0f2e2ec2bffb3"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/211848","number":211848,"mergeCommit":{"message":"[UII] Drop ssl field from output if it's in an invalid format (#211848)\n\n## Summary\n\nReported in elastic/sdh-beats#5676. When\nretrieving outputs information, drop the `ssl` field if it's in an\ninvalid format (causing `JSON.parse` to fail).\n\nThis can happen for ES output with `ssl` field set via API, and then\nsubsequently editing it from the UI (ES output `ssl` fields are\ncurrently unsupported, soon to be supported by\nhttps://github.com//issues/207326.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"0c932fd4aba794767bf2298911e0f2e2ec2bffb3"}}]}] BACKPORT--> Co-authored-by: Jen Huang <[email protected]>
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
Reported in https://github.com/elastic/sdh-beats/issues/5676. When retrieving outputs information, drop the
sslfield if it's in an invalid format (causingJSON.parseto fail).This can happen for ES output with
sslfield set via API, and then subsequently editing it from the UI (ES outputsslfields are currently unsupported, soon to be supported by #207326.