httptransport: Refactor Matcher handler to align with Indexer

contrib/openshift/grafana/dashboards/dashboard-clair.configmap.yaml

@@ -34,7 +34,7 @@ data:
       "editable": true,
       "gnetId": null,
       "graphTooltip": 1,
-      "iteration": 1645816279286,
+      "iteration": 1646408105440,
       "links": [],
       "panels": [
         {
@@ -2095,7 +2095,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum by (code) (rate(clair_http_matcher_api_v1_vulnerability_report_request_total[$rate]))",
+              "expr": "sum by (code) (rate(clair_http_matcherv1_request_total{handler=\"/matcher/api/v1/vulnerability_report/\"}[$rate]))",
               "instant": false,
               "interval": "",
               "legendFormat": "Status {{ code }} ",
@@ -2138,7 +2138,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(clair_http_matcher_api_v1_vulnerability_report_request_duration_seconds_bucket [5m])) by (le)",
+              "expr": "sum(rate(clair_http_matcherv1_request_duration_seconds_bucket{handler=\"/matcher/api/v1/vulnerability_report/\"}[5m])) by (le)",
               "format": "heatmap",
               "instant": false,
               "interval": "",
@@ -3316,7 +3316,7 @@ data:
         ]
       },
       "time": {
-        "from": "now-6h",
+        "from": "now-1h",
         "to": "now"
       },
       "timepicker": {},

httptransport/matcher_v1.go

