diff --git a/cmd/integration-test/library.go b/cmd/integration-test/library.go index a8a047ba6..a714b29ab 100644 --- a/cmd/integration-test/library.go +++ b/cmd/integration-test/library.go @@ -100,8 +100,6 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error) ratelimiter := ratelimit.New(context.Background(), 150, time.Second) defer ratelimiter.Stop() - parser, _ := templates.NewParser() - executerOpts := protocols.ExecutorOptions{ Output: outputWriter, Options: defaultOpts, @@ -113,7 +111,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error) HostErrorsCache: cache, Colorizer: aurora.NewAurora(true), ResumeCfg: types.NewResumeCfg(), - Parser: parser, + Parser: templates.NewParser(), } engine := core.New(defaultOpts) engine.SetExecuterOptions(executerOpts) diff --git a/internal/runner/runner.go b/internal/runner/runner.go index 31241133e..608b48688 100644 --- a/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -150,10 +150,7 @@ func New(options *types.Options) (*Runner, error) { } } - parser, err := templates.NewParser() - if err != nil { - return nil, err - } + parser := templates.NewParser() if options.Validate { parser.ShouldValidate = true diff --git a/lib/sdk_private.go b/lib/sdk_private.go index c79484bf2..dca06697c 100644 --- a/lib/sdk_private.go +++ b/lib/sdk_private.go @@ -114,11 +114,7 @@ func (e *NucleiEngine) init() error { e.httpClient = httpclient } - if parser, err := templates.NewParser(); err != nil { - return err - } else { - e.parser = parser - } + e.parser = templates.NewParser() _ = protocolstate.Init(e.opts) _ = protocolinit.Init(e.opts) diff --git a/pkg/protocols/javascript/js_test.go b/pkg/protocols/javascript/js_test.go index fe281ff9a..9fb2f7d69 100644 --- a/pkg/protocols/javascript/js_test.go +++ b/pkg/protocols/javascript/js_test.go @@ -31,7 +31,6 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ = templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -42,7 +41,7 @@ func setup() { Browser: nil, Catalog: disk.NewCatalog(config.DefaultConfig.TemplatesDirectory), RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), - Parser: parser, + Parser: templates.NewParser(), } workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { diff --git a/pkg/templates/compile_test.go b/pkg/templates/compile_test.go index 1b0c21c68..3a230cc52 100644 --- a/pkg/templates/compile_test.go +++ b/pkg/templates/compile_test.go @@ -37,7 +37,6 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ := templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -48,7 +47,7 @@ func setup() { Browser: nil, Catalog: disk.NewCatalog(config.DefaultConfig.TemplatesDirectory), RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), - Parser: parser, + Parser: templates.NewParser(), } workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { diff --git a/pkg/templates/parser.go b/pkg/templates/parser.go index 079b08925..9d515c065 100644 --- a/pkg/templates/parser.go +++ b/pkg/templates/parser.go @@ -24,13 +24,13 @@ type Parser struct { compiledTemplatesCache *Cache } -func NewParser() (*Parser, error) { +func NewParser() *Parser { p := &Parser{ parsedTemplatesCache: NewCache(), compiledTemplatesCache: NewCache(), } - return p, nil + return p } // LoadTemplate returns true if the template is valid and matches the filtering criteria. diff --git a/pkg/templates/parser_test.go b/pkg/templates/parser_test.go index 7ceb1bfa3..4ec35b973 100644 --- a/pkg/templates/parser_test.go +++ b/pkg/templates/parser_test.go @@ -14,8 +14,7 @@ import ( func TestLoadTemplate(t *testing.T) { catalog := disk.NewCatalog("") - p, err := NewParser() - require.Nil(t, err) + p := NewParser() tt := []struct { name string diff --git a/pkg/tmplexec/flow/flow_executor_test.go b/pkg/tmplexec/flow/flow_executor_test.go index 5d03eed29..bd3a526d2 100644 --- a/pkg/tmplexec/flow/flow_executor_test.go +++ b/pkg/tmplexec/flow/flow_executor_test.go @@ -25,7 +25,6 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ := templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -36,7 +35,7 @@ func setup() { Browser: nil, Catalog: disk.NewCatalog(config.DefaultConfig.TemplatesDirectory), RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), - Parser: parser, + Parser: templates.NewParser(), } workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { diff --git a/pkg/tmplexec/multiproto/multi_test.go b/pkg/tmplexec/multiproto/multi_test.go index 3b73fd51c..b63268029 100644 --- a/pkg/tmplexec/multiproto/multi_test.go +++ b/pkg/tmplexec/multiproto/multi_test.go @@ -25,7 +25,6 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ := templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -36,7 +35,7 @@ func setup() { Browser: nil, Catalog: disk.NewCatalog(config.DefaultConfig.TemplatesDirectory), RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), - Parser: parser, + Parser: templates.NewParser(), } workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil {