Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

listDirectoriesInDirectory fix -- check if symlinks point to directories #8399

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Aug 13, 2024
Merged

listDirectoriesInDirectory fix -- check if symlinks point to directories #8399

merged 4 commits into from
Aug 13, 2024

Conversation

getvictor
Copy link
Contributor

@getvictor getvictor commented Aug 9, 2024 •
edited
Loading

Fixes #8354: inotify treats symlinks to individual files as directories.

Demo video of the fix: https://www.loom.com/share/c7044edec1ff47158fd93f49a1b0af63

@directionless
Copy link
Member

FYI #8392

@getvictor getvictor marked this pull request as ready for review August 10, 2024 17:51
@getvictor getvictor requested review from a team as code owners August 10, 2024 17:51
@getvictor
Copy link
Contributor Author

FYI #8392

Yes, looks like these two PRs will need to be manually merged.

@getvictor getvictor changed the title inotify fix directories (inotify) fix -- check if symlinks point to directories Aug 10, 2024
@getvictor getvictor changed the title directories (inotify) fix -- check if symlinks point to directories directories fix -- check if symlinks point to directories Aug 10, 2024
@getvictor getvictor changed the title directories fix -- check if symlinks point to directories listDirectoriesInDirectory fix -- check if symlinks point to directories Aug 10, 2024
@getvictor getvictor mentioned this pull request Aug 10, 2024
Closed
@directionless
Copy link
Member

directionless commented Aug 10, 2024 •
edited
Loading

FYI #8392

Yes, looks like these two PRs will need to be manually merged.

I think they achieve the same goal, and we probably only need one. Oh, I see some things here, you're doing on top. So maybe we merge 8392, then add in this one.

@getvictor
Copy link
Contributor Author

FYI #8392

Yes, looks like these two PRs will need to be manually merged.

I think they achieve the same goal, and we probably only need one. Oh, I see some things here, you're doing on top. So maybe we merge 8392, then add in this one.

@directionless Is it possible to get this one into 5.13.1? We have a customer with a lot of symlinks that's getting flooded with warning messages from this issue.

cc: @zwass @lucasmrod

lucasmrod
lucasmrod reviewed Aug 12, 2024
View reviewed changes
osquery/filesystem/tests/filesystem.cpp Show resolved Hide resolved
lucasmrod
lucasmrod reviewed Aug 12, 2024
View reviewed changes
osquery/filesystem/tests/filesystem.cpp
ASSERT_TRUE(!found_directories.empty());

ASSERT_TRUE(found_directories.size() == EXPECTED_NR_OF_DIRECTORIES);
ASSERT_TRUE(found_directories.empty());
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this empty now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because this is a link that points to itself. It cannot be resolved canonically, so it doesn't make sense to return it as a directory.

lucasmrod
lucasmrod reviewed Aug 12, 2024
View reviewed changes
osquery/filesystem/tests/filesystem.cpp Show resolved Hide resolved
lucasmrod
lucasmrod approved these changes Aug 12, 2024
View reviewed changes
Copy link
Contributor

@lucasmrod lucasmrod left a comment

Choose a reason for hiding this comment

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

LGTM. Left a few comments on the test files.

lucasmrod
lucasmrod approved these changes Aug 13, 2024
View reviewed changes
Copy link
Contributor

@lucasmrod lucasmrod left a comment

Choose a reason for hiding this comment

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

LGTM!

@directionless directionless merged commit 78a83d1 into osquery:master Aug 13, 2024
@directionless directionless mentioned this pull request Aug 29, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@directionless directionless directionless approved these changes

@lucasmrod lucasmrod lucasmrod approved these changes

Assignees

No one assigned

Labels

bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

When directories are monitored recursively symlink targets are considered directories.

3 participants

@getvictor @directionless @lucasmrod
Morty Proxy This is a proxified and sanitized view of the page, visit original site.