@@ -0,0 +1,312 @@
+package httptransport
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptrace"
+	"path"
+	"path/filepath"
+	"strconv"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/ldelossa/responserecorder"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/quay/claircore"
+	"github.com/quay/claircore/libvuln/driver"
+	"github.com/quay/zlog"
+	oteltrace "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+
+	"github.com/quay/clair/v4/indexer"
+	"github.com/quay/clair/v4/internal/codec"
+	"github.com/quay/clair/v4/matcher"
+)
+
+// NewMatcherV1 returns an http.Handler serving the Matcher V1 API rooted at
+// "prefix".
+func NewMatcherV1(_ context.Context, prefix string, srv matcher.Service, indexerSrv indexer.Service, cacheAge time.Duration, topt otelhttp.Option) *MatcherV1 {
+	prefix = path.Join("/", prefix) // Ensure the prefix is rooted and cleaned.
+	m := http.NewServeMux()
+	h := MatcherV1{
+		inner: otelhttp.NewHandler(
+			m,
+			"matcherv1",
+			otelhttp.WithMessageEvents(otelhttp.ReadEvents, otelhttp.WriteEvents),
+			topt,
+		),
+		srv:        srv,
+		indexerSrv: indexerSrv,
+		Cache:      cacheAge,
+	}
+	p := path.Join(prefix, "vulnerability_report") + "/"
+	m.Handle(p, matcherv1wrapper.wrapFunc(p, h.vulnerabilityReport))
+	p = path.Join(prefix, "internal", "update_operation")
+	m.Handle(p, matcherv1wrapper.wrapFunc(p, h.updateOperationHandlerGet))
+	p = path.Join(prefix, "internal", "update_operation") + "/"
+	m.Handle(p, matcherv1wrapper.wrapFunc(p, h.updateOperationHandlerDelete))
+	p = path.Join(prefix, "internal", "update_diff")
+	m.Handle(p, matcherv1wrapper.wrapFunc(p, h.updateDiffHandler))
+
+	return &h
+}
+
+// MatcherV1 is a consolidated Matcher endpoint.
+type MatcherV1 struct {
+	inner      http.Handler
+	srv        matcher.Service
+	indexerSrv indexer.Service
+	Cache      time.Duration
+}
+
+var _ http.Handler = (*MatcherV1)(nil)
+
+// ServeHTTP implements http.Handler.
+func (h *MatcherV1) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	start := time.Now()
+	wr := responserecorder.NewResponseRecorder(w)
+	defer func() {
+		if f, ok := wr.(http.Flusher); ok {
+			f.Flush()
+		}
+		zlog.Info(r.Context()).
+			Str("remote_addr", r.RemoteAddr).
+			Str("method", r.Method).
+			Str("request_uri", r.RequestURI).
+			Int("status", wr.StatusCode()).
+			Dur("duration", time.Since(start)).
+			Msg("handled HTTP request")
+	}()
+	h.inner.ServeHTTP(wr, r)
+}
+
+func (h *MatcherV1) vulnerabilityReport(w http.ResponseWriter, r *http.Request) {
+	ctx := zlog.ContextWithValues(r.Context(),
+		"component", "httptransport/MatcherV1.vulnerabilityReport")
+
+	if r.Method != http.MethodGet {
+		apiError(w, http.StatusMethodNotAllowed, "endpoint only allows GET")
+		return
+	}
+	ctx, done := context.WithCancel(ctx)
+	defer done()
+	ctx = httptrace.WithClientTrace(ctx, oteltrace.NewClientTrace(ctx))
+
+	manifestStr := path.Base(r.URL.Path)
+	if manifestStr == "" {
+		apiError(w, http.StatusBadRequest, "malformed path. provide a single manifest hash")
+		return
+	}
+	manifest, err := claircore.ParseDigest(manifestStr)
+	if err != nil {
+		apiError(w, http.StatusBadRequest, "malformed path: %v", err)
+		return
+	}
+
+	initd, err := h.srv.Initialized(ctx)
+	if err != nil {
+		apiError(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	if !initd {
+		w.WriteHeader(http.StatusAccepted)
+		return
+	}
+
+	indexReport, ok, err := h.indexerSrv.IndexReport(ctx, manifest)
+	// check err first
+	if err != nil {
+		apiError(w, http.StatusInternalServerError, "experienced a server side error: %v", err)
+		return
+	}
+	// now check bool only after confirming no err
+	if !ok {
+		apiError(w, http.StatusNotFound, "index report for manifest %q not found", manifest.String())
+		return
+	}
+
+	vulnReport, err := h.srv.Scan(ctx, indexReport)
+	if err != nil {
+		apiError(w, http.StatusInternalServerError, "failed to start scan: %v", err)
+		return
+	}
+
+	w.Header().Set("content-type", "application/json")
+	setCacheControl(w, h.Cache)
+
+	defer writerError(w, &err)()
+	enc := codec.GetEncoder(w)
+	defer codec.PutEncoder(enc)
+	err = enc.Encode(vulnReport)
+}
+
+func (h *MatcherV1) updateDiffHandler(w http.ResponseWriter, r *http.Request) {
+	ctx := zlog.ContextWithValues(r.Context(),
+		"component", "httptransport/MatcherV1.updateDiffHandler")
+
+	if r.Method != http.MethodGet {
+		apiError(w, http.StatusMethodNotAllowed, "endpoint only allows GET")
+		return
+	}
+	// prev param is optional.
+	var prev uuid.UUID
+	var err error
+	if param := r.URL.Query().Get("prev"); param != "" {
+		prev, err = uuid.Parse(param)
+		if err != nil {
+			apiError(w, http.StatusBadRequest, "could not parse \"prev\" query param into uuid")
+			return
+		}
+	}
+
+	// cur param is required
+	var cur uuid.UUID
+	var param string
+	if param = r.URL.Query().Get("cur"); param == "" {
+		apiError(w, http.StatusBadRequest, "\"cur\" query param is required")
+		return
+	}
+	if cur, err = uuid.Parse(param); err != nil {
+		apiError(w, http.StatusBadRequest, "could not parse \"cur\" query param into uuid")
+		return
+	}
+
+	diff, err := h.srv.UpdateDiff(ctx, prev, cur)
+	if err != nil {
+		apiError(w, http.StatusInternalServerError, "could not get update operations: %v", err)
+		return
+	}
+
+	defer writerError(w, &err)()
+	enc := codec.GetEncoder(w)
+	defer codec.PutEncoder(enc)
+	err = enc.Encode(&diff)
+}
+
+func (h *MatcherV1) updateOperationHandlerGet(w http.ResponseWriter, r *http.Request) {
+	ctx := zlog.ContextWithValues(r.Context(),
+		"component", "httptransport/MatcherV1.updateOperationHandlerGet")
+
+	switch r.Method {
+	case http.MethodGet:
+	default:
+		apiError(w, http.StatusMethodNotAllowed, "method disallowed: %s", r.Method)
+		return
+	}
+
+	kind := driver.VulnerabilityKind
+	switch k := r.URL.Query().Get("kind"); k {
+	case "enrichment":
+		kind = driver.EnrichmentKind
+	case "", "vulnerability":
+		// Leave as default
+	default:
+		apiError(w, http.StatusBadRequest, "unknown kind: %q", k)
+		return
+	}
+
+	// handle conditional request. this is an optimization
+	if ref, err := h.srv.LatestUpdateOperation(ctx, kind); err == nil {
+		validator := `"` + ref.String() + `"`
+		if unmodified(r, validator) {
+			w.WriteHeader(http.StatusNotModified)
+			return
+		}
+		w.Header().Set("etag", validator)
+	}
+
+	latest := r.URL.Query().Get("latest")
+
+	var uos map[string][]driver.UpdateOperation
+	var err error
+	if b, _ := strconv.ParseBool(latest); b {
+		uos, err = h.srv.LatestUpdateOperations(ctx, kind)
+	} else {
+		uos, err = h.srv.UpdateOperations(ctx, kind)
+	}
+	if err != nil {
+		apiError(w, http.StatusInternalServerError, "could not get update operations: %v", err)
+		return
+	}
+
+	defer writerError(w, &err)()
+	enc := codec.GetEncoder(w)
+	defer codec.PutEncoder(enc)
+	err = enc.Encode(&uos)
+}
+
+func (h *MatcherV1) updateOperationHandlerDelete(w http.ResponseWriter, r *http.Request) {
+	ctx := zlog.ContextWithValues(r.Context(),
+		"component", "httptransport/MatcherV1.updateOperationHandlerDelete")
+	switch r.Method {
+	case http.MethodDelete:
+	default:
+		apiError(w, http.StatusMethodNotAllowed, "method disallowed: %s", r.Method)
+		return
+	}
+
+	path := r.URL.Path
+	id := filepath.Base(path)
+	uuid, err := uuid.Parse(id)
+	if err != nil {
+		zlog.Warn(ctx).Err(err).Msg("could not deserialize manifest")
+		apiError(w, http.StatusBadRequest, "could not deserialize manifest: %v", err)
+		return
+	}
+
+	_, err = h.srv.DeleteUpdateOperations(ctx, uuid)
+	if err != nil {
+		apiError(w, http.StatusInternalServerError, "could not get update operations: %v", err)
+		return
+	}
+}
+
+func init() {
+	matcherv1wrapper.init()
+}
+
+var matcherv1wrapper = &wrapper{
+	RequestCount: prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Namespace: metricNamespace,
+			Subsystem: metricSubsystem,
+			Name:      "matcherv1_request_total",
+			Help:      "A total count of http requests for the given path",
+		},
+		[]string{"handler", "code", "method"},
+	),
+	RequestSize: prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: metricNamespace,
+			Subsystem: metricSubsystem,
+			Name:      "matcherv1_request_size_bytes",
+			Help:      "Distribution of request sizes for the given path",
+		},
+		[]string{"handler", "code", "method"},
+	),
+	ResponseSize: prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: metricNamespace,
+			Subsystem: metricSubsystem,
+			Name:      "matcherv1_response_size_bytes",
+			Help:      "Distribution of response sizes for the given path",
+		}, []string{"handler", "code", "method"},
+	),
+	RequestDuration: prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: metricNamespace,
+			Subsystem: metricSubsystem,
+			Name:      "matcherv1_request_duration_seconds",
+			Help:      "Distribution of request durations for the given path",
+		}, []string{"handler", "code", "method"},
+	),
+	InFlight: prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Namespace: metricNamespace,
+			Subsystem: metricSubsystem,
+			Name:      "matcherv1_in_flight_requests",
+			Help:      "Gauge of requests in flight",
+		},
+		[]string{"handler"},
+	),
+}