Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.15](backport #40446) [syslog] Fix handling of escaped characters in structured data #40464

Merged
merged 4 commits into from
Aug 30, 2024
Merged

[8.15](backport #40446) [syslog] Fix handling of escaped characters in structured data #40464

merged 4 commits into from
Aug 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2024

Proposed commit message

  • Improved syslog RFC 5424 parser to handle escaped closing square brackets in structured data.
  • Fix incorrect offset being passed to removeBytes function, which would not remove escaped characters from structured data values.
  • Add tests which include escaped brackets in structured data.

Checklist

  • My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
    - [ ] I have made corresponding changes to the documentation
    - [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

N/A

How to test this PR locally

Run unit tests in libbeat/reader/syslog

Related issues

This is an automatic backport of pull request #40446 done by [Mergify](https://mergify.com).

@taylor-swanson @mergify
[syslog] Fix handling of escaped characters in structured data (#40446)
240e307 
- Improved parser to handle escaped closing square brackets in structured data, along
with square brackets in the normal, non-structured data portion of the message.
- Fix incorrect offset being passed to removeBytes function, which would not remove
escaped characters from structured data values.
- The non-compliant-sd unit test cases now include escapes on the closing brackets
within the structured data, something that should have always been there.
- Add tests

(cherry picked from commit 1c01d0e)
@mergify mergify bot requested a review from a team as a code owner August 8, 2024 13:53
@mergify mergify bot added the backport label Aug 8, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 8, 2024
@botelastic
Copy link

botelastic bot commented Aug 8, 2024

This pull request doesn't have a Team:<team> label.

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 12, 2024

This pull request has not been merged yet. Could you please review and merge it @taylor-swanson? 🙏

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 19, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.15/pr-40446 upstream/mergify/bp/8.15/pr-40446
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-40446

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 19, 2024

This pull request has not been merged yet. Could you please review and merge it @taylor-swanson? 🙏

1 similar comment
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 26, 2024

This pull request has not been merged yet. Could you please review and merge it @taylor-swanson? 🙏

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Aug 27, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.15/pr-40446 upstream/mergify/bp/8.15/pr-40446
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-40446

@taylor-swanson taylor-swanson merged commit c81b105 into 8.15 Aug 30, 2024
123 checks passed
@taylor-swanson taylor-swanson deleted the mergify/bp/8.15/pr-40446 branch August 30, 2024 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkoutsovasilis pkoutsovasilis pkoutsovasilis approved these changes

Assignees

@taylor-swanson taylor-swanson

Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pkoutsovasilis @taylor-swanson