fix(openai): 仅记录 codex_cli_only 拒绝日志并输出详细 User-Agent

This commit is contained in:
yangjianbo
2026-02-14 09:53:17 +08:00
parent f96acf6e27
commit 4bfa69bffa
2 changed files with 21 additions and 6 deletions

View File

@@ -313,7 +313,6 @@ func logCodexCLIOnlyDetection(ctx context.Context, c *gin.Context, account *Acco
} }
log := logger.FromContext(ctx).With(fields...) log := logger.FromContext(ctx).With(fields...)
if result.Matched { if result.Matched {
log.Warn("OpenAI codex_cli_only 允许官方客户端请求")
return return
} }
log.Warn("OpenAI codex_cli_only 拒绝非官方客户端请求") log.Warn("OpenAI codex_cli_only 拒绝非官方客户端请求")
@@ -333,7 +332,7 @@ func appendCodexCLIOnlyRejectedRequestFields(fields []zap.Field, c *gin.Context,
zap.String("request_host", strings.TrimSpace(req.Host)), zap.String("request_host", strings.TrimSpace(req.Host)),
zap.String("request_client_ip", strings.TrimSpace(c.ClientIP())), zap.String("request_client_ip", strings.TrimSpace(c.ClientIP())),
zap.String("request_remote_addr", strings.TrimSpace(req.RemoteAddr)), zap.String("request_remote_addr", strings.TrimSpace(req.RemoteAddr)),
zap.String("request_user_agent", strings.TrimSpace(req.Header.Get("User-Agent"))), zap.String("request_user_agent", buildDetailedUserAgent(req.Header.Values("User-Agent"))),
zap.String("request_content_type", strings.TrimSpace(req.Header.Get("Content-Type"))), zap.String("request_content_type", strings.TrimSpace(req.Header.Get("Content-Type"))),
zap.Int64("request_content_length", req.ContentLength), zap.Int64("request_content_length", req.ContentLength),
zap.Bool("request_stream", requestStream), zap.Bool("request_stream", requestStream),
@@ -352,6 +351,21 @@ func appendCodexCLIOnlyRejectedRequestFields(fields []zap.Field, c *gin.Context,
return fields return fields
} }
func buildDetailedUserAgent(values []string) string {
if len(values) == 0 {
return ""
}
result := make([]string, 0, len(values))
for _, value := range values {
v := strings.TrimSpace(value)
if v == "" {
continue
}
result = append(result, v)
}
return strings.Join(result, " | ")
}
func snapshotCodexCLIOnlyHeaders(header http.Header) map[string]string { func snapshotCodexCLIOnlyHeaders(header http.Header) map[string]string {
if len(header) == 0 { if len(header) == 0 {
return nil return nil

View File

@@ -103,7 +103,7 @@ func TestLogCodexCLIOnlyDetection_NilSafety(t *testing.T) {
}) })
} }
func TestLogCodexCLIOnlyDetection_LogsBothMatchedAndRejected(t *testing.T) { func TestLogCodexCLIOnlyDetection_OnlyLogsRejected(t *testing.T) {
logSink, restore := captureStructuredLog(t) logSink, restore := captureStructuredLog(t)
defer restore() defer restore()
@@ -119,7 +119,7 @@ func TestLogCodexCLIOnlyDetection_LogsBothMatchedAndRejected(t *testing.T) {
Reason: CodexClientRestrictionReasonNotMatchedUA, Reason: CodexClientRestrictionReasonNotMatchedUA,
}, nil) }, nil)
require.True(t, logSink.ContainsMessage("OpenAI codex_cli_only 允许官方客户端请求")) require.False(t, logSink.ContainsMessage("OpenAI codex_cli_only 允许官方客户端请求"))
require.True(t, logSink.ContainsMessage("OpenAI codex_cli_only 拒绝非官方客户端请求")) require.True(t, logSink.ContainsMessage("OpenAI codex_cli_only 拒绝非官方客户端请求"))
} }
@@ -131,7 +131,8 @@ func TestLogCodexCLIOnlyDetection_RejectedIncludesRequestDetails(t *testing.T) {
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
c, _ := gin.CreateTestContext(rec) c, _ := gin.CreateTestContext(rec)
c.Request = httptest.NewRequest(http.MethodPost, "/v1/responses?trace=1", bytes.NewReader(nil)) c.Request = httptest.NewRequest(http.MethodPost, "/v1/responses?trace=1", bytes.NewReader(nil))
c.Request.Header.Set("User-Agent", "curl/8.0") c.Request.Header.Add("User-Agent", "curl/8.0")
c.Request.Header.Add("User-Agent", "Codex/1.2.3 (cli)")
c.Request.Header.Set("Content-Type", "application/json") c.Request.Header.Set("Content-Type", "application/json")
c.Request.Header.Set("OpenAI-Beta", "assistants=v2") c.Request.Header.Set("OpenAI-Beta", "assistants=v2")
@@ -143,7 +144,7 @@ func TestLogCodexCLIOnlyDetection_RejectedIncludesRequestDetails(t *testing.T) {
Reason: CodexClientRestrictionReasonNotMatchedUA, Reason: CodexClientRestrictionReasonNotMatchedUA,
}, body) }, body)
require.True(t, logSink.ContainsFieldValue("request_user_agent", "curl/8.0")) require.True(t, logSink.ContainsFieldValue("request_user_agent", "curl/8.0 | Codex/1.2.3 (cli)"))
require.True(t, logSink.ContainsFieldValue("request_model", "gpt-5.2")) require.True(t, logSink.ContainsFieldValue("request_model", "gpt-5.2"))
require.True(t, logSink.ContainsFieldValue("request_query", "trace=1")) require.True(t, logSink.ContainsFieldValue("request_query", "trace=1"))
require.True(t, logSink.ContainsFieldValue("request_prompt_cache_key_sha256", hashSensitiveValueForLog("pc-123"))) require.True(t, logSink.ContainsFieldValue("request_prompt_cache_key_sha256", hashSensitiveValueForLog("pc-123")))