refactor: use maps.Copy for cleaner map handling (#6283)

Signed-off-by: gopherorg <gopherworld@icloud.com>

pkg/input/formats/openapi/examples.go

@@ -2,6 +2,7 @@ package openapi
 
 import (
 	"fmt"
+	"maps"
 	"slices"
 
 	"github.com/getkin/kin-openapi/openapi3"
@@ -162,9 +163,7 @@ func openAPIExample(schema *openapi3.Schema, cache map[*openapi3.Schema]*cachedS
 				return nil, ErrNoExample
 			}
 
-			for k, v := range value {
+			maps.Copy(example, value)
-				example[k] = v
-			}
 		}
 		return example, nil
 	}

pkg/js/gojs/gojs.go

@@ -2,6 +2,7 @@ package gojs
 
 import (
 	"context"
+	"maps"
 	"reflect"
 	"sync"
 
@@ -103,9 +104,7 @@ func wrapModuleFunc(runtime *goja.Runtime, fn interface{}) interface{} {
 }
 
 func (p *GojaModule) Set(objects Objects) Module {
-	for k, v := range objects {
+	maps.Copy(p.sets, objects)
-		p.sets[k] = v
-	}
 	return p
 }
 

pkg/operators/operators.go

@@ -2,6 +2,7 @@ package operators
 
 import (
 	"fmt"
+	"maps"
 	"strconv"
 	"strings"
 
@@ -218,9 +219,7 @@ func (r *Result) Merge(result *Result) {
 			r.DynamicValues[k] = sliceutil.Dedupe(append(r.DynamicValues[k], v...))
 		}
 	}
-	for k, v := range result.PayloadValues {
+	maps.Copy(r.PayloadValues, result.PayloadValues)
-		r.PayloadValues[k] = v
-	}
 }
 
 // MatchFunc performs matching operation for a matcher on model and returns true or false.

pkg/projectfile/httputil.go

@@ -6,6 +6,7 @@ import (
 	"encoding/gob"
 	"encoding/hex"
 	"io"
+	"maps"
 	"net/http"
 )
 
@@ -85,9 +86,7 @@ func toInternalResponse(resp *http.Response, body []byte) *InternalResponse {
 	intResp.HTTPMinor = resp.ProtoMinor
 	intResp.StatusCode = resp.StatusCode
 	intResp.StatusReason = resp.Status
-	for k, v := range resp.Header {
+	maps.Copy(intResp.Headers, resp.Header)
-		intResp.Headers[k] = v
-	}
 	intResp.Body = body
 	return intResp
 }

pkg/protocols/common/generators/generators.go

