admin/nuclei
1
0
Fork 0
mirror of https://github.com/projectdiscovery/nuclei.git synced 2026-02-17 07:53:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

javascript: pooling and reuse with export functions + misc updates (#4709)

Browse Source 
* js hotfix: wrap javascript source in anon functions

* mysql module improvements

* misc mysql bugs

* js vm pooling: soft deprecation + incentivised pooling

* misc updates

* disable interactsh failed test

* disable interactsh.yaml integration test on win & mac
This commit is contained in:
Tarun Koyalwar
2024-02-02 02:22:04 +05:30
committed by GitHub
parent 68ab3d0152
commit cc732875cd
11 changed files with 420 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,6 +151,7 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
opts := &compiler.ExecuteOptions{
Timeout: request.Timeout,
Source: &request.Init,
}
// register 'export' function to export variables from init code
// these are saved in args and are available in pre-condition and request code
@@ -212,7 +213,7 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
// proceed with whatever args we have
args.Args, _ = request.evaluateArgs(allVars, options, true)
initCompiled, err := goja.Compile("", request.Init, false)
initCompiled, err := compiler.WrapScriptNCompile(request.Init, false)
if err != nil {
return errorutil.NewWithTag(request.TemplateID, "could not compile init code: %s", err)
}
@@ -233,7 +234,7 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
// compile pre-condition if any
if request.PreCondition != "" {
preConditionCompiled, err := goja.Compile("", request.PreCondition, false)
preConditionCompiled, err := compiler.WrapScriptNCompile(request.PreCondition, false)
if err != nil {
return errorutil.NewWithTag(request.TemplateID, "could not compile pre-condition: %s", err)
}
@@ -242,7 +243,7 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
// compile actual source code
if request.Code != "" {
scriptCompiled, err := goja.Compile("", request.Code, false)
scriptCompiled, err := compiler.WrapScriptNCompile(request.Code, false)
if err != nil {
return errorutil.NewWithTag(request.TemplateID, "could not compile javascript code: %s", err)
}
@@ -339,7 +340,8 @@ func (request *Request) ExecuteWithResults(target *contextargs.Context, dynamicV
}
argsCopy.TemplateCtx = templateCtx.GetAll()
result, err := request.options.JsCompiler.ExecuteWithOptions(request.preConditionCompiled, argsCopy, &compiler.ExecuteOptions{Timeout: request.Timeout})
result, err := request.options.JsCompiler.ExecuteWithOptions(request.preConditionCompiled, argsCopy,
&compiler.ExecuteOptions{Timeout: request.Timeout, Source: &request.PreCondition})
if err != nil {
return errorutil.NewWithTag(request.TemplateID, "could not execute pre-condition: %s", err)
}
@@ -471,7 +473,8 @@ func (request *Request) executeRequestWithPayloads(hostPort string, input *conte
}
}
results, err := request.options.JsCompiler.ExecuteWithOptions(request.scriptCompiled, argsCopy, &compiler.ExecuteOptions{Timeout: request.Timeout})
results, err := request.options.JsCompiler.ExecuteWithOptions(request.scriptCompiled, argsCopy,
&compiler.ExecuteOptions{Timeout: request.Timeout, Source: &request.Code})
if err != nil {
// shouldn't fail even if it returned error instead create a failure event
results = compiler.ExecuteResult{"success": false, "error": err.Error()}