Support both, encoded and non encoded api-key formats on plugin configuration #237
Conversation
This file contains hidden or 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
alexcams force-pushed the 236-support-opaque-api_key branch from bb5ffb2 to 9842249 Compare alexcams force-pushed the 236-support-opaque-api_key branch from 4c20b87 to d98b81d Compare 
andsel requested changes Sep 22, 2025
andsel requested changes Sep 22, 2025
andsel reviewed Sep 23, 2025
alexcams force-pushed the 236-support-opaque-api_key branch from e6e6a21 to 70ef0d2 Compare andsel requested changes Sep 23, 2025
CHANGELOG.md Outdated
| @@ -1,3 +1,6 @@ | |||
| ## 5.2.1 | |||
| - Support both, encoded and non encoded api-key formats on plugin configuration [#237](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/237) | |||
There was a problem hiding this comment.
Suggested change
| - Support both, encoded and non encoded api-key formats on plugin configuration [#237](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/237) | |
| - Added support for encoded and non encoded api-key formats on plugin configuration [#237](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/237) |
lib/logstash/inputs/elasticsearch.rb Outdated
| return {} unless (api_key&.value) | ||
| | ||
| token = ::Base64.strict_encode64(api_key.value) | ||
| token = base64?(api_key.value) ? api_key.value : Base64.strict_encode64(api_key.value) |
There was a problem hiding this comment.
Suggested change
| token = base64?(api_key.value) ? api_key.value : Base64.strict_encode64(api_key.value) | |
| token = base64?(api_key.value) ? api_key.value : Base64.strict_encode64(api_key.value) |
alexcams force-pushed the 236-support-opaque-api_key branch from 70ef0d2 to cdb00d0 Compare 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.
Avoid double-encoding opaque Elasticsearch API keys.
Previously, API keys that were already in encoded format were incorrectly re-encoded, causing connection failures. This update ensures that only raw keys are encoded, supporting both opaque and id:api-key formats without issue.
Closes #236
Thanks for contributing to Logstash! If you haven't already signed our CLA, here's a handy link: https://www.elastic.co/contributor-agreement/