Merge pull request #368 from MateSaary/OSD-27752

Add request unwrapping to interceptor

Author: openshift-merge-bot[bot]

interceptor/pkg/interceptor/pdinterceptor.go

@@ -90,15 +90,38 @@ func (pdi *PagerDutyInterceptor) executeInterceptor(r *http.Request) ([]byte, er
 	}
 	r.Body = io.NopCloser(bytes.NewReader(body.Bytes()))
 
+	// originalReq is the original request that was sent to the interceptor,
+	// due to be unwrapped into a new header and body for signature verification.
+	var originalReq struct {
+		Body   string              `json:"body"`
+		Header map[string][]string `json:"header"`
+	}
+	if err := json.Unmarshal(body.Bytes(), &originalReq); err != nil {
+		return nil, badRequest(fmt.Errorf("failed to parse request body: %w", err))
+	}
+
+	extractedRequest, err := http.NewRequestWithContext(ctx, r.Method, r.URL.String(), bytes.NewReader([]byte(originalReq.Body)))
+	if err != nil {
+		return nil, internal(fmt.Errorf("malformed body/header in unwrapped request: %w", err))
+	}
+
+	for k, v := range originalReq.Header {
+		for _, v := range v {
+			extractedRequest.Header.Add(k, v)
+		}
+	}
+
 	var ireq triggersv1.InterceptorRequest
 
 	// logging request
-	pdi.Logger.Info("Request header: %v", r.Header)
-	pdi.Logger.Info("Request body: ", body.String())
+	pdi.Logger.Info("Wrapped Request header: %v", r.Header)
+	pdi.Logger.Info("Wrapped Request body: ", body.String())
+	pdi.Logger.Info("Unwrapped Request header: %v", extractedRequest.Header)
+	pdi.Logger.Info("Unwrapped Request body: ", originalReq.Body)
 
 	token, _ := os.LookupEnv("PD_SIGNATURE")
 
-	err := webhookv3.VerifySignature(r, token)
+	err = webhookv3.VerifySignature(extractedRequest, token)
 	if err != nil {
 		return nil, badRequest(fmt.Errorf("failed to verify signature: %w", err))
 	}