From 6d3b2b354bcb7fcb0a435e8c208cacd1de5d14c5 Mon Sep 17 00:00:00 2001
From: bui <thibault@crowdsec.net>
Date: Mon, 29 May 2023 14:03:10 +0200
Subject: [PATCH] up

---
 go.mod                             |  3 ++-
 pkg/acquisition/modules/waf/waf.go | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 8a1e0a570..af91a29c5 100644
--- a/go.mod
+++ b/go.mod
@@ -203,4 +203,5 @@ require (
 
 replace golang.org/x/time/rate => github.com/crowdsecurity/crowdsec/pkg/time/rate v0.0.0
 
-replace github.com/corazawaf/coraza/v3 => github.com/buixor/coraza/v3 v3.0.1-0.20230504085753-fc713bf319a7
+replace github.com/corazawaf/coraza/v3 => ../buixor-coraza
+
diff --git a/pkg/acquisition/modules/waf/waf.go b/pkg/acquisition/modules/waf/waf.go
index f3fe77dfc..f743767af 100644
--- a/pkg/acquisition/modules/waf/waf.go
+++ b/pkg/acquisition/modules/waf/waf.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/corazawaf/coraza/v3"
+	"github.com/corazawaf/coraza/v3/experimental"
 	corazatypes "github.com/corazawaf/coraza/v3/types"
 	"github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration"
 	"github.com/crowdsecurity/crowdsec/pkg/types"
@@ -198,6 +199,7 @@ func processReqWithEngine(waf coraza.WAF, r *http.Request) (*corazatypes.Interru
 	tx := waf.NewTransaction()
 
 	if tx.IsRuleEngineOff() {
+		log.Printf("engine is off")
 		return nil, nil
 	}
 
@@ -207,8 +209,12 @@ func processReqWithEngine(waf coraza.WAF, r *http.Request) (*corazatypes.Interru
 	}()
 
 	//this method is not exported by coraza, so we have to do it ourselves.
-	//ideally, this would be dealt with by expr code, and we provide helpers to manipulate the transaction object?
-	tx.RemoveRuleByID(1)
+	//ideally, this would be dealt with by expr code, and we provide helpers to manipulate the transaction object?\
+	var txx experimental.FullTransaction
+
+	//txx := experimental.ToFullInterface(tx)
+	txx = tx.(experimental.FullTransaction)
+	txx.RemoveRuleByID(1)
 
 	tx.ProcessConnection(r.RemoteAddr, 0, "", 0)
 
@@ -232,6 +238,7 @@ func processReqWithEngine(waf coraza.WAF, r *http.Request) (*corazatypes.Interru
 
 	in := tx.ProcessRequestHeaders()
 	if in != nil {
+		log.Printf("headerss")
 		return in, nil
 	}
 
@@ -254,14 +261,18 @@ func processReqWithEngine(waf coraza.WAF, r *http.Request) (*corazatypes.Interru
 
 			}
 			if in != nil {
+				log.Printf("nothing here")
 				return in, nil
 			}
 		}
 	}
+	log.Printf("done")
+
 	return nil, nil
 }
 
 func (w *WafSource) wafHandler(rw http.ResponseWriter, r *http.Request) {
+	log.Printf("yolo here  %v", r)
 	//inband first
 	in, err := processReqWithEngine(w.inBandWaf, r)
 	if err != nil { //things went south