Fixed a crash with uninitialized interactsh client

v2/internal/runner/runner.go

@@ -144,22 +144,21 @@ func New(options *types.Options) (*Runner, error) {
 		}
 	}
 
-	if !options.NoInteractsh {
-		opts := interactsh.NewDefaultOptions(runner.output, runner.issuesClient, runner.progress)
-		opts.Debug = runner.options.Debug
-		opts.ServerURL = options.InteractshURL
-		opts.Authorization = options.InteractshToken
-		opts.CacheSize = int64(options.InteractionsCacheSize)
-		opts.Eviction = time.Duration(options.InteractionsEviction) * time.Second
-		opts.ColldownPeriod = time.Duration(options.InteractionsCooldownPeriod) * time.Second
-		opts.PollDuration = time.Duration(options.InteractionsPollDuration) * time.Second
-
-		interactshClient, err := interactsh.New(opts)
-		if err != nil {
-			gologger.Error().Msgf("Could not create interactsh client: %s", err)
-		} else {
-			runner.interactsh = interactshClient
-		}
+	opts := interactsh.NewDefaultOptions(runner.output, runner.issuesClient, runner.progress)
+	opts.Debug = runner.options.Debug
+	opts.ServerURL = options.InteractshURL
+	opts.Authorization = options.InteractshToken
+	opts.CacheSize = int64(options.InteractionsCacheSize)
+	opts.Eviction = time.Duration(options.InteractionsEviction) * time.Second
+	opts.ColldownPeriod = time.Duration(options.InteractionsCooldownPeriod) * time.Second
+	opts.PollDuration = time.Duration(options.InteractionsPollDuration) * time.Second
+	opts.NoInteractsh = runner.options.NoInteractsh
+
+	interactshClient, err := interactsh.New(opts)
+	if err != nil {
+		gologger.Error().Msgf("Could not create interactsh client: %s", err)
+	} else {
+		runner.interactsh = interactshClient
 	}
 
 	if options.RateLimitMinute > 0 {

v2/pkg/operators/matchers/compile.go

@@ -29,10 +29,6 @@ func (m *Matcher) CompileMatchers() error {
 	if !ok {
 		return fmt.Errorf("unknown matcher type specified: %s", m.Type)
 	}
-	// By default, match on body if user hasn't provided any specific items
-	if m.Part == "" {
-		m.Part = "response"
-	}
 
 	// Compile the regexes
 	for _, regex := range m.Regex {

v2/pkg/protocols/common/interactsh/interactsh.go

@@ -72,6 +72,8 @@ type Options struct {
 	Progress progress.Progress
 	// Debug specifies whether debugging output should be shown for interactsh-client
 	Debug bool
+
+	NoInteractsh bool
 }
 
 const defaultMaxInteractionsCount = 5000
@@ -118,6 +120,9 @@ func NewDefaultOptions(output output.Writer, reporting *reporting.Client, progre
 }
 
 func (c *Client) firstTimeInitializeClient() error {
+	if c.options.NoInteractsh {
+		return nil // do not init if disabled
+	}
 	interactsh, err := client.New(&client.Options{
 		ServerURL:         c.options.ServerURL,
 		Token:             c.options.Authorization,
@@ -221,7 +226,6 @@ func (c *Client) Close() bool {
 // It accepts data to replace as well as the URL to replace placeholders
 // with generated uniquely for each request.
 func (c *Client) ReplaceMarkers(data string, interactshURLs []string) (string, []string) {
-
 	for strings.Contains(data, interactshURLMarker) {
 		url := c.URL()
 		interactshURLs = append(interactshURLs, url)

v2/pkg/protocols/http/build_request.go

@@ -64,10 +64,15 @@ func (r *requestGenerator) Make(baseURL string, dynamicValues map[string]interfa
 	}
 	ctx := context.Background()
 
-	data, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(data, r.interactshURLs)
-
-	for payloadName, payloadValue := range payloads {
-		payloads[payloadName], r.interactshURLs = r.options.Interactsh.ReplaceMarkers(types.ToString(payloadValue), r.interactshURLs)
+	if r.options.Interactsh != nil {
+		data, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(data, r.interactshURLs)
+		for payloadName, payloadValue := range payloads {
+			payloads[payloadName], r.interactshURLs = r.options.Interactsh.ReplaceMarkers(types.ToString(payloadValue), r.interactshURLs)
+		}
+	} else {
+		for payloadName, payloadValue := range payloads {
+			payloads[payloadName] = types.ToString(payloadValue)
+		}
 	}
 
 	parsed, err := url.Parse(baseURL)
@@ -171,7 +176,9 @@ func baseURLWithTemplatePrefs(data string, parsed *url.URL) (string, *url.URL) {
 
 // MakeHTTPRequestFromModel creates a *http.Request from a request template
 func (r *requestGenerator) makeHTTPRequestFromModel(ctx context.Context, data string, values, generatorValues map[string]interface{}) (*generatedRequest, error) {
-	data, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(data, r.interactshURLs)
+	if r.options.Interactsh != nil {
+		data, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(data, r.interactshURLs)
+	}
 
 	// Combine the template payloads along with base
 	// request values.
@@ -204,7 +211,9 @@ func (r *requestGenerator) makeHTTPRequestFromModel(ctx context.Context, data st
 
 // makeHTTPRequestFromRaw creates a *http.Request from a raw request
 func (r *requestGenerator) makeHTTPRequestFromRaw(ctx context.Context, baseURL, data string, values, payloads map[string]interface{}) (*generatedRequest, error) {
-	data, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(data, r.interactshURLs)
+	if r.options.Interactsh != nil {
+		data, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(data, r.interactshURLs)
+	}
 	return r.handleRawWithPayloads(ctx, data, baseURL, values, payloads)
 }
 
@@ -268,7 +277,9 @@ func (r *requestGenerator) handleRawWithPayloads(ctx context.Context, rawRequest
 func (r *requestGenerator) fillRequest(req *http.Request, values map[string]interface{}) (*retryablehttp.Request, error) {
 	// Set the header values requested
 	for header, value := range r.request.Headers {
-		value, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(value, r.interactshURLs)
+		if r.options.Interactsh != nil {
+			value, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(value, r.interactshURLs)
+		}
 		value, err := expressions.Evaluate(value, values)
 		if err != nil {
 			return nil, errors.Wrap(err, "could not evaluate helper expressions")
@@ -286,8 +297,10 @@ func (r *requestGenerator) fillRequest(req *http.Request, values map[string]inte
 
 	// Check if the user requested a request body
 	if r.request.Body != "" {
-		var body string
-		body, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(r.request.Body, r.interactshURLs)
+		body := r.request.Body
+		if r.options.Interactsh != nil {
+			body, r.interactshURLs = r.options.Interactsh.ReplaceMarkers(r.request.Body, r.interactshURLs)
+		}
 		body, err := expressions.Evaluate(body, values)
 		if err != nil {
 			return nil, errors.Wrap(err, "could not evaluate helper expressions")

v2/pkg/protocols/network/request.go

@@ -140,7 +140,6 @@ func (request *Request) executeRequestWithPayloads(actualAddress, address, input
 		case "hex":
 			data, err = hex.DecodeString(input.Data)
 		default:
-			input.Data, interactshURLs = request.options.Interactsh.ReplaceMarkers(input.Data, []string{})
 			data = []byte(input.Data)
 		}
 		if err != nil {
@@ -150,6 +149,12 @@ func (request *Request) executeRequestWithPayloads(actualAddress, address, input
 		}
 		reqBuilder.Grow(len(input.Data))
 
+		if request.options.Interactsh != nil {
+			var transformedData string
+			transformedData, interactshURLs = request.options.Interactsh.ReplaceMarkers(string(data), []string{})
+			data = []byte(transformedData)
+		}
+
 		finalData, dataErr := expressions.EvaluateByte(data, payloads)
 		if dataErr != nil {
 			request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), dataErr)

v2/pkg/protocols/offlinehttp/operators_test.go

@@ -154,6 +154,7 @@ func TestHTTPOperatorExtract(t *testing.T) {
 		extractor := &extractors.Extractor{
 			Type: "kval",
 			KVal: []string{"test-header"},
+			Part: "header",
 		}
 		err = extractor.CompileExtractors()
 		require.Nil(t, err, "could not compile kval extractor")