redirect caddy logging to the non-headless tui when appropriate (#392)

This commit is contained in:
Michael Quigley
2023-08-25 13:26:54 -04:00
parent 6daa73b95c
commit 5fcba2dc62
7 changed files with 85 additions and 12 deletions

View File

@@ -0,0 +1,73 @@
package proxy
import (
"fmt"
"github.com/openziti/zrok/endpoints"
"net/http"
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
)
var middlewareRequests chan *endpoints.Request
func init() {
caddy.RegisterModule(ZrokRequestsMiddleware{})
httpcaddyfile.RegisterHandlerDirective("zrok_requests", parseCaddyfile)
}
type ZrokRequestsMiddleware struct{}
// CaddyModule returns the Caddy module information.
func (ZrokRequestsMiddleware) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{
ID: "http.handlers.zrok_requests",
New: func() caddy.Module { return new(ZrokRequestsMiddleware) },
}
}
// Provision implements caddy.Provisioner.
func (m *ZrokRequestsMiddleware) Provision(ctx caddy.Context) error {
return nil
}
// Validate implements caddy.Validator.
func (m ZrokRequestsMiddleware) Validate() error {
return nil
}
// ServeHTTP implements caddyhttp.MiddlewareHandler.
func (m ZrokRequestsMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
if middlewareRequests != nil {
middlewareRequests <- &endpoints.Request{
Stamp: time.Now(),
RemoteAddr: fmt.Sprintf("%v", r.Header["X-Real-Ip"]),
Method: r.Method,
Path: r.URL.String(),
}
}
return next.ServeHTTP(w, r)
}
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
func (m *ZrokRequestsMiddleware) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return nil
}
// parseCaddyfile unmarshals tokens from h into a new ZrokRequestsMiddleware.
func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) {
var m ZrokRequestsMiddleware
err := m.UnmarshalCaddyfile(h.Dispenser)
return m, err
}
// Interface guards
var (
_ caddy.Provisioner = (*ZrokRequestsMiddleware)(nil)
_ caddy.Validator = (*ZrokRequestsMiddleware)(nil)
_ caddyhttp.MiddlewareHandler = (*ZrokRequestsMiddleware)(nil)
_ caddyfile.Unmarshaler = (*ZrokRequestsMiddleware)(nil)
)