From 23e944787150da78aee9a882df949cfc4af8b709 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Tue, 27 Feb 2024 18:16:52 -0500 Subject: [PATCH] tsweb: expose function to generate request IDs For use in corp. Updates tailscale/corp#2549 Signed-off-by: Andrew Dunham Change-Id: I71debae1ce9ae48cf69cc44c2ab5c443fc3b2005 --- tsweb/request_id.go | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tsweb/request_id.go b/tsweb/request_id.go index b35e6d9a1..19519f7a5 100644 --- a/tsweb/request_id.go +++ b/tsweb/request_id.go @@ -33,20 +33,27 @@ var RequestIDKey ctxkey.Key[RequestID] // or generate a new one. const RequestIDHeader = "X-Tailscale-Request-Id" +// GenerateRequestID generates a new request ID with the current format. +func GenerateRequestID() RequestID { + // REQ-1 indicates the version of the RequestID pattern. It is + // currently arbitrary but allows for forward compatible + // transitions if needed. + return RequestID("REQ-1" + uuid.NewString()) +} + // SetRequestID is an HTTP middleware that injects a RequestID in the // *http.Request Context. The value of that request id is either retrieved from // the RequestIDHeader or a randomly generated one if not exists. Inner // handlers can retrieve this ID from the RequestIDFromContext function. func SetRequestID(h http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - id := r.Header.Get(RequestIDHeader) - if id == "" { - // REQ-1 indicates the version of the RequestID pattern. It is - // currently arbitrary but allows for forward compatible - // transitions if needed. - id = "REQ-1" + uuid.NewString() + var rid RequestID + if id := r.Header.Get(RequestIDHeader); id != "" { + rid = RequestID(id) + } else { + rid = GenerateRequestID() } - ctx := RequestIDKey.WithValue(r.Context(), RequestID(id)) + ctx := RequestIDKey.WithValue(r.Context(), rid) r = r.WithContext(ctx) h.ServeHTTP(w, r) })