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.

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

packetbeat/route: fix test failure on Windows 2022 #39822

Merged
merged 4 commits into from
Jun 7, 2024
Merged

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Jun 7, 2024

Proposed commit message

Windows 2022 appears to have added new text to the output of netsh. The text
is interpreted as having three fields. This impact on the behaviour of the
field splitting which expects five.

- Originally this would cause a panic due to bounds checking. This was fixed
  in #39757 by erroring on an unexpectedly short line.
- The fieldsN helper expects lines to be n fields or longer, but does not
  terminate on lines with fewer fields.

So treat the first blank line found in the table as the end of the table and
fix the fieldsN helper.

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

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 self-assigned this Jun 7, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 7, 2024
Copy link
Contributor

mergify bot commented Jun 7, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @efd6? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@efd6 efd6 added Packetbeat bugfix Team:Security-Linux Platform Linux Platform Team in Security Solution labels Jun 7, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 7, 2024
@efd6 efd6 added needs_team Indicates that the issue/PR needs a Team:* label backport-v8.14.0 Automated backport with mergify labels Jun 7, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 7, 2024
@efd6 efd6 changed the title packetbeat/route: trigger failure packetbeat/route: fix test failure on Windows 2022 Jun 7, 2024
@efd6 efd6 marked this pull request as ready for review June 7, 2024 06:24
@efd6 efd6 requested a review from a team as a code owner June 7, 2024 06:24
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

@efd6 efd6 merged commit 35f8d09 into elastic:main Jun 7, 2024
18 checks passed
mergify bot pushed a commit that referenced this pull request Jun 7, 2024
Windows 2022 appears to have added new text to the output of netsh. The text
is interpreted as having three fields. This impact on the behaviour of the
field splitting which expects five.

- Originally this would cause a panic due to bounds checking. This was fixed
  in #39757 by erroring on an unexpectedly short line.
- The fieldsN helper expects lines to be n fields or longer, but does not
  terminate on lines with fewer fields.

So treat the first blank line found in the table as the end of the table and
fix the fieldsN helper.

(cherry picked from commit 35f8d09)
efd6 added a commit that referenced this pull request Jun 7, 2024
Windows 2022 appears to have added new text to the output of netsh. The text
is interpreted as having three fields. This impact on the behaviour of the
field splitting which expects five.

- Originally this would cause a panic due to bounds checking. This was fixed
  in #39757 by erroring on an unexpectedly short line.
- The fieldsN helper expects lines to be n fields or longer, but does not
  terminate on lines with fewer fields.

So treat the first blank line found in the table as the end of the table and
fix the fieldsN helper.

(cherry picked from commit 35f8d09)

Co-authored-by: Dan Kortschak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.14.0 Automated backport with mergify bugfix Packetbeat Team:Security-Linux Platform Linux Platform Team in Security Solution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky Test: packetbeat/route TestDefault - panic: runtime error: index out of range [3] with length 3
3 participants