Skip to content

feat: Refactor fstab parsing and add plugins for /etc/fstab and /proc/mounts#1613

Open
Yld2004 wants to merge 14 commits intofox-it:mainfrom
Yld2004:mount-and-fstab
Open

feat: Refactor fstab parsing and add plugins for /etc/fstab and /proc/mounts#1613
Yld2004 wants to merge 14 commits intofox-it:mainfrom
Yld2004:mount-and-fstab

Conversation

@Yld2004
Copy link

@Yld2004 Yld2004 commented Mar 9, 2026

Description

Summary

This PR extracts the logic for parsing fstab-style entries into a reusable utility function and introduces two new plugins: FstabPlugin and MountPlugin. These changes allow for consistent extraction of mount information from both static configuration files and the volatile /proc environment.

Key Changes

Logic Centralization:

Created parse_fstab_entry in dissect/target/plugins/os/unix/_os.py.

Updated parse_fstab to use this new centralized helper, improving handling of whitespace, comments, and field padding (defaults).

New Plugins:

FstabPlugin: Located at etc.fstab, it yields records for entries found in /etc/fstab.

MountPlugin: Located at linux.proc.mounts, it iterates through all processes in /proc and yields their respective mount points in the /proc/<pid>/mounts file.

Process Model Enhancement:

Added a mounts() method to the Process class in the Linux proc plugin, allowing per-process mount inspection.

Introduced FstabEntry dataclass for structured data handling within the proc module.

Testing:

Added comprehensive tests for the new plugins (test_fstab.py, test_mounts.py).

Updated conftest.py to include mock mount data for Linux process testing.

@DissectBot
Copy link

@Yld2004 thank you for your contribution! As this is your first code contribution, please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following information:

@DissectBot agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement ("Agreement") governs your Contribution(s) (as defined below) and conveys certain license rights to Fox-IT B.V. ("Fox-IT") for your Contribution(s) to Fox-IT"s open source Dissect project. This Agreement covers any and all Contributions that you ("You" or "Your"), now or in the future, Submit (as defined below) to this project. This Agreement is between Fox-IT B.V. and You and takes effect when you click an “I Accept” button, check box presented with these terms, otherwise accept these terms or, if earlier, when You Submit a Contribution.

  1. Definitions.
    "Contribution" means any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Fox-IT for inclusion in, or documentation of, any of the software products owned or managed by, or on behalf of, Fox-IT as part of the Project (the "Work").
    "Project" means any of the projects owned or managed by Fox-IT and offered under a license approved by the Open Source Initiative (www.opensource.org).
    "Submit" means any form of electronic, verbal, or written communication sent to Fox-IT or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Fox-IT for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."

  2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Fox-IT and to recipients of software distributed by Fox-IT a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.

  3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Fox-IT and to recipients of software distributed by Fox-IT a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, maintain, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.

  4. Representations. You represent that:

    • You are legally entitled to grant the above license.
    • each of Your Contributions is Your original creation (see section 8 for submissions on behalf of others).
    • Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
  5. Employer. If Your Contribution is made in the course of Your work for an employer or Your employer has intellectual property rights in Your Submission by contract or applicable law, You must secure permission from Your employer to make the Contribution before signing this Agreement. In that case, the term "You" in this Agreement will refer to You and the employer collectively. If You change employers in the future and desire to Submit additional Contribution for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Contributions.

  6. Support. You are not expected to provide support for Your Contribution, unless You choose to do so. Any such support provided to the Project is provided free of charge.

  7. Warranty. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

  8. Third party material. Should You wish to submit work that is not Your original creation, You may only submit it to Fox-IT separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".

  9. Notify. You agree to notify Fox-IT of any facts or circumstances of which You become aware that would make the above representations inaccurate in any respect.

  10. Governing law / competent court. This Agreement is governed by the laws of the Netherlands. Any disputes that may arise are resolved by arbitration in accordance with the Arbitration Regulations of the Foundation for the Settlement of Automation Disputes (Stichting Geschillenoplossing Automatisering – SGOA – (www.sgoa.eu), this without prejudice to either party"s right to request preliminary relief in preliminary relief proceedings or arbitral preliminary relief proceedings. Arbitration proceedings take place in Amsterdam, or in any other place designated in the Arbitration Regulations. Arbitration shall take place in English.

@Yld2004
Copy link
Author

Yld2004 commented Mar 9, 2026

@DissectBot agree

Copy link
Member

@Schamper Schamper left a comment

Choose a reason for hiding this comment

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

Can you fix the linting errors?

@codecov
Copy link

codecov bot commented Mar 12, 2026

Codecov Report

❌ Patch coverage is 96.00000% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.14%. Comparing base (f66d3dc) to head (4a25b21).

Files with missing lines Patch % Lines
dissect/target/plugins/os/unix/_os.py 91.42% 3 Missing ⚠️
dissect/target/plugins/os/unix/linux/proc.py 96.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1613      +/-   ##
==========================================
+ Coverage   81.10%   81.14%   +0.03%     
==========================================
  Files         401      403       +2     
  Lines       35175    35263      +88     
==========================================
+ Hits        28529    28613      +84     
- Misses       6646     6650       +4     
Flag Coverage Δ
unittests 81.14% <96.00%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@codspeed-hq
Copy link

codspeed-hq bot commented Mar 12, 2026

Merging this PR will not alter performance

✅ 12 untouched benchmarks


Comparing Yld2004:mount-and-fstab (4a25b21) with main (f66d3dc)

Open in CodSpeed

Yld2004 and others added 4 commits March 16, 2026 11:59
@Yld2004 Yld2004 requested a review from Schamper March 16, 2026 13:32
Yld2004 and others added 3 commits March 17, 2026 21:20
Co-authored-by: Erik Schamper <1254028+Schamper@users.noreply.github.com>
Co-authored-by: Yld2004  <77771298+Yld2004@users.noreply.github.com>
@Yld2004 Yld2004 requested a review from Schamper March 17, 2026 20:10
fstab_data = fstab_file.readlines()

if len(entry_parts) != 6:
for line in fstab_data:
Copy link
Member

Choose a reason for hiding this comment

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

I meant more something like this:

Suggested change
for line in fstab_data:
with fstab.open("rt") as fh:
for line in fh:

Copy link
Author

Choose a reason for hiding this comment

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

I wanted to do it but below it will sum up into 5 tabs Don't you think it will be too much tabs?

Copy link
Member

Choose a reason for hiding this comment

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

It's fine. We have a 120 width line limit. Plenty of space :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants