1 files changed, 33 insertions, 2 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index 895ee6e..ddaab44 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -10,14 +10,27 @@ import (
         "path"
         "sync"
 
+        gltls "code.crute.us/mcrute/golib/crypto/tls"
         glmw "code.crute.us/mcrute/golib/echo/middleware"
-        gltls "code.crute.us/mcrute/golib/tls"
+        "code.crute.us/mcrute/golib/echo/prometheus"
 
         "github.com/labstack/echo/v4"
         "github.com/labstack/echo/v4/middleware"
         "github.com/labstack/gommon/log"
 )
 
+// Docs: https://echo.labstack.com/guide/
+
+// TODO:
+// - Intgrate prometheus
+// - Integrate CORS
+// - Access control prometheus by IP
+// - Fix redirectors to consider port
+// - Fix redirectors to not redirect IP addresses
+// - Integrate CSRF
+// - Integrate session
+// - Use bodylimit e.Use(middleware.BodyLimit("2M"))
+
 type EchoConfig struct {
         Debug                 bool
         BindAddress           string
@@ -31,6 +44,7 @@ type EchoConfig struct {
         CombinedHostLogFile   string
         RedirectToWWW         bool
         ContentSecurityPolicy *glmw.ContentSecurityPolicyConfig
+        PrometheusConfig      *prometheus.PrometheusConfig
 }
 
 type EchoWrapper struct {
@@ -184,7 +198,18 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
         if c.RedirectToWWW {
                 e.Use(middleware.WWWRedirect())
         }
-        e.Use(middleware.GzipWithConfig(middleware.GzipConfig{Level: 5}))
+        e.Use(middleware.Decompress())
+        e.Use(middleware.GzipWithConfig(middleware.GzipConfig{
+                // TODO: This mw causes prometheus responses to show up compressed for
+                // browsers. Why?
+                Skipper: func(c echo.Context) bool {
+                        if c.Path() == "/metrics" {
+                                return true
+                        }
+                        return false
+                },
+                Level: 5,
+        }))
         e.Use(glmw.StrictSecure())
 
         if c.ContentSecurityPolicy != nil {
@@ -193,6 +218,12 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
                 return nil, fmt.Errorf("ContentSecurityPolicy is required")
         }
 
+        if c.PrometheusConfig != nil {
+                prom := prometheus.NewPrometheusWithConfig(c.PrometheusConfig)
+                e.Use(prom.MiddlewareHandler)
+                e.GET(c.PrometheusConfig.MetricsPath, prom.MetricsHandler)
+        }
+
         return &EchoWrapper{
                 Echo:        e,
                 tlsServer:   ts,