Buffer error logs in deb_packages table #8540
Merged
Conversation
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
sgress454
commented
Jan 31, 2025
| admindir); | ||
|
|
||
| continue; | ||
| { |
Contributor
Author
There was a problem hiding this comment.
Note the addition of a local scope around the block where we drop privileges. Once this scope ends the privileges are restored, so we can flush the error log safely. View diff without whitespace to see functional changes.
lucasmrod
approved these changes
Feb 4, 2025
Contributor
lucasmrod
left a comment
There was a problem hiding this comment.
LGTM!
Could we do the same on rpm_packages (I'm assuming it has the same issue.)
directionless
approved these changes
Feb 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
For #8286
Fleet: fleetdm/fleet#24877
Overview
This PR addresses an issue on CentOS and Fedora (and possibly other) distributions where errors are encountered when attempting to log to a file while generating the
deb_packagestable. This occurs because we drop permissions while generating this table, which means we don't have access to create the logfile.The solution in this PR as suggested by @lucasmrod is to buffer the logs while permissions are dropped, and output them after perms are restored. The number of error logs directly produced by this table is limited by the number of admin dirs specified in the query, so the buffer size isn't a big concern there.
Testing
To test this I set up a Fedora 41 VM. Running the main branch of osquery with a scheduled query of the
deb_packagestable, I saw:and no error log file was created.
Running the same on this branch, the console error above did not appear and the log file was created as expected, with the expected logs inside.