mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-02 04:20:50 +08:00
Previously: - REQUEST INFO timestamp was captured at log write time (not request arrival) - API RESPONSE had NO timestamp at all This fix: - Captures REQUEST INFO timestamp when request first arrives - Adds API RESPONSE timestamp when upstream response arrives Changes: - Add Timestamp field to RequestInfo, set at middleware initialization - Set API_RESPONSE_TIMESTAMP in appendAPIResponse() and gemini handler - Pass timestamps through logging chain to writeNonStreamingLog() - Add timestamp output to API RESPONSE section This enables accurate measurement of backend response latency in error logs.
125 lines
3.4 KiB
Go
125 lines
3.4 KiB
Go
// Package middleware provides HTTP middleware components for the CLI Proxy API server.
|
|
// This file contains the request logging middleware that captures comprehensive
|
|
// request and response data when enabled through configuration.
|
|
package middleware
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/logging"
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
|
|
)
|
|
|
|
// RequestLoggingMiddleware creates a Gin middleware that logs HTTP requests and responses.
|
|
// It captures detailed information about the request and response, including headers and body,
|
|
// and uses the provided RequestLogger to record this data. When logging is disabled in the
|
|
// logger, it still captures data so that upstream errors can be persisted.
|
|
func RequestLoggingMiddleware(logger logging.RequestLogger) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
if logger == nil {
|
|
c.Next()
|
|
return
|
|
}
|
|
|
|
if c.Request.Method == http.MethodGet {
|
|
c.Next()
|
|
return
|
|
}
|
|
|
|
path := c.Request.URL.Path
|
|
if !shouldLogRequest(path) {
|
|
c.Next()
|
|
return
|
|
}
|
|
|
|
// Capture request information
|
|
requestInfo, err := captureRequestInfo(c)
|
|
if err != nil {
|
|
// Log error but continue processing
|
|
// In a real implementation, you might want to use a proper logger here
|
|
c.Next()
|
|
return
|
|
}
|
|
|
|
// Create response writer wrapper
|
|
wrapper := NewResponseWriterWrapper(c.Writer, logger, requestInfo)
|
|
if !logger.IsEnabled() {
|
|
wrapper.logOnErrorOnly = true
|
|
}
|
|
c.Writer = wrapper
|
|
|
|
// Process the request
|
|
c.Next()
|
|
|
|
// Finalize logging after request processing
|
|
if err = wrapper.Finalize(c); err != nil {
|
|
// Log error but don't interrupt the response
|
|
// In a real implementation, you might want to use a proper logger here
|
|
}
|
|
}
|
|
}
|
|
|
|
// captureRequestInfo extracts relevant information from the incoming HTTP request.
|
|
// It captures the URL, method, headers, and body. The request body is read and then
|
|
// restored so that it can be processed by subsequent handlers.
|
|
func captureRequestInfo(c *gin.Context) (*RequestInfo, error) {
|
|
// Capture URL with sensitive query parameters masked
|
|
maskedQuery := util.MaskSensitiveQuery(c.Request.URL.RawQuery)
|
|
url := c.Request.URL.Path
|
|
if maskedQuery != "" {
|
|
url += "?" + maskedQuery
|
|
}
|
|
|
|
// Capture method
|
|
method := c.Request.Method
|
|
|
|
// Capture headers
|
|
headers := make(map[string][]string)
|
|
for key, values := range c.Request.Header {
|
|
headers[key] = values
|
|
}
|
|
|
|
// Capture request body
|
|
var body []byte
|
|
if c.Request.Body != nil {
|
|
// Read the body
|
|
bodyBytes, err := io.ReadAll(c.Request.Body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Restore the body for the actual request processing
|
|
c.Request.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
|
|
body = bodyBytes
|
|
}
|
|
|
|
return &RequestInfo{
|
|
URL: url,
|
|
Method: method,
|
|
Headers: headers,
|
|
Body: body,
|
|
RequestID: logging.GetGinRequestID(c),
|
|
Timestamp: time.Now(),
|
|
}, nil
|
|
}
|
|
|
|
// shouldLogRequest determines whether the request should be logged.
|
|
// It skips management endpoints to avoid leaking secrets but allows
|
|
// all other routes, including module-provided ones, to honor request-log.
|
|
func shouldLogRequest(path string) bool {
|
|
if strings.HasPrefix(path, "/v0/management") || strings.HasPrefix(path, "/management") {
|
|
return false
|
|
}
|
|
|
|
if strings.HasPrefix(path, "/api") {
|
|
return strings.HasPrefix(path, "/api/provider")
|
|
}
|
|
|
|
return true
|
|
}
|