echo: add basic http/3 support

6 files changed, 158 insertions, 21 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index 916cbd0..98a8ee6 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -18,6 +18,7 @@ import (
         "github.com/labstack/echo/v4"
         "github.com/labstack/echo/v4/middleware"
         "github.com/labstack/gommon/log"
+        "github.com/quic-go/quic-go/http3"
 )
 
 // Docs: https://echo.labstack.com/guide/
@@ -235,22 +236,16 @@ func (w *EchoWrapper) configureCombinedLogging(c *EchoConfig) error {
         return nil
 }
 
-func (w *EchoWrapper) makeServerJob(s *http.Server, echoInit bool) service.RunnerFunc {
+func (w *EchoWrapper) makeServerJob(s webServer) service.RunnerFunc {
         return func(ctx context.Context, wg *sync.WaitGroup) error {
                 wg.Add(1)
                 defer wg.Done()
 
-                w.Logger.Infof("Starting server with address: %s", s.Addr)
+                s.LogStart(w.Logger)
 
                 err := make(chan error)
                 go func() {
-                        if s.TLSConfig == nil && echoInit {
-                                err <- w.Echo.StartServer(s)
-                        } else if s.TLSConfig == nil && !echoInit {
-                                err <- s.ListenAndServe()
-                        } else {
-                                err <- s.ListenAndServeTLS("", "")
-                        }
+                        err <- s.ListenAndServe()
                 }()
                 select {
                 case e := <-err:
@@ -267,12 +262,13 @@ func (w *EchoWrapper) makeServerJob(s *http.Server, echoInit bool) service.Runne
 }
 
 func (w *EchoWrapper) buildServers(c *EchoConfig, bindings *AddressPortConfig) {
-        for i, a := range bindings.HttpBindings() {
+        for _, a := range bindings.HttpBindings() {
                 s := &http.Server{
-                        Addr:    a,
-                        Handler: w,
+                        Addr:     a,
+                        Handler:  w,
+                        ErrorLog: w.StdLogger,
                 }
-                w.runner.AddJob(w.makeServerJob(s, i == 0))
+                w.runner.AddJob(w.makeServerJob(&netHttpWrapper{s}))
         }
 
         for _, a := range bindings.TlsBindings() {
@@ -281,11 +277,25 @@ func (w *EchoWrapper) buildServers(c *EchoConfig, bindings *AddressPortConfig) {
                         TLSConfig: &tls.Config{
                                 MinVersion:     tls.VersionTLS12,
                                 GetCertificate: c.Autocert.GetCertificate,
-                                NextProtos:     []string{"h2", "http/1.1"}, // enable HTTP/2
+                                NextProtos:     []string{"h3", "h2", "http/1.1"},
                         },
+                        Handler:  w,
+                        ErrorLog: w.StdLogger,
+                }
+                w.runner.AddJob(w.makeServerJob(&netHttpWrapper{s}))
+        }
+
+        for _, a := range bindings.QuicBindings() {
+                q := &http3.Server{
+                        Addr: a,
+                        TLSConfig: http3.ConfigureTLSConfig(&tls.Config{
+                                MinVersion:     tls.VersionTLS13,
+                                GetCertificate: c.Autocert.GetCertificate,
+                        }),
                         Handler: w,
                 }
-                w.runner.AddJob(w.makeServerJob(s, false))
+                w.runner.AddJob(w.makeServerJob(&http3Wrapper{q}))
+                w.Use(glmw.Http3AltSvcMiddleware(bindings.QuicPort))
         }
 }
 
diff --git a/echo/go.mod b/echo/go.mod
index 50a44a8..578e9fc 100644
--- a/echo/go.mod
+++ b/echo/go.mod
@@ -11,6 +11,7 @@ require (
         github.com/labstack/echo/v4 v4.6.1
         github.com/labstack/gommon v0.3.1
         github.com/prometheus/client_golang v1.11.0
+        github.com/quic-go/quic-go v0.39.0
         github.com/stretchr/testify v1.8.1
         gopkg.in/square/go-jose.v2 v2.5.1
 )
@@ -23,9 +24,11 @@ require (
         github.com/cespare/xxhash/v2 v2.1.1 // indirect
         github.com/davecgh/go-spew v1.1.1 // indirect
         github.com/fatih/color v1.7.0 // indirect
+        github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
         github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-        github.com/golang/protobuf v1.5.2 // indirect
+        github.com/golang/protobuf v1.5.3 // indirect
         github.com/golang/snappy v0.0.4 // indirect
+        github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
         github.com/hashicorp/errwrap v1.1.0 // indirect
         github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
         github.com/hashicorp/go-hclog v0.16.2 // indirect
@@ -55,22 +58,29 @@ require (
         github.com/mitchellh/mapstructure v1.5.0 // indirect
         github.com/mitchellh/reflectwalk v1.0.0 // indirect
         github.com/oklog/run v1.0.0 // indirect
+        github.com/onsi/ginkgo/v2 v2.9.5 // indirect
         github.com/pierrec/lz4 v2.5.2+incompatible // indirect
         github.com/pmezard/go-difflib v1.0.0 // indirect
         github.com/prometheus/client_model v0.2.0 // indirect
         github.com/prometheus/common v0.32.1 // indirect
         github.com/prometheus/procfs v0.6.0 // indirect
+        github.com/quic-go/qpack v0.4.0 // indirect
+        github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
         github.com/ryanuber/go-glob v1.0.0 // indirect
         github.com/valyala/bytebufferpool v1.0.0 // indirect
         github.com/valyala/fasttemplate v1.2.1 // indirect
         go.uber.org/atomic v1.9.0 // indirect
+        go.uber.org/mock v0.3.0 // indirect
         golang.org/x/crypto v0.11.0 // indirect
+        golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
+        golang.org/x/mod v0.11.0 // indirect
         golang.org/x/net v0.10.0 // indirect
         golang.org/x/sys v0.10.0 // indirect
         golang.org/x/text v0.11.0 // indirect
         golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
+        golang.org/x/tools v0.9.1 // indirect
         google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
         google.golang.org/grpc v1.41.0 // indirect
-        google.golang.org/protobuf v1.26.0 // indirect
+        google.golang.org/protobuf v1.28.0 // indirect
         gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/echo/go.sum b/echo/go.sum
index 29682fa..a2d908f 100644
--- a/echo/go.sum
+++ b/echo/go.sum
@@ -104,7 +104,10 @@ github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9p
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -136,8 +139,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -150,8 +154,8 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -162,6 +166,8 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -225,6 +231,7 @@ github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
 github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
@@ -292,6 +299,9 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
@@ -325,6 +335,12 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg=
+github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.39.0 h1:AgP40iThFMY0bj8jGxROhw3S0FMGa8ryqsmi9tBH3So=
+github.com/quic-go/quic-go v0.39.0/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -342,6 +358,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -364,6 +381,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
+go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -384,6 +403,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -404,6 +425,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -556,10 +579,11 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -643,8 +667,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/echo/internal_wrappers.go b/echo/internal_wrappers.go
new file mode 100644
index 0000000..557df02
--- /dev/null
+++ b/echo/internal_wrappers.go
@@ -0,0 +1,65 @@
+package echo
+
+import (
+        "context"
+        "net/http"
+        "time"
+
+        "code.crute.us/mcrute/golib/log"
+
+        "github.com/quic-go/quic-go/http3"
+)
+
+// webServer is an interface to hide the difference between an http 1/2
+// server and an http3 server.
+type webServer interface {
+        LogStart(log.LeveledLogger)
+        ListenAndServe() error
+        Shutdown(context.Context) error
+}
+
+type netHttpWrapper struct {
+        *http.Server
+}
+
+var _ webServer = (*netHttpWrapper)(nil)
+
+func (w *netHttpWrapper) LogStart(l log.LeveledLogger) {
+        kind := "https"
+        if w.TLSConfig == nil {
+                kind = "http"
+        }
+
+        l.Infof("Starting %s server with address: %s", kind, w.Addr)
+}
+
+func (w *netHttpWrapper) ListenAndServe() error {
+        if w.TLSConfig != nil {
+                return w.Server.ListenAndServeTLS("", "")
+        } else {
+                return w.Server.ListenAndServe()
+        }
+}
+
+type http3Wrapper struct {
+        *http3.Server
+}
+
+var _ webServer = (*http3Wrapper)(nil)
+
+func (w *http3Wrapper) LogStart(l log.LeveledLogger) {
+        l.Infof("Starting http3 server with address: %s", w.Addr)
+}
+
+func (w *http3Wrapper) ListenAndServe() error {
+        return w.Serve(nil)
+}
+
+func (w *http3Wrapper) Shutdown(ctx context.Context) error {
+        dl, ok := ctx.Deadline()
+        if ok {
+                return w.CloseGracefully(time.Until(dl))
+        } else {
+                return w.CloseGracefully(1 * time.Minute)
+        }
+}
diff --git a/echo/middleware/alt_svc.go b/echo/middleware/alt_svc.go
new file mode 100644
index 0000000..27ab5ce
--- /dev/null
+++ b/echo/middleware/alt_svc.go
@@ -0,0 +1,17 @@
+package middleware
+
+import (
+        "fmt"
+
+        "github.com/labstack/echo/v4"
+)
+
+func Http3AltSvcMiddleware(port int) echo.MiddlewareFunc {
+        h3Svc := fmt.Sprintf(`h3=":%d"`, port)
+        return func(next echo.HandlerFunc) echo.HandlerFunc {
+                return func(c echo.Context) error {
+                        c.Response().Header().Add("Alt-Svc", h3Svc)
+                        return next(c)
+                }
+        }
+}
diff --git a/echo/ports.go b/echo/ports.go
index bdd97fe..542446e 100644
--- a/echo/ports.go
+++ b/echo/ports.go
@@ -9,9 +9,18 @@ import (
 type AddressPortConfig struct {
         HttpPort  int
         TlsPort   int
+        QuicPort  int
         Addresses []string
 }
 
+func (c *AddressPortConfig) QuicBindings() []string {
+        o := make([]string, len(c.Addresses))
+        for i, a := range c.Addresses {
+                o[i] = net.JoinHostPort(a, strconv.Itoa(c.QuicPort))
+        }
+        return o
+}
+
 func (c *AddressPortConfig) TlsBindings() []string {
         o := make([]string, len(c.Addresses))
         for i, a := range c.Addresses {
@@ -60,6 +69,7 @@ func ParseAddressPortBindings(b []string) (*AddressPortConfig, error) {
         }
 
         o.TlsPort = o.HttpPort + 1
+        o.QuicPort = o.TlsPort
 
         return o, nil
 }