Removed leftover collaborator integration

v2/cmd/nuclei/main.go

@@ -73,7 +73,6 @@ based on templates offering massive extensibility and ease of use.`)
 	set.BoolVarP(&options.NoMeta, "no-meta", "nm", false, "Don't display metadata for the matches")
 	set.BoolVarP(&options.TemplatesVersion, "templates-version", "tv", false, "Shows the installed nuclei-templates version")
 	set.BoolVar(&options.OfflineHTTP, "passive", false, "Enable Passive HTTP response processing mode")
-	set.StringVarP(&options.BurpCollaboratorBiid, "burp-collaborator-biid", "biid", "", "Burp Collaborator BIID")
 	set.StringVarP(&options.ReportingConfig, "report-config", "rc", "", "Nuclei Reporting Module configuration file")
 	set.StringVarP(&options.ReportingDB, "report-db", "rdb", "", "Local Nuclei Reporting Database (Always use this to persistent report data)")
 	set.StringSliceVar(&options.Tags, "tags", []string{}, "Tags to execute templates for")

v2/internal/collaborator/collaborator.go

@@ -1,72 +0,0 @@
-package collaborator
-
-import (
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/projectdiscovery/collaborator"
-)
-
-var (
-	// PollSeconds is the seconds to poll at.
-	PollSeconds = 5
-	// DefaultMaxBufferLimit is the default request buffer limit
-	DefaultMaxBufferLimit = 150
-	// DefaultPollInterval is the default poll interval for burp collabortor polling.
-	DefaultPollInterval time.Duration = time.Second * time.Duration(PollSeconds)
-	// DefaultCollaborator is the default burp collaborator instance
-	DefaultCollaborator = &Collaborator{Collab: collaborator.NewBurpCollaborator()}
-)
-
-// Collaborator is a client for recording burp collaborator interactions
-type Collaborator struct {
-	sync.RWMutex
-	options *Options // unused
-	Collab  *collaborator.BurpCollaborator
-}
-
-// Options contains configuration options for collaborator client
-type Options struct {
-	BIID           string
-	PollInterval   time.Duration
-	MaxBufferLimit int
-}
-
-// New creates a new collaborator client
-func New(options *Options) *Collaborator {
-	collab := collaborator.NewBurpCollaborator()
-	collab.AddBIID(options.BIID)
-	collab.MaxBufferLimit = options.MaxBufferLimit
-	return &Collaborator{Collab: collab, options: options}
-}
-
-// Poll initiates collaborator polling if any BIIDs were provided
-func (b *Collaborator) Poll() {
-	// if no valid biids were provided just return
-	if len(b.Collab.BIIDs) > 0 {
-		go b.Collab.PollEach(DefaultPollInterval)
-	}
-}
-
-// Has checks if a collabrator hit was found for a URL
-func (b *Collaborator) Has(s string) bool {
-	for _, r := range b.Collab.RespBuffer {
-		for i := 0; i < len(r.Responses); i++ {
-			// search in dns - http - smtp
-			b.RLock()
-			found := strings.Contains(r.Responses[i].Data.RawRequestDecoded, s) ||
-				strings.Contains(r.Responses[i].Data.RequestDecoded, s) ||
-				strings.Contains(r.Responses[i].Data.MessageDecoded, s)
-			b.RUnlock()
-
-			if found {
-				b.Lock()
-				r.Responses = append(r.Responses[:i], r.Responses[i+1:]...)
-				b.Unlock()
-				return true
-			}
-		}
-	}
-	return false
-}

v2/internal/runner/runner.go

@@ -11,7 +11,6 @@ import (
 	"github.com/logrusorgru/aurora"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/hmap/store/hybrid"
-	"github.com/projectdiscovery/nuclei/v2/internal/collaborator"
 	"github.com/projectdiscovery/nuclei/v2/internal/colorizer"
 	"github.com/projectdiscovery/nuclei/v2/pkg/catalog"
 	"github.com/projectdiscovery/nuclei/v2/pkg/output"
@@ -227,11 +226,6 @@ func New(options *types.Options) (*Runner, error) {
 		}
 	}
 
-	// Enable Polling
-	if options.BurpCollaboratorBiid != "" {
-		collaborator.DefaultCollaborator.Collab.AddBIID(options.BurpCollaboratorBiid)
-	}
-
 	if options.RateLimit > 0 {
 		runner.ratelimiter = ratelimit.New(options.RateLimit)
 	} else {
@@ -364,8 +358,6 @@ func (r *Runner) RunEnumeration() {
 
 	results := &atomic.Bool{}
 	wgtemplates := sizedwaitgroup.New(r.options.TemplateThreads)
-	// Starts polling or ignore
-	collaborator.DefaultCollaborator.Poll()
 
 	// tracks global progress and captures stdout/stderr until p.Wait finishes
 	r.progress.Init(r.inputCount, templateCount, totalRequests)

v2/internal/testutils/testutils.go

@@ -19,43 +19,42 @@ func Init(options *types.Options) {
 
 // DefaultOptions is the default options structure for nuclei during mocking.
 var DefaultOptions = &types.Options{
-	Metrics:              false,
-	Debug:                false,
-	DebugRequests:        false,
-	DebugResponse:        false,
-	Silent:               false,
-	Version:              false,
-	Verbose:              false,
-	NoColor:              true,
-	UpdateTemplates:      false,
-	JSON:                 false,
-	JSONRequests:         false,
-	EnableProgressBar:    false,
-	TemplatesVersion:     false,
-	TemplateList:         false,
-	Stdin:                false,
-	StopAtFirstMatch:     false,
-	NoMeta:               false,
-	Project:              false,
-	MetricsPort:          0,
-	BulkSize:             25,
-	TemplateThreads:      10,
-	Timeout:              5,
-	Retries:              1,
-	RateLimit:            150,
-	BurpCollaboratorBiid: "",
-	ProjectPath:          "",
-	Severity:             []string{},
-	Target:               "",
-	Targets:              "",
-	Output:               "",
-	ProxyURL:             "",
-	ProxySocksURL:        "",
-	TemplatesDirectory:   "",
-	TraceLogFile:         "",
-	Templates:            []string{},
-	ExcludedTemplates:    []string{},
-	CustomHeaders:        []string{},
+	Metrics:            false,
+	Debug:              false,
+	DebugRequests:      false,
+	DebugResponse:      false,
+	Silent:             false,
+	Version:            false,
+	Verbose:            false,
+	NoColor:            true,
+	UpdateTemplates:    false,
+	JSON:               false,
+	JSONRequests:       false,
+	EnableProgressBar:  false,
+	TemplatesVersion:   false,
+	TemplateList:       false,
+	Stdin:              false,
+	StopAtFirstMatch:   false,
+	NoMeta:             false,
+	Project:            false,
+	MetricsPort:        0,
+	BulkSize:           25,
+	TemplateThreads:    10,
+	Timeout:            5,
+	Retries:            1,
+	RateLimit:          150,
+	ProjectPath:        "",
+	Severity:           []string{},
+	Target:             "",
+	Targets:            "",
+	Output:             "",
+	ProxyURL:           "",
+	ProxySocksURL:      "",
+	TemplatesDirectory: "",
+	TraceLogFile:       "",
+	Templates:          []string{},
+	ExcludedTemplates:  []string{},
+	CustomHeaders:      []string{},
 }
 
 // MockOutputWriter is a mocked output writer.

v2/pkg/operators/common/dsl/dsl.go

@@ -17,7 +17,6 @@ import (
 	"time"
 
 	"github.com/Knetic/govaluate"
-	"github.com/projectdiscovery/nuclei/v2/internal/collaborator"
 	"github.com/projectdiscovery/nuclei/v2/pkg/types"
 	"github.com/spaolacci/murmur3"
 )
@@ -269,12 +268,6 @@ func HelperFunctions() map[string]govaluate.ExpressionFunction {
 		time.Sleep(time.Duration(seconds) * time.Second)
 		return true, nil
 	}
-
-	// Collaborator
-	functions["collab"] = func(args ...interface{}) (interface{}, error) {
-		// check if collaborator contains a specific pattern
-		return collaborator.DefaultCollaborator.Has(types.ToString(args[0])), nil
-	}
 	return functions
 }
 

v2/pkg/types/types.go

@@ -21,8 +21,6 @@ type Options struct {
 	// Severity filters templates based on their severity and only run the matching ones.
 	Severity              goflags.StringSlice
 	InternalResolversList []string // normalized from resolvers flag as well as file provided.
-	// BurpCollaboratorBiid is the Burp Collaborator BIID for polling interactions.
-	BurpCollaboratorBiid string
 	// ProjectPath allows nuclei to use a user defined project folder
 	ProjectPath string
 	// InteractshURL is the URL for the interactsh server.