From a7519938088539ea6ffdc75a8e03e295a412f9a0 Mon Sep 17 00:00:00 2001 From: mzack Date: Wed, 13 Mar 2024 21:46:30 +0100 Subject: [PATCH] rename --- cmd/integration-test/library.go | 4 ++-- internal/runner/runner.go | 8 ++++---- lib/multi.go | 4 ++-- lib/sdk.go | 4 ++-- lib/sdk_private.go | 2 +- pkg/{pparser/pparser.go => loader/parser/parser.go} | 2 +- pkg/{parsers => loader/workflow}/workflow_loader.go | 2 +- pkg/protocols/javascript/js_test.go | 6 +++--- pkg/protocols/protocols.go | 4 ++-- pkg/templates/compile_test.go | 6 +++--- pkg/templates/parser.go | 2 +- pkg/templates/parser_test.go | 2 +- pkg/tmplexec/flow/flow_executor_test.go | 6 +++--- pkg/tmplexec/multiproto/multi_test.go | 6 +++--- 14 files changed, 29 insertions(+), 29 deletions(-) rename pkg/{pparser/pparser.go => loader/parser/parser.go} (95%) rename pkg/{parsers => loader/workflow}/workflow_loader.go (99%) diff --git a/cmd/integration-test/library.go b/cmd/integration-test/library.go index 3837ed9c0..a310ab006 100644 --- a/cmd/integration-test/library.go +++ b/cmd/integration-test/library.go @@ -20,8 +20,8 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader" "github.com/projectdiscovery/nuclei/v3/pkg/core" "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs" + parsers "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/output" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache" @@ -101,7 +101,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error) ratelimiter := ratelimit.New(context.Background(), 150, time.Second) defer ratelimiter.Stop() - parser, _ := templates.New() + parser, _ := templates.NewParser() executerOpts := protocols.ExecutorOptions{ Output: outputWriter, diff --git a/internal/runner/runner.go b/internal/runner/runner.go index 2700ab2d2..028d76bd1 100644 --- a/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -15,7 +15,7 @@ import ( "github.com/projectdiscovery/nuclei/v3/internal/pdcp" "github.com/projectdiscovery/nuclei/v3/pkg/installer" - "github.com/projectdiscovery/nuclei/v3/pkg/pparser" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/parser" uncoverlib "github.com/projectdiscovery/uncover" pdcpauth "github.com/projectdiscovery/utils/auth/pdcp" "github.com/projectdiscovery/utils/env" @@ -37,8 +37,8 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs/hybrid" "github.com/projectdiscovery/nuclei/v3/pkg/external/customtemplates" "github.com/projectdiscovery/nuclei/v3/pkg/input" + parsers "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/output" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/projectfile" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" @@ -88,7 +88,7 @@ type Runner struct { pdcpUploadErrMsg string //general purpose temporary directory tmpDir string - parser pparser.Parser + parser parser.Parser } const pprofServerAddress = "127.0.0.1:8086" @@ -150,7 +150,7 @@ func New(options *types.Options) (*Runner, error) { } } - parser, err := templates.New() + parser, err := templates.NewParser() if err != nil { return nil, err } diff --git a/lib/multi.go b/lib/multi.go index 00322e598..fe552c572 100644 --- a/lib/multi.go +++ b/lib/multi.go @@ -8,8 +8,8 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader" "github.com/projectdiscovery/nuclei/v3/pkg/core" "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/output" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs" "github.com/projectdiscovery/nuclei/v3/pkg/types" @@ -110,7 +110,7 @@ func (e *ThreadSafeNucleiEngine) ExecuteNucleiWithOpts(targets []string, opts .. } // load templates - workflowLoader, err := parsers.NewLoader(&unsafeOpts.executerOpts) + workflowLoader, err := workflow.NewLoader(&unsafeOpts.executerOpts) if err != nil { return errorutil.New("Could not create workflow loader: %s\n", err) } diff --git a/lib/sdk.go b/lib/sdk.go index 32a7d6f4e..1e2d7e29c 100644 --- a/lib/sdk.go +++ b/lib/sdk.go @@ -10,8 +10,8 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader" "github.com/projectdiscovery/nuclei/v3/pkg/core" "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/output" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache" @@ -85,7 +85,7 @@ type NucleiEngine struct { // LoadAllTemplates loads all nuclei template based on given options func (e *NucleiEngine) LoadAllTemplates() error { - workflowLoader, err := parsers.NewLoader(&e.executerOpts) + workflowLoader, err := workflow.NewLoader(&e.executerOpts) if err != nil { return errorutil.New("Could not create workflow loader: %s\n", err) } diff --git a/lib/sdk_private.go b/lib/sdk_private.go index 26cd98669..d05cd170c 100644 --- a/lib/sdk_private.go +++ b/lib/sdk_private.go @@ -114,7 +114,7 @@ func (e *NucleiEngine) init() error { e.httpClient = httpclient } - if parser, err := templates.New(); err != nil { + if parser, err := templates.NewParser(); err != nil { return err } else { e.parser = parser diff --git a/pkg/pparser/pparser.go b/pkg/loader/parser/parser.go similarity index 95% rename from pkg/pparser/pparser.go rename to pkg/loader/parser/parser.go index 9c2b0fdd8..88e4ea2b5 100644 --- a/pkg/pparser/pparser.go +++ b/pkg/loader/parser/parser.go @@ -1,4 +1,4 @@ -package pparser +package parser import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog" diff --git a/pkg/parsers/workflow_loader.go b/pkg/loader/workflow/workflow_loader.go similarity index 99% rename from pkg/parsers/workflow_loader.go rename to pkg/loader/workflow/workflow_loader.go index 08760fa4b..5eff92fe3 100644 --- a/pkg/parsers/workflow_loader.go +++ b/pkg/loader/workflow/workflow_loader.go @@ -1,4 +1,4 @@ -package parsers +package workflow import ( "github.com/projectdiscovery/gologger" diff --git a/pkg/protocols/javascript/js_test.go b/pkg/protocols/javascript/js_test.go index cf1c0de12..fe281ff9a 100644 --- a/pkg/protocols/javascript/js_test.go +++ b/pkg/protocols/javascript/js_test.go @@ -8,7 +8,7 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/templates" @@ -31,7 +31,7 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ = templates.New() + parser, _ = templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -44,7 +44,7 @@ func setup() { RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), Parser: parser, } - workflowLoader, err := parsers.NewLoader(&executerOpts) + workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { log.Fatalf("Could not create workflow loader: %s\n", err) } diff --git a/pkg/protocols/protocols.go b/pkg/protocols/protocols.go index 75918feee..046ff84a6 100644 --- a/pkg/protocols/protocols.go +++ b/pkg/protocols/protocols.go @@ -13,12 +13,12 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog" "github.com/projectdiscovery/nuclei/v3/pkg/input" "github.com/projectdiscovery/nuclei/v3/pkg/js/compiler" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/parser" "github.com/projectdiscovery/nuclei/v3/pkg/model" "github.com/projectdiscovery/nuclei/v3/pkg/operators" "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors" "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers" "github.com/projectdiscovery/nuclei/v3/pkg/output" - "github.com/projectdiscovery/nuclei/v3/pkg/pparser" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/projectfile" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs" @@ -119,7 +119,7 @@ type ExecutorOptions struct { OverrideThreadsCount PayloadThreadSetterCallback //TemporaryDirectory is the directory to store temporary files TemporaryDirectory string - Parser pparser.Parser + Parser parser.Parser } // GetThreadsForPayloadRequests returns the number of threads to use as default for diff --git a/pkg/templates/compile_test.go b/pkg/templates/compile_test.go index 124b086f9..1b0c21c68 100644 --- a/pkg/templates/compile_test.go +++ b/pkg/templates/compile_test.go @@ -13,12 +13,12 @@ import ( "github.com/julienschmidt/httprouter" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/model" "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity" "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice" "github.com/projectdiscovery/nuclei/v3/pkg/operators" "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators" @@ -37,7 +37,7 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ := templates.New() + parser, _ := templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -50,7 +50,7 @@ func setup() { RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), Parser: parser, } - workflowLoader, err := parsers.NewLoader(&executerOpts) + workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { log.Fatalf("Could not create workflow loader: %s\n", err) } diff --git a/pkg/templates/parser.go b/pkg/templates/parser.go index f63990f36..079b08925 100644 --- a/pkg/templates/parser.go +++ b/pkg/templates/parser.go @@ -24,7 +24,7 @@ type Parser struct { compiledTemplatesCache *Cache } -func New() (*Parser, error) { +func NewParser() (*Parser, error) { p := &Parser{ parsedTemplatesCache: NewCache(), compiledTemplatesCache: NewCache(), diff --git a/pkg/templates/parser_test.go b/pkg/templates/parser_test.go index 324db0942..bd6aac1ba 100644 --- a/pkg/templates/parser_test.go +++ b/pkg/templates/parser_test.go @@ -14,7 +14,7 @@ import ( func TestLoadTemplate(t *testing.T) { catalog := disk.NewCatalog("") - p, err := New() + p, err := NewParser() require.Nil(t, err) tt := []struct { diff --git a/pkg/tmplexec/flow/flow_executor_test.go b/pkg/tmplexec/flow/flow_executor_test.go index 7f7375e14..5d03eed29 100644 --- a/pkg/tmplexec/flow/flow_executor_test.go +++ b/pkg/tmplexec/flow/flow_executor_test.go @@ -8,7 +8,7 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs" @@ -25,7 +25,7 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ := templates.New() + parser, _ := templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -38,7 +38,7 @@ func setup() { RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), Parser: parser, } - workflowLoader, err := parsers.NewLoader(&executerOpts) + workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { log.Fatalf("Could not create workflow loader: %s\n", err) } diff --git a/pkg/tmplexec/multiproto/multi_test.go b/pkg/tmplexec/multiproto/multi_test.go index 6356a7e18..3b73fd51c 100644 --- a/pkg/tmplexec/multiproto/multi_test.go +++ b/pkg/tmplexec/multiproto/multi_test.go @@ -8,7 +8,7 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk" - "github.com/projectdiscovery/nuclei/v3/pkg/parsers" + "github.com/projectdiscovery/nuclei/v3/pkg/loader/workflow" "github.com/projectdiscovery/nuclei/v3/pkg/progress" "github.com/projectdiscovery/nuclei/v3/pkg/protocols" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs" @@ -25,7 +25,7 @@ func setup() { options := testutils.DefaultOptions testutils.Init(options) progressImpl, _ := progress.NewStatsTicker(0, false, false, false, 0) - parser, _ := templates.New() + parser, _ := templates.NewParser() executerOpts = protocols.ExecutorOptions{ Output: testutils.NewMockOutputWriter(options.OmitTemplate), @@ -38,7 +38,7 @@ func setup() { RateLimiter: ratelimit.New(context.Background(), uint(options.RateLimit), time.Second), Parser: parser, } - workflowLoader, err := parsers.NewLoader(&executerOpts) + workflowLoader, err := workflow.NewLoader(&executerOpts) if err != nil { log.Fatalf("Could not create workflow loader: %s\n", err) }