chore: wip suggestion for interceptions

Author: dotkas

cliv2/internal/proxy/interceptor/interceptor.go

@@ -0,0 +1,17 @@
+package interceptor
+
+import (
+	"github.com/elazarl/goproxy"
+	"net/http"
+)
+
+type Interceptor interface {
+	GetCondition() (goproxy.ReqCondition, error)
+	GetHandler() func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response)
+}
+
+func GetRegisteredInterceptors() []Interceptor {
+	return []Interceptor{
+		NewV1AnalyticsInterceptor(),
+	}
+}

cliv2/internal/proxy/interceptor/v1_analytics.go

@@ -0,0 +1,47 @@
+package interceptor
+
+import (
+	"compress/gzip"
+	"fmt"
+	"github.com/elazarl/goproxy"
+	"io"
+	"net/http"
+	"os"
+	"regexp"
+)
+
+// v1AnalyticsInterceptor looks for requests to the (now deprecated) v1 analytics endpoint, and re-directs these
+// requests to the v2 analytics service. This is a temporary measure to allow users to migrate to the new service.
+type v1AnalyticsInterceptor struct {
+	requestCondition goproxy.ReqCondition
+	handler          func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response)
+}
+
+func v1AnalyticsHandlerFunc(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+	reader, err := gzip.NewReader(req.Body)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "gzip.NewReader: %v\n", err)
+	}
+	defer reader.Close()
+	bodyBytes, bodyErr := io.ReadAll(reader)
+	fmt.Println(string(bodyBytes), bodyErr)
+
+	return req, nil
+}
+
+func (v v1AnalyticsInterceptor) GetCondition() (goproxy.ReqCondition, error) {
+	if v.requestCondition == nil {
+		return nil, fmt.Errorf("request condition is not set")
+	}
+
+	return v.requestCondition, nil
+}
+
+func (v v1AnalyticsInterceptor) GetHandler() func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+	return v.handler
+}
+
+func NewV1AnalyticsInterceptor() Interceptor {
+	i := v1AnalyticsInterceptor{goproxy.UrlMatches(regexp.MustCompile("^*/v1/analytics/cli")), v1AnalyticsHandlerFunc}
+	return i
+}

cliv2/internal/proxy/proxy.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
+	"github.com/snyk/cli/cliv2/internal/proxy/interceptor"
 	"github.com/snyk/go-application-framework/pkg/configuration"
 	"github.com/snyk/go-application-framework/pkg/networking"
 	"github.com/snyk/go-application-framework/pkg/networking/certs"
@@ -243,6 +244,15 @@ func (p *WrapperProxy) Start() error {
 	// zerolog based logger also works but it will print empty lines between logs
 	proxy.Logger = log.New(&pkg_utils.ToZeroLogDebug{Logger: p.DebugLogger}, "", 0)
 	proxy.OnRequest().DoFunc(p.replaceVersionHandler)
+
+	for _, i := range interceptor.GetRegisteredInterceptors() {
+		condition, err := i.GetCondition()
+		if err != nil {
+			return err
+		}
+		proxy.OnRequest(condition).DoFunc(i.GetHandler())
+	}
+
 	proxy.OnRequest().HandleConnect(p)
 	proxy.OnResponse().DoFunc(p.handleResponse)
 	proxy.Verbose = true