Files
versitygw/s3api/admin-server.go
T
Tung Lam e63998fb31 fix: log the client IP from a trusted proxy header
Behind a reverse proxy the request log and the S3, admin, website and WebUI
access logs record the proxy's address instead of the client's. Add a
client-ip-header option that takes the logged address from X-Forwarded-For or
X-Real-Ip. It is off by default, so an existing deployment logs exactly what it
logged before.

The header is only honoured when the connecting peer is listed in the new
trusted-proxies list of IPs and CIDRs. Without that, the value is whatever the
client sent: nginx's standard
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for appends to a
client-supplied header, leaving the client's own address leftmost.
X-Forwarded-For is walked right to left, skipping the listed proxies, so the
first unlisted address is the client and a forged leftmost entry is never
reached; the two-proxy case from #2243 works once both proxies are listed.
Every header line is walked (a proxy may add its own line instead of
appending), ip:port entries are accepted, and a request from an unlisted peer
keeps the socket address. Setting the header with an empty trusted-proxies list
fails startup rather than silently trusting every peer.

X-Real-Ip reads the last header line, so a proxy that adds a line rather than
replacing the client's is the one that speaks. An address carrying an IPv6 zone
is rejected: the zone is free text that the space-delimited access log would
write verbatim, shifting every field after RemoteIP. When every hop in
X-Forwarded-For is a trusted proxy, the leftmost hop is logged, as nginx's
real_ip_recursive does, since the socket peer is then the nearest proxy. The
trusted-proxies list accepts the entry "unix" to trust the peer of a listener
bound to a unix socket path, which fasthttp reports as 0.0.0.0.

The resolver, middleware, log tag and parsers live in internal/clientip, shared
by s3api, iamapi, website and webui; s3api/utils re-exports them for the S3
callers, so the standalone IAM service no longer pulls in the S3 side. On this
branch go list -deps ./iamapi drops from 375 to 299 packages, against 298 on
main.

ctx.IP() is unchanged and still returns the socket peer address, because it
feeds aws:SourceIp in IAM policy conditions and SourceIP in policy evaluation;
only the address written to the logs and S3 event records comes from the
header.

Fixes #2243.
2026-10-16 00:51:53 +00:00

265 lines
8.1 KiB
Go

