fix(jsonparser): Fix possible JSON log line corruption caused by json parser on query path
#18056
+42
−4
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
Signed-off-by: Christian Haudum <[email protected]>
… log line The json parser mutated the extracted unsafe string which can cause an in-memory log entry on the ingester to be modified leading to a malformed JSON string. Signed-off-by: Christian Haudum <[email protected]>
The jsonpath for nested field that would result in duplicate labels and therefore have the `_extracted` suffix, was incorrectly adding the suffix to the last element of the json path. Signed-off-by: Christian Haudum <[email protected]>
chaudum
force-pushed
the
chaudum/jsonparser-corruption
branch
from
be9ee22 to
3246924
Compare
loki-gh-app bot
pushed a commit
that referenced
this pull request
Jun 11, 2025
…n` parser on query path (#18056) This PR fixes two bugs in the json parser: 1. A bug that caused the original log line to be mutated by the json parser when the extracted field was a nested field and collided with an already existing label name, such as in line `{"app":{"id": 123, "name": "bar"}}` and label `app_name="foo"`. 2. A bug that caused a wrong json path for the extracted field in the same conditions as 1, such as `[]string{"app", "name_extracted"}` for `app_name`, instead of `[]string{"app", "name"}`. Signed-off-by: Christian Haudum <[email protected]> (cherry picked from commit 153bbbc)
loki-gh-app bot
pushed a commit
that referenced
this pull request
Jun 11, 2025
…n` parser on query path (#18056) This PR fixes two bugs in the json parser: 1. A bug that caused the original log line to be mutated by the json parser when the extracted field was a nested field and collided with an already existing label name, such as in line `{"app":{"id": 123, "name": "bar"}}` and label `app_name="foo"`. 2. A bug that caused a wrong json path for the extracted field in the same conditions as 1, such as `[]string{"app", "name_extracted"}` for `app_name`, instead of `[]string{"app", "name"}`. Signed-off-by: Christian Haudum <[email protected]> (cherry picked from commit 153bbbc)
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-18056-to-release-3.4.x origin/release-3.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 153bbbcf8a1b8793dc12fe4539e536773c4aa459When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-18056-to-release-3.4.x
# Create the PR body template
PR_BODY=$(gh pr view 18056 --json body --template 'Backport 153bbbcf8a1b8793dc12fe4539e536773c4aa459 from #18056{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix(jsonparser): Fix possible JSON log line corruption caused by `json` parser on query path (backport release-3.4.x)' --body-file - --label 'size/M' --label 'type/bug' --label 'backport' --base release-3.4.x --milestone release-3.4.x --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-18056-to-release-3.4.x
# Create a pull request where the `base` branch is `release-3.4.x` and the `compare`/`head` branch is `backport-18056-to-release-3.4.x`.
# Remove the local backport branch
git switch main
git branch -D backport-18056-to-release-3.4.x |
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.
What this PR does / why we need it:
This PR fixes two bugs in the json parser:
A bug that caused the original log line to be mutated by the json parser when the extracted field was a nested field and collided with an already existing label name, such as in line
{"app":{"id": 123, "name": "bar"}}and labelapp_name="foo".A bug that caused a wrong json path for the extracted field in the same conditions as 1, such as
[]string{"app", "name_extracted"}forapp_name, instead of[]string{"app", "name"}.Which issue(s) this PR fixes:
Fixes #17267