[Auditbeat] dynamically find librpm.so#21936
Merged
leehinman merged 1 commit intoelastic:masterfrom Oct 20, 2020
Merged
Conversation
- use elf header of rpm binary to find version of librpm - use librpm.so as fallback, provided by rpm-devel Closes elastic#19287
Contributor
|
Pinging @elastic/siem (Team:SIEM) |
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
marc-gr
approved these changes
Oct 19, 2020
2 tasks
leehinman
added a commit
to leehinman/beats
that referenced
this pull request
Oct 20, 2020
- use elf header of rpm binary to find version of librpm - use librpm.so as fallback, provided by rpm-devel Closes elastic#19287 (cherry picked from commit 37dc557)
andrewkroh
reviewed
Oct 20, 2020
Member
andrewkroh
left a comment
There was a problem hiding this comment.
Nice solution. I don't think I would have ever thought to do this. 👍
| librpm.handle, err = dlopen.GetHandle(librpmNames) | ||
| if err != nil { | ||
| return nil, err | ||
| return nil, fmt.Errorf("Couldn't open %v", librpmNames) |
Member
There was a problem hiding this comment.
Error strings should not be capitalized. https://github.com/golang/go/wiki/CodeReviewComments#error-strings
| "time" | ||
| "unsafe" | ||
|
|
||
| "debug/elf" |
Member
There was a problem hiding this comment.
Group this with the other stdlib imports.
v1v
added a commit
to v1v/beats
that referenced
this pull request
Oct 21, 2020
* upstream/master: feat: package aliases for snapshots (elastic#21960) [DOC] Add firewall as possible troubleshooting issue (elastic#21743) [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993) [Elastic Agent] Fix missing elastic_agent event data (elastic#21994) Document auditbeat system process module config (elastic#21766) Update links (elastic#22012) dynamically find librpm (elastic#21936) Fix Istio docs (elastic#22019) [beats-tester][packaging] store packages in another location (elastic#21903) [Kubernetes] Remove redundant dockersock volume mount (elastic#22009) [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951) Azure storage metricset values not inside the metricset name (elastic#21845) fix diskio and memory bugs under windows (elastic#21992) Fix TestDockerStart flaky test (elastic#21681) filebeat: add SSL options to checkpoint module (elastic#19560) Stop storing stateless kubernetes keystores (elastic#21880) [Elastic Agent] Fix named pipe communication on Windows 7 (elastic#21931) [Elastic Agent] Fix index for Agent monitoring to to elastic_agent. (elastic#21932)
leehinman
added a commit
that referenced
this pull request
Oct 21, 2020
1 task
v1v
added a commit
to v1v/beats
that referenced
this pull request
Oct 22, 2020
* upstream/master: (27 commits) chore: use ubuntu 18 as linux agent (elastic#22084) docs: Prepare Changelog for 7.9.3 (elastic#22073) (elastic#22075) docs: Prepare Changelog for 6.8.13 (elastic#22072) (elastic#22079) [build][packaging] Add resilience when docker build (elastic#22050) Fix the url of reviewdog (elastic#21981) revert WSS process reporting for windows (elastic#22055) Fix typo (elastic#19585) (elastic#22061) [Ingest Manager] Use ML_SYSTEM to detect if agent is running as a service (elastic#21884) Prevent log input from sending duplicate messages due to file renaming (elastic#21911) feat: package aliases for snapshots (elastic#21960) [DOC] Add firewall as possible troubleshooting issue (elastic#21743) [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993) [Elastic Agent] Fix missing elastic_agent event data (elastic#21994) Document auditbeat system process module config (elastic#21766) Update links (elastic#22012) dynamically find librpm (elastic#21936) Fix Istio docs (elastic#22019) [beats-tester][packaging] store packages in another location (elastic#21903) [Kubernetes] Remove redundant dockersock volume mount (elastic#22009) [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951) ...
1 task
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 does this PR do?
Auditbeat uses librpm to determine
information about installed packages. To do this auditbeat needs to
dlopen the librpm dynamic library. The version number and thus
filename of the library changes over time. Previously we had a list
of acceptable values, but this caused librpm to not be loaded when
there was a new version. This change uses the information in the elf
header of the rpm binary to determine the exact path of librpm (and
thus version) that the rpm binary on the system uses. A fallback of
"librpm.so" is also provided. If systems have the
rpm-develpackageinstalled then this symlink is available.
Why is it important?
Stops us from having to update an accepted list of librpm.so filenames
when new version of rpm based Linux distributions are released.
Checklist
- [ ] 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 inCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
Install & start auditbeat on systems with and without rpm-devel
installed. Package module should start without errors.
Related issues