// Copyright 2023 Versity Software
// This file is licensed under the Apache License, Version 2.0
// (the "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package s3api
import (
"fmt"
"net"
"os"
"github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v3/middleware/logger"
"github.com/gofiber/fiber/v3/middleware/recover"
"github.com/versity/versitygw/auth"
"github.com/versity/versitygw/backend"
"github.com/versity/versitygw/debuglogger"
"github.com/versity/versitygw/internal/netutil"
"github.com/versity/versitygw/s3api/controllers"
"github.com/versity/versitygw/s3api/middlewares"
"github.com/versity/versitygw/s3api/utils"
"github.com/versity/versitygw/s3log"
)
type S3AdminServer struct {
app *fiber.App
backend backend.Backend
router *S3AdminRouter
CertStorage *netutil.CertStorage
quiet bool
debug bool
corsAllowOrigin string
maxConnections int
maxRequests int
socketPerm os.FileMode
pathPrefix string
clientIPHeader string
trustedProxies utils.TrustedProxies
// clientIPHeaderErr holds an invalid WithAdminClientIPHeader value; the
// admin server has no error-returning constructor, so ServeMultiPort
// reports it at startup rather than logging the socket address silently.
clientIPHeaderErr error
extraRoutes []adminRouteMount
}
// adminRouteMount is a route registered on the admin app after the
// built-in admin router ran.
type adminRouteMount struct {
method string
path string
handlers []fiber.Handler
}
func NewAdminServer(be backend.Backend, root middlewares.RootUserConfig, region string, iam auth.IAMService, l s3log.AuditLogger, ctrl controllers.S3ApiController, opts ...AdminOpt) *S3AdminServer {
server := &S3AdminServer{
backend: be,
router: &S3AdminRouter{
s3api: ctrl,
},
}
for _, opt := range opts {
opt(server)
}
// validate the header once here, so the request path can compare it
// directly instead of re-normalizing on every request
if server.clientIPHeader != "" {
header, err := utils.NormalizeClientIPHeader(server.clientIPHeader)
if err != nil {
server.clientIPHeaderErr = err
server.clientIPHeader = ""
} else {
server.clientIPHeader = header
}
}
app := fiber.New(fiber.Config{
AppName: "versitygw",
ServerHeader: "VERSITYGW",
ErrorHandler: globalErrorHandler,
Concurrency: server.maxConnections,
})
server.app = app
app.Use("*", recover.New(
recover.Config{
EnableStackTrace: true,
StackTraceHandler: stackTraceHandler,
}))
// Logging middlewares
if !server.quiet {
app.Use("*", logger.New(logger.Config{
Format: "${time} | adm | ${status} | ${latency} | ${ip} | ${method} | ${path} | ${error} | ${queryParams}\n",
CustomTags: map[string]logger.LogFunc{
logger.TagQueryStringParams: debuglogger.RedactedQueryParamsTag,
logger.TagIP: utils.ClientIPTag,
},
}))
}
// initialize requestId middleware
app.Use("*", middlewares.RequestIDs())
// resolve the logged client address from a trusted proxy header, when
// one is configured
if server.clientIPHeader != "" {
app.Use("*", utils.ClientIPMiddleware(server.clientIPHeader, server.trustedProxies))
}
// initialize total requests cap limiter middleware
app.Use("*", middlewares.RateLimiter(server.maxRequests, nil, l))
app.Use("*", controllers.WrapMiddleware(middlewares.DecodeURL, l, nil))
// initialize the debug logger in debug mode
if debuglogger.IsDebugEnabled() {
app.Use("*", middlewares.DebugLogger())
}
router := app.Group(server.pathPrefix)
server.router.Init(router, be, iam, l, root, region, server.debug, server.corsAllowOrigin)
for _, r := range server.extraRoutes {
args := make([]any, 0, len(r.handlers))
for _, h := range r.handlers {
args = append(args, h)
}
router.Add([]string{r.method}, r.path, args[0], args[1:]...)
}
return server
}
type AdminOpt func(s *S3AdminServer)
func WithAdminSrvTLS(cs *netutil.CertStorage) AdminOpt {
return func(s *S3AdminServer) { s.CertStorage = cs }
}
// WithQuiet silences default logging output
func WithAdminQuiet() AdminOpt {
return func(s *S3AdminServer) { s.quiet = true }
}
// WithAdminDebug enables the debug logging
func WithAdminDebug() AdminOpt {
return func(s *S3AdminServer) { s.debug = true }
}
// WithAdminCORSAllowOrigin sets the default CORS Access-Control-Allow-Origin value
// for the standalone admin server.
func WithAdminCORSAllowOrigin(origin string) AdminOpt {
return func(s *S3AdminServer) { s.corsAllowOrigin = origin }
}
// WithAdminClientIPHeader is WithClientIPHeader for the standalone admin
// server.
func WithAdminClientIPHeader(header string) AdminOpt {
return func(s *S3AdminServer) { s.clientIPHeader = header }
}
// WithAdminTrustedProxies sets the peers whose client IP header is trusted for
// the standalone admin server. It only has an effect together with
// WithAdminClientIPHeader.
func WithAdminTrustedProxies(trusted utils.TrustedProxies) AdminOpt {
return func(s *S3AdminServer) { s.trustedProxies = trusted }
}
// WithAdminConcurrencyLimiter sets the admin standalone server's maximum
// connection limit and the hard limit for in-flight requests.
func WithAdminConcurrencyLimiter(maxConnections, maxRequests int) AdminOpt {
return func(s *S3AdminServer) {
s.maxConnections = maxConnections
s.maxRequests = maxRequests
}
}
// WithAdminSocketPerm sets the file-mode permissions applied to file-backed
// UNIX domain sockets after binding. It has no effect on TCP/IP or abstract
// namespace sockets.
func WithAdminSocketPerm(perm os.FileMode) AdminOpt {
return func(s *S3AdminServer) { s.socketPerm = perm }
}
// WithAdminPathPrefix mounts all admin routes under the given path prefix
// (e.g. "/admin").
func WithAdminPathPrefix(prefix string) AdminOpt {
return func(s *S3AdminServer) { s.pathPrefix = prefix }
}
// WithAdminRoute registers a route on the standalone admin server,
// after the built-in admin routes and their middleware chain. Use it
// for admin-surface endpoints that do not fit the S3 admin controller
// shape.
func WithAdminRoute(method, path string, handlers ...fiber.Handler) AdminOpt {
return func(s *S3AdminServer) {
copied := append([]fiber.Handler(nil), handlers...)
s.extraRoutes = append(s.extraRoutes, adminRouteMount{
method: method,
path: path,
handlers: copied,
})
}
}
// ServeMultiPort creates listeners for multiple port specifications and serves
// on all of them simultaneously. This supports listening on multiple ports and/or
// addresses (e.g., [":8080", "localhost:8081"]).
func (sa *S3AdminServer) ServeMultiPort(ports []string) error {
if sa.clientIPHeaderErr != nil {
return sa.clientIPHeaderErr
}
if len(ports) == 0 {
return fmt.Errorf("no ports specified")
}
// Multiple ports - create listeners for each
var listeners []net.Listener
for _, portSpec := range ports {
var ln net.Listener
var err error
if sa.CertStorage != nil {
ln, err = netutil.NewMultiAddrTLSListener(fiber.NetworkTCP, portSpec, sa.CertStorage.GetCertificate, netutil.ListenerOptions{SocketPerm: sa.socketPerm})
} else {
ln, err = netutil.NewMultiAddrListener(fiber.NetworkTCP, portSpec, netutil.ListenerOptions{SocketPerm: sa.socketPerm})
}
if err != nil {
return fmt.Errorf("failed to bind admin listener %s: %w", portSpec, err)
}
listeners = append(listeners, ln)
}
if len(listeners) == 0 {
return fmt.Errorf("failed to create any admin listeners")
}
// Combine all listeners
finalListener := netutil.NewMultiListener(listeners...)
return sa.app.Listener(finalListener, fiber.ListenConfig{
DisableStartupMessage: true,
})
}
// ShutDown gracefully shuts down the server with a context timeout
func (sa S3AdminServer) Shutdown() error {
return sa.app.ShutdownWithTimeout(shutDownDuration)
}