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 unresolved interactsh-url with self-contained for raw http templates #5938

Merged
merged 1 commit into from
Dec 24, 2024

Conversation

dogancanbakir
Copy link
Member

@dogancanbakir dogancanbakir commented Dec 24, 2024

Proposed changes

Closes #5937

Checklist

  • Pull request is created against the dev branch
  • All checks passed (lint, unit/integration/regression tests etc.) with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Summary by CodeRabbit

  • New Features

    • Improved handling of self-contained requests for more efficient processing.
    • Enhanced logic for interactsh variable management.
  • Bug Fixes

    • Streamlined control flow to prevent unnecessary processing when self-contained requests are detected.

Copy link

coderabbitai bot commented Dec 24, 2024

Walkthrough

The changes modify the Make method in the HTTP request generation process, focusing on the handling of self-contained requests and interactsh variables. The primary modification involves repositioning the conditional check for self-contained requests, ensuring that such requests are processed immediately without further variable processing. The interactsh variable handling logic has been restructured to first check for interactsh availability and then perform variable replacements or string conversions accordingly.

Changes

File Change Summary
pkg/protocols/http/build_request.go Reordered logic for self-contained request handling and interactsh variable processing

Assessment against linked issues

Objective Addressed Explanation
Fix interactsh-url not working with self-contained templates [#5937]

Sequence Diagram

sequenceDiagram
    participant RG as RequestGenerator
    participant IC as InteractshClient
    
    RG->>RG: Check if request is self-contained
    alt Self-Contained Request
        RG->>RG: Immediately return self-contained request
    else Not Self-Contained
        RG->>IC: Check Interactsh availability
        alt Interactsh Available
            RG->>RG: Replace Interactsh variables
        else No Interactsh
            RG->>RG: Convert payloads to string slices
        end
    end
Loading

Poem

🐰 A rabbit's tale of requests so bright,
Self-contained magic takes swift flight!
Interactsh variables dance and sway,
Resolving paths in a clever way
Code flows smooth, no errors in sight! 🚀

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 515dc26 and feb46af.

📒 Files selected for processing (1)
  • pkg/protocols/http/build_request.go (2 hunks)
🔇 Additional comments (2)
pkg/protocols/http/build_request.go (2)

153-153: No issues found with the introduction of isRawRequest.

Declaring isRawRequest based on len(r.request.Raw) > 0 is consistent and straightforward.


167-170: Confirm the interactsh replacement order for self-contained requests.

By checking r.request.SelfContained after executing the interactsh replacements (lines 156-164), you ensure that placeholders are properly substituted before switching to makeSelfContainedRequest. This adjustment addresses scenarios where self-contained templates include interactsh placeholder variables that previously went unresolved.

However, since the PR mentions uncompleted tests, you may want to add a focused unit test verifying that a self-contained template still receives correct interactsh URL substitutions.

Would you like me to provide a sample test snippet?


🪧 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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

@dwisiswant0 dwisiswant0 changed the title fix unresolved interactsh-url for raw http templates fix unresolved interactsh-url with self-contained for raw http templates Dec 24, 2024
@ehsandeep ehsandeep merged commit 525d2ca into dev Dec 24, 2024
19 checks passed
@ehsandeep ehsandeep deleted the fix_interactsh_for_raw_http branch December 24, 2024 14:57
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.

interactsh-url does not work when both self-contained and interactsh-url are used in a template
3 participants