From 525d2caf66cb5a55e286dc0027cb3229d94f5ce2 Mon Sep 17 00:00:00 2001
From: Dogan Can Bakir <65292895+dogancanbakir@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:57:13 +0300
Subject: [PATCH] fix unresolved `interactsh-url` for raw http templates
 (#5938)

---
 pkg/protocols/http/build_request.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/protocols/http/build_request.go b/pkg/protocols/http/build_request.go
index 48caf20a3..3cde12d88 100644
--- a/pkg/protocols/http/build_request.go
+++ b/pkg/protocols/http/build_request.go
@@ -150,9 +150,7 @@ func (r *requestGenerator) Make(ctx context.Context, input *contextargs.Context,
 		// skip creating template context if not available
 		dynamicValues = generators.MergeMaps(dynamicValues, r.request.options.GetTemplateCtx(input.MetaInput).GetAll())
 	}
-	if r.request.SelfContained {
-		return r.makeSelfContainedRequest(ctx, reqData, payloads, dynamicValues)
-	}
+
 	isRawRequest := len(r.request.Raw) > 0
 	// replace interactsh variables with actual interactsh urls
 	if r.options.Interactsh != nil {
@@ -166,6 +164,10 @@ func (r *requestGenerator) Make(ctx context.Context, input *contextargs.Context,
 		}
 	}
 
+	if r.request.SelfContained {
+		return r.makeSelfContainedRequest(ctx, reqData, payloads, dynamicValues)
+	}
+
 	// Parse target url
 	parsed, err := urlutil.ParseAbsoluteURL(input.MetaInput.Input, false)
 	if err != nil {