Skip to content

Commit eccd90d

Browse files
fix(headless): Variables are now available into headless template (#6301)
* fix(headless): variables now available into simple headless template * chore: erase debug logs
1 parent 84a76b3 commit eccd90d

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/protocols/headless/request.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, metadata,
5454
optionVars := generators.BuildPayloadFromOptions(request.options.Options)
5555
// add templatecontext variables to varMap
5656
if request.options.HasTemplateCtx(input.MetaInput) {
57-
vars = generators.MergeMaps(vars, metadata, optionVars, request.options.GetTemplateCtx(input.MetaInput).GetAll())
57+
vars = generators.MergeMaps(vars, request.options.GetTemplateCtx(input.MetaInput).GetAll())
5858
}
59+
5960
variablesMap := request.options.Variables.Evaluate(vars)
60-
vars = generators.MergeMaps(vars, variablesMap, request.options.Constants)
61+
vars = generators.MergeMaps(vars, metadata, optionVars, variablesMap, request.options.Constants)
6162

6263
// check for operator matches by wrapping callback
6364
gotmatches := false
@@ -118,8 +119,8 @@ func (request *Request) executeRequestWithPayloads(input *contextargs.Context, p
118119
return errors.Wrap(err, errCouldNotGetHtmlElement)
119120
}
120121
defer func() {
121-
_ = instance.Close()
122-
}()
122+
_ = instance.Close()
123+
}()
123124

124125
instance.SetInteractsh(request.options.Interactsh)
125126

0 commit comments

Comments
 (0)