Cleanup X-Sigsci-* header generation.

Author: brectanus-sigsci

module.go

@@ -240,15 +240,25 @@ func (m *Module) inspectorPreRequest(req *http.Request) (inspin2 RPCMsgIn2, out
 		return
 	}
 
-	// set any request headers
 	if out.RequestID != "" {
-		req.Header.Add("X-Sigsci-Requestid", out.RequestID)
+		req.Header.Set("X-Sigsci-Requestid", out.RequestID)
+	} else {
+		req.Header.Del("X-Sigsci-Requestid")
 	}
 
 	wafresponse := out.WAFResponse
-	req.Header.Add("X-Sigsci-Agentresponse", strconv.Itoa(int(wafresponse)))
+	req.Header.Set("X-Sigsci-Agentresponse", strconv.Itoa(int(wafresponse)))
+
+	// Add request headers from the WAF response to the request
+	req.Header.Del("X-Sigsci-Tags")
+	req.Header.Del("X-Sigsci-Redirect")
 	for _, kv := range out.RequestHeaders {
-		req.Header.Add(kv[0], kv[1])
+		// For X-Sigsci-* headers, use Set to override, but for custom headers, use Add to append
+		if strings.HasPrefix(http.CanonicalHeaderKey(kv[0]), "X-Sigsci-") {
+			req.Header.Set(kv[0], kv[1])
+		} else {
+			req.Header.Add(kv[0], kv[1])
+		}
 	}
 
 	inspin2 = RPCMsgIn2{