External/nuclei
1
0
Fork 0
mirror of https://github.com/projectdiscovery/nuclei.git synced 2025-12-17 21:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unresolved interactsh-url for js templates

Browse Source
This commit is contained in:
Doğan Can Bakır 2025-03-06 15:52:12 +03:00
parent 3a3f5e271c
commit 1e08d29e50
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/protocols/javascript/js.go
View File

@ -315,6 +315,19 @@ func (request *Request) ExecuteWithResults(target *contextargs.Context, dynamicV
values := generators.MergeMaps(payloadValues, hostnameVariables, request.options.Constants, templateCtx.GetAll()) values := generators.MergeMaps(payloadValues, hostnameVariables, request.options.Constants, templateCtx.GetAll())
variablesMap := request.options.Variables.Evaluate(values) variablesMap := request.options.Variables.Evaluate(values)
payloadValues = generators.MergeMaps(variablesMap, payloadValues, request.options.Constants, hostnameVariables) payloadValues = generators.MergeMaps(variablesMap, payloadValues, request.options.Constants, hostnameVariables)
var interactshURLs []string
if request.options.Interactsh != nil {
for payloadName, payloadValue := range payloadValues {
var urls []string
payloadValue, urls = request.options.Interactsh.Replace(types.ToString(payloadValue), interactshURLs)
if len(urls) > 0 {
interactshURLs = append(interactshURLs, urls...)
payloadValues[payloadName] = payloadValue
}
}
}
// export all variables to template context // export all variables to template context
templateCtx.Merge(payloadValues) templateCtx.Merge(payloadValues)
@ -404,7 +417,7 @@ func (request *Request) ExecuteWithResults(target *contextargs.Context, dynamicV
request.options.Progress.IncrementMatched() request.options.Progress.IncrementMatched()
} }
callback(result) callback(result)
}, requestOptions); err != nil { }, requestOptions, interactshURLs); err != nil {
if errkit.IsNetworkPermanentErr(err) { if errkit.IsNetworkPermanentErr(err) {
// gologger.Verbose().Msgf("Could not execute request: %s\n", err) // gologger.Verbose().Msgf("Could not execute request: %s\n", err)
return err return err
@ -417,7 +430,7 @@ func (request *Request) ExecuteWithResults(target *contextargs.Context, dynamicV
} }
} }
} }
return request.executeRequestWithPayloads(hostPort, input, hostname, nil, payloadValues, callback, requestOptions) return request.executeRequestWithPayloads(hostPort, input, hostname, nil, payloadValues, callback, requestOptions, interactshURLs)
} }
func (request *Request) executeRequestParallel(ctxParent context.Context, hostPort, hostname string, input *contextargs.Context, payloadValues map[string]interface{}, callback protocols.OutputEventCallback) { func (request *Request) executeRequestParallel(ctxParent context.Context, hostPort, hostname string, input *contextargs.Context, payloadValues map[string]interface{}, callback protocols.OutputEventCallback) {
@ -469,7 +482,7 @@ func (request *Request) executeRequestParallel(ctxParent context.Context, hostPo
gotmatches.Store(true) gotmatches.Store(true)
} }
callback(result) callback(result)
}, requestOptions); err != nil { }, requestOptions, []string{}); err != nil {
if errkit.IsNetworkPermanentErr(err) { if errkit.IsNetworkPermanentErr(err) {
cancel(err) cancel(err)
return return
@ -490,7 +503,7 @@ func (request *Request) executeRequestParallel(ctxParent context.Context, hostPo
} }
} }
func (request *Request) executeRequestWithPayloads(hostPort string, input *contextargs.Context, _ string, payload map[string]interface{}, previous output.InternalEvent, callback protocols.OutputEventCallback, requestOptions *protocols.ExecutorOptions) error { func (request *Request) executeRequestWithPayloads(hostPort string, input *contextargs.Context, _ string, payload map[string]interface{}, previous output.InternalEvent, callback protocols.OutputEventCallback, requestOptions *protocols.ExecutorOptions, interactshURLs []string) error {
payloadValues := generators.MergeMaps(payload, previous) payloadValues := generators.MergeMaps(payload, previous)
argsCopy, err := request.getArgsCopy(input, payloadValues, requestOptions, false) argsCopy, err := request.getArgsCopy(input, payloadValues, requestOptions, false)
if err != nil { if err != nil {
@ -502,7 +515,6 @@ func (request *Request) executeRequestWithPayloads(hostPort string, input *conte
argsCopy.TemplateCtx = map[string]interface{}{} argsCopy.TemplateCtx = map[string]interface{}{}
} }
var interactshURLs []string
if request.options.Interactsh != nil { if request.options.Interactsh != nil {
if argsCopy.Args != nil { if argsCopy.Args != nil {
for k, v := range argsCopy.Args { for k, v := range argsCopy.Args {