bwilliams
a279405cae
The serve command runs internal/server: the API under /api (health, and the CSRF token endpoint) and the WebSocket hub under /ws, over HTTP or TLS, with an optional HTTP to HTTPS redirect, the PROXY protocol from trusted sources and a graceful shutdown that closes WebSockets first. Its middleware covers the client IP behind trusted proxies, request IDs, request logging, panic recovery, global and API rate limits, Host and body size checks, security response headers, compression, CSRF protection (cross-origin checks and signed double-submit tokens) and JSON-only API bodies. Middleware that logs takes a WithLogger option. New server config sections: proxy, csrf, tls, headers and frontend (not used yet), plus max_header_bytes, max_body_bytes, global and API rate limits and HTTP read, write and idle timeouts. Every setting documents what 0 or empty means, and internal/config/README.md is reorganised by section. server.timeouts.read_header must be greater than 0, and a header or idle timeout of 0 means no limit rather than the read timeout. WebSocket upgrades are protected by the Origin check: the server's own origin, or one of csrf.cross_origin_protection.trusted_origins, which the hub now takes with WithTrustedOrigins. wsserve becomes "ws serve". "ws dial" opens a WebSocket on /ws to test it: --ping sends a ping and waits for the pong, --message sends messages and prints the replies, --origin tests the Origin check, and with neither --ping nor --message each line of stdin is sent until Ctrl+C.
42 lines
880 B
Go
42 lines
880 B
Go
package middleware
|
|
|
|
import (
|
|
"log/slog"
|
|
)
|
|
|
|
// Option configures a middleware that logs, such as NewCSRF, Logger or
|
|
// Recoverer.
|
|
type Option func(*options)
|
|
|
|
// options holds the settings Options change.
|
|
type options struct {
|
|
log *slog.Logger
|
|
}
|
|
|
|
// WithLogger makes a middleware log to logger instead of slog.Default().
|
|
func WithLogger(logger *slog.Logger) Option {
|
|
return func(opts *options) {
|
|
opts.log = logger
|
|
}
|
|
}
|
|
|
|
// applyOptions returns the settings opts make.
|
|
func applyOptions(opts []Option) options {
|
|
var settings options
|
|
for _, opt := range opts {
|
|
opt(&settings)
|
|
}
|
|
|
|
return settings
|
|
}
|
|
|
|
// logger returns the logger to use, tagged with component: the given one, or
|
|
// slog.Default(), looked up now.
|
|
func (opts options) logger(component string) *slog.Logger {
|
|
log := opts.log
|
|
if log == nil {
|
|
log = slog.Default()
|
|
}
|
|
return log.With("component", component)
|
|
}
|