@@ -4,6 +4,7 @@ package generators
 
 import (
 	"github.com/pkg/errors"
+	"maps"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
@@ -32,9 +33,7 @@ func New(payloads map[string]interface{}, attackType AttackType, templatePath st
 			if err != nil {
 				return nil, errors.Wrap(err, "could not parse payloads with aggression")
 			}
-			for k, v := range values {
+			maps.Copy(payloadsFinal, values)
-				payloadsFinal[k] = v
-			}
 		default:
 			payloadsFinal[payloadName] = v
 		}

pkg/protocols/common/generators/maps.go

@@ -1,6 +1,7 @@
 package generators
 
 import (
+	maps0 "maps"
 	"reflect"
 )
 
@@ -47,9 +48,7 @@ func MergeMapsMany(maps ...interface{}) map[string][]string {
 func MergeMaps(maps ...map[string]interface{}) map[string]interface{} {
 	merged := make(map[string]interface{})
 	for _, m := range maps {
-		for k, v := range m {
+		maps0.Copy(merged, m)
-			merged[k] = v
-		}
 	}
 	return merged
 }

pkg/protocols/dns/request.go

@@ -3,6 +3,7 @@ package dns
 import (
 	"encoding/hex"
 	"fmt"
+	maps0 "maps"
 	"strings"
 	"sync"
 
@@ -181,12 +182,8 @@ func (request *Request) execute(input *contextargs.Context, domain string, metad
 	// expose response variables in proto_var format
 	// this is no-op if the template is not a multi protocol template
 	request.options.AddTemplateVars(input.MetaInput, request.Type(), request.ID, outputEvent)
-	for k, v := range previous {
+	maps0.Copy(outputEvent, previous)
-		outputEvent[k] = v
+	maps0.Copy(outputEvent, vars)
-	}
-	for k, v := range vars {
-		outputEvent[k] = v
-	}
 	// add variables from template context before matching/extraction
 	if request.options.HasTemplateCtx(input.MetaInput) {
 		outputEvent = generators.MergeMaps(outputEvent, request.options.GetTemplateCtx(input.MetaInput).GetAll())

pkg/protocols/file/request.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"path/filepath"
 	"strings"
@@ -276,9 +277,7 @@ func (request *Request) findMatchesWithReader(reader io.Reader, input *contextar
 
 		gologger.Verbose().Msgf("[%s] Processing file %s chunk %s/%s", request.options.TemplateID, filePath, processedBytes, totalBytesString)
 		dslMap := request.responseToDSLMap(lineContent, input.MetaInput.Input, filePath)
-		for k, v := range previous {
+		maps.Copy(dslMap, previous)
-			dslMap[k] = v
-		}
 		// add vars to template context
 		request.options.AddTemplateVars(input.MetaInput, request.Type(), request.ID, dslMap)
 		// add template context variables to DSL map
@@ -347,9 +346,7 @@ func (request *Request) buildEvent(input, filePath string, fileMatches []FileMat
 	exprLines := make(map[string][]int)
 	exprBytes := make(map[string][]int)
 	internalEvent := request.responseToDSLMap("", input, filePath)
-	for k, v := range previous {
+	maps.Copy(internalEvent, previous)
-		internalEvent[k] = v
-	}
 	for _, fileMatch := range fileMatches {
 		exprLines[fileMatch.Expr] = append(exprLines[fileMatch.Expr], fileMatch.Line)
 		exprBytes[fileMatch.Expr] = append(exprBytes[fileMatch.Expr], fileMatch.ByteIndex)

pkg/protocols/http/operators.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"maps"
 	"net/http"
 	"strings"
 	"time"
@@ -108,9 +109,7 @@ func (request *Request) getMatchPart(part string, data output.InternalEvent) (st
 // responseToDSLMap converts an HTTP response to a map for use in DSL matching
 func (request *Request) responseToDSLMap(resp *http.Response, host, matched, rawReq, rawResp, body, headers string, duration time.Duration, extra map[string]interface{}) output.InternalEvent {
 	data := make(output.InternalEvent, 12+len(extra)+len(resp.Header)+len(resp.Cookies()))
-	for k, v := range extra {
+	maps.Copy(data, extra)
-		data[k] = v
-	}
 	for _, cookie := range resp.Cookies() {
 		request.setHashOrDefault(data, strings.ToLower(cookie.Name), cookie.Value)
 	}

pkg/protocols/http/request.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"strconv"
 	"strings"
@@ -974,12 +975,8 @@ func (request *Request) executeRequest(input *contextargs.Context, generatedRequ
 		if request.options.Interactsh != nil {
 			request.options.Interactsh.MakePlaceholders(generatedRequest.interactshURLs, outputEvent)
 		}
-		for k, v := range previousEvent {
+		maps.Copy(finalEvent, previousEvent)
-			finalEvent[k] = v
+		maps.Copy(finalEvent, outputEvent)
-		}
-		for k, v := range outputEvent {
-			finalEvent[k] = v
-		}
 
 		// Add to history the current request number metadata if asked by the user.
 		if request.NeedsRequestCondition() {

pkg/protocols/javascript/js.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"maps"
 	"net"
 	"strings"
 	"sync/atomic"
@@ -304,9 +305,7 @@ func (request *Request) ExecuteWithResults(target *contextargs.Context, dynamicV
 	templateCtx := request.options.GetTemplateCtx(input.MetaInput)
 
 	payloadValues := generators.BuildPayloadFromOptions(request.options.Options)
-	for k, v := range dynamicValues {
+	maps.Copy(payloadValues, dynamicValues)
-		payloadValues[k] = v
-	}
 
 	payloadValues["Hostname"] = hostPort
 	payloadValues["Host"] = hostname
@@ -620,9 +619,7 @@ func (request *Request) generateEventData(input *contextargs.Context, values map
 	}
 
 	data := make(map[string]interface{})
-	for k, v := range values {
+	maps.Copy(data, values)
-		data[k] = v
-	}
 	data["type"] = request.Type().String()
 	data["request-pre-condition"] = beautifyJavascript(request.PreCondition)
 	data["request"] = beautifyJavascript(request.Code)

pkg/protocols/network/request.go

@@ -3,6 +3,7 @@ package network
 import (
 	"encoding/hex"
 	"fmt"
+	maps0 "maps"
 	"net"
 	"net/url"
 	"os"
@@ -375,9 +376,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
 			// Run any internal extractors for the request here and add found values to map.
 			if request.CompiledOperators != nil {
 				values := request.CompiledOperators.ExecuteInternalExtractors(map[string]interface{}{input.Name: bufferStr}, request.Extract)
-				for k, v := range values {
+				maps0.Copy(payloads, values)
-					payloads[k] = v
-				}
 			}
 		}
 	}
@@ -427,15 +426,9 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
 	if request.options.StopAtFirstMatch {
 		outputEvent["stop-at-first-match"] = true
 	}
-	for k, v := range previous {
+	maps0.Copy(outputEvent, previous)
-		outputEvent[k] = v
+	maps0.Copy(outputEvent, interimValues)
-	}
+	maps0.Copy(outputEvent, inputEvents)
-	for k, v := range interimValues {
-		outputEvent[k] = v
-	}
-	for k, v := range inputEvents {
-		outputEvent[k] = v
-	}
 	if request.options.Interactsh != nil {
 		request.options.Interactsh.MakePlaceholders(interactshURLs, outputEvent)
 	}

pkg/protocols/offlinehttp/operators.go

@@ -1,6 +1,7 @@
 package offlinehttp
 
 import (
+	"maps"
 	"net/http"
 	"strings"
 	"time"
@@ -103,9 +104,7 @@ func getMatchPart(part string, data output.InternalEvent) (string, bool) {
 // responseToDSLMap converts an HTTP response to a map for use in DSL matching
 func (request *Request) responseToDSLMap(resp *http.Response, host, matched, rawReq, rawResp, body, headers string, duration time.Duration, extra map[string]interface{}) output.InternalEvent {
 	data := make(output.InternalEvent, 12+len(extra)+len(resp.Header)+len(resp.Cookies()))
-	for k, v := range extra {
+	maps.Copy(data, extra)
-		data[k] = v
-	}
 	for _, cookie := range resp.Cookies() {
 		data[strings.ToLower(cookie.Name)] = cookie.Value
 	}

pkg/protocols/ssl/ssl.go

@@ -2,6 +2,7 @@ package ssl
 
 import (
 	"fmt"
+	"maps"
 	"net"
 	"strings"
 	"time"
@@ -206,9 +207,7 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 
 	requestOptions := request.options
 	payloadValues := generators.BuildPayloadFromOptions(request.options.Options)
-	for k, v := range dynamicValues {
+	maps.Copy(payloadValues, dynamicValues)
-		payloadValues[k] = v
-	}
 
 	payloadValues["Hostname"] = hostPort
 	payloadValues["Host"] = hostname
@@ -271,9 +270,7 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 	jsonDataString := string(jsonData)
 
 	data := make(map[string]interface{})
-	for k, v := range payloadValues {
+	maps.Copy(data, payloadValues)
-		data[k] = v
-	}
 	data["type"] = request.Type().String()
 	data["response"] = jsonDataString
 	data["host"] = input.MetaInput.Input

pkg/protocols/websocket/websocket.go

@@ -4,6 +4,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"io"
+	"maps"
 	"net"
 	"net/http"
 	"net/url"
@@ -274,12 +275,8 @@ func (request *Request) executeRequestWithPayloads(target *contextargs.Context,
 	request.options.AddTemplateVars(target.MetaInput, request.Type(), request.ID, data)
 	data = generators.MergeMaps(data, request.options.GetTemplateCtx(target.MetaInput).GetAll())
 
-	for k, v := range previous {
+	maps.Copy(data, previous)
-		data[k] = v
+	maps.Copy(data, events)
-	}
-	for k, v := range events {
-		data[k] = v
-	}
 
 	event := eventcreator.CreateEventWithAdditionalOptions(request, data, requestOptions.Options.Debug || requestOptions.Options.DebugResponse, func(internalWrappedEvent *output.InternalWrappedEvent) {
 		internalWrappedEvent.OperatorsResult.PayloadValues = payloadValues
@@ -337,9 +334,7 @@ func (request *Request) readWriteInputWebsocket(conn net.Conn, payloadValues map
 			// Run any internal extractors for the request here and add found values to map.
 			if request.CompiledOperators != nil {
 				values := request.CompiledOperators.ExecuteInternalExtractors(map[string]interface{}{req.Name: bufferStr}, protocols.MakeDefaultExtractFunc)
-				for k, v := range values {
+				maps.Copy(inputEvents, values)
-					inputEvents[k] = v
-				}
 			}
 		}
 	}