Skip to content
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 code scanning alert no. 4: Arbitrary file write during tarfile extraction #495

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Sep 30, 2024

Fixes https://github.com/deepmodeling/dpdispatcher/security/code-scanning/4

To fix the problem, we need to ensure that the paths of the files within the tar archive do not contain any directory traversal elements (..). This can be done by checking each file path before extraction and raising an error if any path is found to be unsafe.

Steps to fix:

  1. Check Paths: Before extracting each file, check if the path is absolute or contains ... If it does, raise an error.
  2. Modify Extraction Logic: Update the extraction logic to include this validation step.

Suggested fixes powered by Copilot Autofix. Review carefully before merging.

Summary by CodeRabbit

  • New Features

    • Enhanced security with validation in file extraction to prevent directory traversal attacks.
    • Improved file upload handling with SHA256 checksum generation for integrity verification.
    • File transfer efficiency increased by utilizing rsync when available.
  • Bug Fixes

    • Ensured SSH session is alive before executing commands with a retry mechanism.
  • Documentation

    • Updated method signatures and documentation to reflect current implementations.

…traction

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Copy link
Contributor

coderabbitai bot commented Sep 30, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request involve modifications to the SSHContext and SSHSession classes within the dpdispatcher/contexts/ssh_context.py file. Enhancements include improved validation for file extraction, updates to command execution ensuring session integrity, refined file upload handling, and adjustments to method signatures and documentation to align with current implementations.

Changes

File Path Change Summary
dpdispatcher/contexts/ssh_context.py - Updated _get_files method to add validation against absolute paths and ".." for security.
- Enhanced exec_command method to verify SSH session status before executing commands.
- Refined upload method for better file handling and added SHA256 checksum generation.
- Modified put and get methods to utilize rsync for improved file transfer efficiency.
- Updated arginfo method to reflect changes in parameters and ensure documentation accuracy.

Possibly related PRs


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Project coverage is 60.15%. Comparing base (819eddf) to head (021779b).

Files with missing lines Patch % Lines
dpdispatcher/contexts/ssh_context.py 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #495      +/-   ##
==========================================
- Coverage   60.19%   60.15%   -0.05%     
==========================================
  Files          39       39              
  Lines        3859     3862       +3     
==========================================
  Hits         2323     2323              
- Misses       1536     1539       +3     

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

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 819eddf and 021779b.

📒 Files selected for processing (1)
  • dpdispatcher/contexts/ssh_context.py (1 hunks)
🧰 Additional context used
🪛 GitHub Check: codecov/patch
dpdispatcher/contexts/ssh_context.py

[warning] 975-977: dpdispatcher/contexts/ssh_context.py#L975-L977
Added lines #L975 - L977 were not covered by tests

Comment on lines +975 to +977
for member in tar.getmembers():
if os.path.isabs(member.name) or ".." in member.name:
raise ValueError(f"Illegal tar archive entry: {member.name}")
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Add unit tests for the new security validation

Lines 975-977 introduce critical validation to prevent security vulnerabilities. Currently, these lines are not covered by tests. Adding unit tests will ensure that the validation works as intended and remains effective against potential directory traversal attacks.

🧰 Tools
🪛 GitHub Check: codecov/patch

[warning] 975-977: dpdispatcher/contexts/ssh_context.py#L975-L977
Added lines #L975 - L977 were not covered by tests


⚠️ Potential issue

Enhance directory traversal protection in tar extraction

The current validation in the _get_files method checks if member.name is absolute or contains ".." to prevent directory traversal attacks. However, this approach may not be sufficient, as attackers can craft filenames like "../" or use multiple consecutive dots to bypass the check.

Consider normalizing the path using os.path.normpath() and validating that the resulting path does not escape the intended extraction directory.

Apply this diff to improve the security validation:

 for member in tar.getmembers():
+    member_path = os.path.normpath(member.name)
-    if os.path.isabs(member.name) or ".." in member.name:
+    if os.path.isabs(member_path) or member_path.startswith(".."):
         raise ValueError(f"Illegal tar archive entry: {member.name}")
+    member.name = member_path
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
for member in tar.getmembers():
if os.path.isabs(member.name) or ".." in member.name:
raise ValueError(f"Illegal tar archive entry: {member.name}")
for member in tar.getmembers():
member_path = os.path.normpath(member.name)
if os.path.isabs(member_path) or member_path.startswith(".."):
raise ValueError(f"Illegal tar archive entry: {member.name}")
member.name = member_path
🧰 Tools
🪛 GitHub Check: codecov/patch

[warning] 975-977: dpdispatcher/contexts/ssh_context.py#L975-L977
Added lines #L975 - L977 were not covered by tests

@njzjz
Copy link
Member Author

njzjz commented Oct 1, 2024

I am not sure if it is worth adding this as it adds extra cost.

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.

1 participant