-
Notifications
You must be signed in to change notification settings - Fork 45
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
Fix issue with pathless config items #785
Open
cecinestpasunepipe
wants to merge
10
commits into
main
Choose a base branch
from
fix/etc_path
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
1eac540
Fix issue with pathless config items
cecinestpasunepipe deb58c5
Improved
cecinestpasunepipe 459c90a
Improvements
cecinestpasunepipe ee6cb34
Improvements
cecinestpasunepipe 39b5c93
Improvements
cecinestpasunepipe a77c92a
Merge branch 'main' into fix/etc_path
cecinestpasunepipe ead7b5b
Update dissect/target/plugins/os/unix/etc/etc.py
cecinestpasunepipe 743cfa3
Update dissect/target/plugins/os/unix/etc/etc.py
cecinestpasunepipe 450d68b
Merge branch 'main' into fix/etc_path
cecinestpasunepipe 3d6125a
Improvements
cecinestpasunepipe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
from __future__ import annotations | ||
|
||
import fnmatch | ||
import re | ||
from pathlib import Path | ||
|
@@ -28,9 +30,10 @@ | |
def __init__(self, target: Target): | ||
super().__init__(target, "/etc") | ||
|
||
def _sub(self, items: ConfigurationEntry, entry: Path, pattern: str) -> Iterator[UnixConfigTreeRecord]: | ||
def _sub( | ||
self, items: ConfigurationEntry | dict, entry: Path, orig_path: Path, pattern: str | ||
) -> Iterator[UnixConfigTreeRecord]: | ||
index = 0 | ||
config_entry = items | ||
if not isinstance(items, dict): | ||
items = items.as_dict() | ||
|
||
|
@@ -39,7 +42,7 @@ | |
path = Path(entry) / Path(key) | ||
|
||
if isinstance(value, dict): | ||
yield from self._sub(value, path, pattern) | ||
yield from self._sub(value, path, orig_path, pattern) | ||
continue | ||
|
||
if not isinstance(value, list): | ||
|
@@ -48,7 +51,7 @@ | |
if fnmatch.fnmatch(path, pattern): | ||
data = { | ||
"_target": self.target, | ||
"source": self.target.fs.path(config_entry.entry.path), | ||
"source": self.target.fs.path(orig_path), | ||
"path": path, | ||
"key": key, | ||
"value": value, | ||
|
@@ -68,7 +71,10 @@ | |
for item in items: | ||
try: | ||
config_object = self.get(str(Path(entry) / Path(item))) | ||
yield from self._sub(config_object, Path(entry) / Path(item), pattern) | ||
|
||
if isinstance(config_object, ConfigurationEntry): | ||
path = Path(entry) / Path(item) | ||
yield from self._sub(config_object, path, orig_path=path, pattern=pattern) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
except Exception: | ||
self.target.log.warning("Could not open configuration item: %s", item) | ||
pass |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.