From feb46afd5a11f8f559e432f3b55c4bf500c0d728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fan=20Can=20Bak=C4=B1r?= Date: Tue, 24 Dec 2024 14:08:37 +0300 Subject: [PATCH] fix unresolved `interactsh-url` for raw http templates --- 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 48caf20a3c..3cde12d883 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 {