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

Use fsnotify with long windows name-safe changes #28517

Merged
merged 1 commit into from
Oct 21, 2021

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Oct 18, 2021

What does this PR do?

This change makes use of changes to adriansr/fsnotify that prevent runtime oob crash when events relate to windows files with long (>260) filenames.

Why is it important?

This fixes a bug, #25334.

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.

Author's Checklist

How to test this PR locally

Instructions for reproducing the bug fixed by this are provided at the original issue #25334.

Related issues

Use cases

N/A

Screenshots

N/A

Logs

N/A

@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 18, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 18, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-10-20T09:10:31.532+0000

  • Duration: 119 min 42 sec

  • Commit: 0c93401

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

Copy link
Contributor

@adriansr adriansr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but this needs a changelog entry.

@efd6
Copy link
Contributor Author

efd6 commented Oct 20, 2021

/test

2 similar comments
@P1llus
Copy link
Member

P1llus commented Oct 20, 2021

/test

@efd6
Copy link
Contributor Author

efd6 commented Oct 20, 2021

/test

@P1llus
Copy link
Member

P1llus commented Oct 20, 2021

The e2e tests are being looked at for the moment, to make the build pass.

@adriansr
Copy link
Contributor

I think it's safe to merge this without waiting for the flaky e2e tests to be fixed.

Also I suggest backporting to 7.15 too.

@efd6 efd6 added the backport-v7.15.0 Automated backport with mergify label Oct 21, 2021
@efd6 efd6 merged commit cd8fc07 into elastic:master Oct 21, 2021
mergify bot pushed a commit that referenced this pull request Oct 21, 2021
(cherry picked from commit cd8fc07)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
mergify bot pushed a commit that referenced this pull request Oct 21, 2021
@efd6 efd6 deleted the windows/longnames branch October 21, 2021 07:46
efd6 added a commit that referenced this pull request Oct 26, 2021
v1v added a commit to v1v/beats that referenced this pull request Oct 26, 2021
…urnalbeat-ci

* upstream/master: (49 commits)
  [CI]: use the downstream packaging pipeline for branches/tags (elastic#28589)
  fix: use declarative style for complete variant of the elastic-agent (elastic#28526)
  x-pack/auditbeat/tracing: fix regexp for kprobe description line (elastic#28609)
  docs: Update `api_key` example on elasticsearch output (elastic#28606)
  chore: add build scripts to CODEOWNERS (elastic#28615)
  Osquerybeat: Fix host_processes missing cmdline arguments (elastic#28622)
  Add note about changes to regexp package in Golang (elastic#28616)
  CI: nightly/weekly builds for 7.x targeting 7.16 instead (elastic#28612)
  Osquerybeat: Fix extenstion unable to start on windows (elastic#28598)
  Osquerybeat: Return the query result count with the action response (elastic#28576)
  Agent: Allow custom response properties in the action response (elastic#28575)
  [Heartbeat] Only setuid in elastic-agent image (elastic#28577)
  Fix formatting of `mapStateJSON` and `layerListJSON` in dashboard assets (elastic#28530)
  CI: refactor the run e2e build (elastic#28502)
  Use fsnotify with long windows name-safe changes (elastic#28517)
  Remove unneeded mergify config
  backport: Add 7.16 branch (elastic#28560)
  Add proxy_url support to threatintel module's malwarebazaar fileset (elastic#28533)
  Osquerybeat: Implement host_users, host_groups, host_processes tables as a part of our osquery_extension. (elastic#28434)
  [Heartbeat] Make run_once syntax a boolean (elastic#28548)
  ...
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
efd6 added a commit that referenced this pull request Nov 3, 2021
…ges (#28582)

* Use fsnotify with long windows name-safe changes (#28517)

(cherry picked from commit cd8fc07)

Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auditbeat backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auditbeat can crash when recursively watching directories in Windows
4 participants