feat(pb/relayd): add fingerprints object

Release-Status: cut
Signed-off-by: Xe Iaso <[email protected]>

Author: Xe

cmd/relayd/main.go

@@ -169,6 +169,10 @@ func main() {
 		t0 := time.Now()
 
 		var foundJa3N, foundJa4 string
+		foundJa4H := ja4h.JA4H(r)
+		fingerprints := map[string]string{
+			"ja4h": foundJa4H,
+		}
 
 		host, _, _ := net.SplitHostPort(r.RemoteAddr)
 		if host != "" {
@@ -187,27 +191,31 @@ func main() {
 
 		if tcpFP := GetTCPFingerprint(r); tcpFP != nil {
 			r.Header.Set("X-JA4T-Fingerprint", tcpFP.String())
+			fingerprints["ja4t"] = tcpFP.String()
 		}
 
 		reqID := uuid.Must(uuid.NewV7()).String()
-		rl := relayd.RequestLogFromRequest(r, host, reqID, foundJa4)
 
 		r.Header.Set("X-Forwarded-Host", r.Host)
 		r.Header.Set("X-Forwarded-Proto", "https")
 		r.Header.Set("X-Forwarded-Scheme", "https")
 		r.Header.Set("X-Request-Id", reqID)
 		r.Header.Set("X-Scheme", "https")
 		r.Header.Set("X-HTTP-Protocol", r.Proto)
-		r.Header.Set("X-JA4H-Fingerprint", ja4h.JA4H(r))
+		r.Header.Set("X-JA4H-Fingerprint", foundJa4H)
 
 		if foundJa3N != "" {
 			r.Header.Set("X-JA3N-Fingerprint", foundJa3N)
+			fingerprints["ja3n"] = foundJa3N
 		}
 
 		if foundJa4 != "" {
 			r.Header.Set("X-JA4-Fingerprint", foundJa4)
+			fingerprints["ja4"] = foundJa4
 		}
 
+		rl := relayd.RequestLogFromRequest(r, host, reqID, fingerprints)
+
 		headers, _ := json.Marshal(r.Header)
 
 		if ja4 := foundJa4; db != nil && ja4 != "" {

gen/within/website/x/relayd/v1/relayd.pb.go

@@ -7,17 +7,19 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-func RequestLogFromRequest(r *http.Request, ipAddress, requestID, ja4 string) *RequestLog {
+func RequestLogFromRequest(r *http.Request, ipAddress, requestID string, fingerprints map[string]string) *RequestLog {
 	result := &RequestLog{
-		RequestDate: timestamppb.Now(),
-		Host:        r.Host,
-		Method:      r.Method,
-		Path:        r.URL.Path,
-		Query:       map[string]string{},
-		Headers:     map[string]string{},
-		RemoteIp:    ipAddress,
-		Ja4:         ja4,
-		RequestId:   requestID,
+		RequestDate:  timestamppb.Now(),
+		Host:         r.Host,
+		Method:       r.Method,
+		Path:         r.URL.Path,
+		Query:        map[string]string{},
+		Headers:      map[string]string{},
+		RemoteIp:     ipAddress,
+		Ja3N:         fingerprints["ja3n"],
+		Ja4:          fingerprints["ja4"],
+		RequestId:    requestID,
+		Fingerprints: fingerprints,
 	}
 
 	for k, v := range r.URL.Query() {
@@ -28,6 +30,8 @@ func RequestLogFromRequest(r *http.Request, ipAddress, requestID, ja4 string) *R
 		switch {
 		case k == "Cookie", k == "Authorization":
 			continue
+		case strings.HasPrefix(k, "X-"):
+			continue
 		}
 		result.Headers[k] = strings.Join(v, ",")
 	}

gen/within/website/x/relayd/v1/requestlog.go

@@ -14,7 +14,8 @@ message RequestLog {
   map<string, string> headers = 7;
   string remote_ip = 8;
   string ja3n = 9 [ deprecated = true ];
-  string ja4 = 10;
+  string ja4 = 10 [ deprecated = true ];
   string request_id = 11;
   int32 status_code = 12;
+  map<string, string> fingerprints = 13;
 }