Fix Winlogbeat escaping CRLF sequences #11357
Merged
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
Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328
andrewkroh
reviewed
Mar 21, 2019
winlogbeat/sys/event_test.go
Outdated
| if !assert.NoError(t, err) { | ||
| assert.Equal(t, err.Error(), "XML syntax error on line 6: illegal character code U+001B") | ||
| } | ||
| evXML := strings.Replace(allXML, "%1", "
\n\x1b", -1) |
There was a problem hiding this comment.
I think including other whitespace characters would be good too since \t is used a lot in event logs.
There was a problem hiding this comment.
What was the story with the \r? I see you had to use 
. Is it because of https://www.w3.org/TR/REC-xml/#sec-line-ends?
There was a problem hiding this comment.
Yep, the XML parser was getting rid of it.
| self.assertNotIn("event.original", evts[0], evts[0]) | ||
| self.assertIn("message", evts[0], evts[0]) | ||
| self.assertNotIn("\\u000a", evts[0]["message"]) | ||
| self.assertEqual(unicode(msg), evts[0]["message"].decode('unicode-escape'), evts[0]) |
There was a problem hiding this comment.
Need to read some python docs before I can fully understand this stuff. But I get the gist.
|
jenkins, test this |
adriansr
added
bug
Winlogbeat
needs_backport
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Mar 21, 2019
Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328 (cherry picked from commit 6865403)
adriansr
added
v6.7.0
and removed
needs_backport
adriansr
added a commit
that referenced
this pull request
Mar 21, 2019
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Mar 21, 2019
Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328 (cherry picked from commit 6865403)
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Mar 21, 2019
Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328 (cherry picked from commit 6865403)
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Mar 21, 2019
Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328 (cherry picked from commit 6865403)
adriansr
added a commit
that referenced
this pull request
Mar 21, 2019
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Mar 25, 2019
The new system test added in elastic#11357 checks for the wrong field in 6.7 and 6.6.
adriansr
added a commit
that referenced
this pull request
Mar 25, 2019
The new system test added in #11357 checks for the wrong field in 6.7 and 6.6.
adriansr
added a commit
to adriansr/beats
that referenced
this pull request
Mar 25, 2019
The new system test added in elastic#11357 checks for the wrong field in 6.7 and 6.6.
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…ces (elastic#11370) Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328 (cherry picked from commit 5db0f15)
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…ces (elastic#11372) Previous fix (elastic#11006) made Winlogbeat escape CRLF control characters which are expected in Windows event logs. Fixes elastic#11328 (cherry picked from commit 6865403)
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.
Previous fix (#11006) made Winlogbeat escape CRLF control characters, which are expected in Windows event logs.
Fixes #11328