mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-08 01:17:09 +08:00
* fix(relay): mask only the upstream address in error messages MaskSensitiveInfo masked every URL, domain and IPv4 in upstream error messages, which garbled documentation links, email domains and dotted identifiers that clients need to read. It now takes the upstream addresses of the request: the channel base URL, the origin the gateway actually dialed (recorded in doRequest, DoWssRequest, the AWS SDK client and the Xunfei and Volcengine TTS dials, which covers absolute Advanced Custom routes), the channel proxy and the environment proxy. URLs and bare hostnames on those hosts and all IPv4 addresses are masked; other URLs and domains stay readable. With no upstream address no address is masked. Credentials are masked on every URL regardless of host: api_key values, query values and userinfo. The URL matcher also keeps quotes, colons and semicolons that follow a URL, keeps parentheses and apostrophes inside it, masks an IPv4 URL host whole and keeps a country-code TLD when the host has a port. * fix(relay): keep preset official endpoints readable in masked errors A channel on the base URL new-api presets for its type reaches a public official endpoint, so its address is not masked. Only addresses the admin configured are: a custom base URL, the origin of an Advanced Custom route, and the channel and environment proxies. Preset hosts are compared with their port so a configured localhost upstream stays apart from the Ollama preset. The origins recorded for the AWS SDK, Xunfei and Volcengine TTS dials and the plugin allowedHosts masking are dropped: they are all official endpoints. * fix(relay): mask IPv4 addresses and plugin allowed hosts in every error IPv4 addresses in network errors include the gateway's own address, so they are masked even when the channel uses a preset base URL. Task plugin build failures mask the plugin's allowedHosts again: an installed plugin may point them at private hosts. * fix(relay): mask bracketed IPv6 addresses in errors Go network errors write IPv6 addresses in brackets, as in "dial tcp [2001:db8::1]:443". Like IPv4, they are the resolved upstream or the gateway's own address, so they are masked on every error once the bracketed content parses as an IP.
281 lines
14 KiB
Go
281 lines
14 KiB
Go
package service
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/dto"
|
|
"github.com/QuantumNous/new-api/model"
|
|
kitdto "github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/setting/system_setting"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/glebarez/sqlite"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
func TestShouldRetryRelayErrorHonorsChannelPinOnChannelError(t *testing.T) {
|
|
err := types.NewError(errors.New("channel failed"), types.ErrorCodeChannelNoAvailableKey)
|
|
for _, test := range []struct {
|
|
name string
|
|
pin *dto.ChannelPin
|
|
wantRetry bool
|
|
}{
|
|
{name: "unrestricted channel error", wantRetry: true},
|
|
{
|
|
name: "single attempt pin suppresses channel error retry",
|
|
pin: &dto.ChannelPin{
|
|
ChannelId: 1, Source: dto.PinSourceToken, Rank: dto.PinRankToken, RetryMode: dto.PinRetrySingleAttempt,
|
|
},
|
|
wantRetry: false,
|
|
},
|
|
{
|
|
name: "origin task pin permits retry on the same channel",
|
|
pin: &dto.ChannelPin{
|
|
ChannelId: 1, Source: dto.PinSourceOriginTask, Rank: dto.PinRankOriginTask, RetryMode: dto.PinRetrySameChannel,
|
|
},
|
|
wantRetry: true,
|
|
},
|
|
} {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
if test.pin != nil {
|
|
GetChannelConstraints(c).AddPin(*test.pin)
|
|
}
|
|
assert.Equal(t, test.wantRetry, ShouldRetryRelayError(c, err, 1))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestProcessChannelErrorMasksDisableReasonAndNotification(t *testing.T) {
|
|
previousDB, previousType := model.DB, common.MainDatabaseType()
|
|
previousCache, previousRedis := common.MemoryCacheEnabled, common.RedisEnabled
|
|
previousAutoDisable, previousErrorLog := common.AutomaticDisableChannelEnabled, constant.ErrorLogEnabled
|
|
previousNotifyLimit := constant.NotifyLimitCount
|
|
previousClient, previousWorker := httpClient, system_setting.WorkerUrl
|
|
fetch := system_setting.GetFetchSetting()
|
|
previousFetch := *fetch
|
|
t.Cleanup(func() {
|
|
model.DB = previousDB
|
|
common.SetMainDatabaseType(previousType)
|
|
common.MemoryCacheEnabled, common.RedisEnabled = previousCache, previousRedis
|
|
common.AutomaticDisableChannelEnabled, constant.ErrorLogEnabled = previousAutoDisable, previousErrorLog
|
|
constant.NotifyLimitCount = previousNotifyLimit
|
|
httpClient, system_setting.WorkerUrl = previousClient, previousWorker
|
|
*fetch = previousFetch
|
|
})
|
|
database, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
|
|
require.NoError(t, err)
|
|
sqlDB, err := database.DB()
|
|
require.NoError(t, err)
|
|
sqlDB.SetMaxOpenConns(1)
|
|
t.Cleanup(func() { require.NoError(t, sqlDB.Close()) })
|
|
require.NoError(t, database.AutoMigrate(&model.Channel{}, &model.Ability{}, &model.User{}))
|
|
model.DB = database
|
|
common.SetMainDatabaseType(common.DatabaseTypeSQLite)
|
|
common.MemoryCacheEnabled, common.RedisEnabled = false, false
|
|
common.AutomaticDisableChannelEnabled, constant.ErrorLogEnabled = true, false
|
|
constant.NotifyLimitCount = 10
|
|
channel := &model.Channel{Name: "relay-review", Key: "fixture-key", Type: 1, Status: common.ChannelStatusEnabled, Group: "default", Models: "test-model"}
|
|
require.NoError(t, channel.Insert())
|
|
notifications := make(chan []byte, 1)
|
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
body, _ := io.ReadAll(r.Body)
|
|
notifications <- body
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}))
|
|
t.Cleanup(server.Close)
|
|
httpClient, system_setting.WorkerUrl = server.Client(), ""
|
|
fetch.EnableSSRFProtection = false
|
|
settings, err := common.Marshal(kitdto.UserSetting{NotifyType: kitdto.NotifyTypeWebhook, WebhookUrl: server.URL})
|
|
require.NoError(t, err)
|
|
root := &model.User{Username: "notification-test-root", Role: common.RoleRootUser, Status: common.UserStatusEnabled, Setting: string(settings)}
|
|
require.NoError(t, database.Create(root).Error)
|
|
notifyKey := fmt.Sprintf("%d:%s:%s", root.Id, formatNotifyType(channel.Id, common.ChannelStatusAutoDisabled), time.Now().Format("2006010215"))
|
|
notifyLimitStore.Delete(notifyKey)
|
|
t.Cleanup(func() { notifyLimitStore.Delete(notifyKey) })
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
common.SetContextKey(c, constant.ContextKeyChannelBaseUrl, "https://private.example.com")
|
|
apiErr := types.NewErrorWithStatusCode(errors.New("upstream https://private.example.com/path?token=review-token api_key:review-secret"), types.ErrorCodeChannelNoAvailableKey, http.StatusUnauthorized)
|
|
ProcessChannelError(c, types.ChannelError{ChannelId: channel.Id, ChannelName: channel.Name, AutoBan: true}, apiErr, nil)
|
|
var notification WebhookPayload
|
|
select {
|
|
case payload := <-notifications:
|
|
require.NoError(t, common.Unmarshal(payload, ¬ification))
|
|
case <-time.After(5 * time.Second):
|
|
t.Fatal("automatic channel-disable notification was not delivered")
|
|
}
|
|
loaded, err := model.GetChannelById(channel.Id, true)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, common.ChannelStatusAutoDisabled, loaded.Status)
|
|
wantReason := "status_code=401, upstream https://***.com/***?token=*** api_key:***"
|
|
assert.Equal(t, wantReason, loaded.GetOtherInfo()["status_reason"])
|
|
assert.Contains(t, notification.Content, wantReason)
|
|
assert.NotContains(t, notification.Content, "review-token")
|
|
assert.NotContains(t, notification.Content, "review-secret")
|
|
assert.Equal(t, http.StatusUnauthorized, apiErr.StatusCode)
|
|
}
|
|
|
|
// Only addresses the admin configured are masked: a channel on the base URL
|
|
// new-api presets reaches a public official endpoint, and so do adaptors that
|
|
// build official endpoints themselves.
|
|
func TestUpstreamAddressesMaskOnlyConfiguredAddresses(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
name string
|
|
channelType int
|
|
baseURL string
|
|
origin string
|
|
proxyEnv string
|
|
message string
|
|
want string
|
|
}{
|
|
{
|
|
name: "preset base URL stays readable",
|
|
channelType: constant.ChannelTypeAnthropic,
|
|
baseURL: "https://api.anthropic.com",
|
|
origin: "https://api.anthropic.com",
|
|
message: "request to https://api.anthropic.com/v1/messages failed, see https://platform.claude.com/docs/en/build-with-claude/task-budgets",
|
|
want: "request to https://api.anthropic.com/v1/messages failed, see https://platform.claude.com/docs/en/build-with-claude/task-budgets",
|
|
},
|
|
{
|
|
name: "official endpoint built by the adaptor stays readable",
|
|
channelType: constant.ChannelTypeVertexAi,
|
|
origin: "https://us-central1-aiplatform.googleapis.com",
|
|
message: "request to https://us-central1-aiplatform.googleapis.com/v1/projects failed",
|
|
want: "request to https://us-central1-aiplatform.googleapis.com/v1/projects failed",
|
|
},
|
|
{
|
|
name: "configured base URL is masked",
|
|
channelType: constant.ChannelTypeOpenAI,
|
|
baseURL: "https://relay.private.example",
|
|
origin: "https://relay.private.example",
|
|
message: "request to https://relay.private.example/v1/chat/completions failed",
|
|
want: "request to https://***.example/***/***/*** failed",
|
|
},
|
|
{
|
|
name: "absolute Advanced Custom route is masked",
|
|
channelType: constant.ChannelTypeAdvancedCustom,
|
|
origin: "https://route.private.example",
|
|
message: "dial tcp: lookup route.private.example: no such host",
|
|
want: "dial tcp: lookup ***.***.example: no such host",
|
|
},
|
|
{
|
|
name: "environment proxy is masked on a preset channel",
|
|
channelType: constant.ChannelTypeAnthropic,
|
|
baseURL: "https://api.anthropic.com",
|
|
proxyEnv: "http://egress.private.invalid:8080",
|
|
message: "proxyconnect tcp: dial tcp: lookup egress.private.invalid: no such host",
|
|
want: "proxyconnect tcp: dial tcp: lookup ***.***.invalid: no such host",
|
|
},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Setenv("HTTPS_PROXY", tc.proxyEnv)
|
|
t.Setenv("HTTP_PROXY", "")
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
common.SetContextKey(c, constant.ContextKeyChannelType, tc.channelType)
|
|
common.SetContextKey(c, constant.ContextKeyChannelBaseUrl, tc.baseURL)
|
|
common.SetContextKey(c, constant.ContextKeyUpstreamRequestOrigin, tc.origin)
|
|
apiErr := types.NewErrorWithStatusCode(errors.New(tc.message), types.ErrorCodeBadResponseStatusCode, http.StatusBadGateway)
|
|
|
|
assert.Equal(t, tc.want, apiErr.ToOpenAIError(common.UpstreamAddresses(c)...).Message)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDecideRelayRetryReasons(t *testing.T) {
|
|
upstream := func(status int) *types.NewAPIError {
|
|
return types.NewOpenAIError(errors.New("upstream"), types.ErrorCodeBadResponseStatusCode, status)
|
|
}
|
|
for _, tc := range []struct {
|
|
name string
|
|
err *types.NewAPIError
|
|
retries int
|
|
setup func(*gin.Context)
|
|
want PolicyDecision
|
|
}{
|
|
{name: "retry status matched", err: upstream(http.StatusTooManyRequests), retries: 1, want: PolicyDecision{Action: "retry", Reason: "retry_status_matched", Source: "global"}},
|
|
{name: "status outside retry rules", err: upstream(http.StatusBadRequest), retries: 1, want: PolicyDecision{Action: "stop", Reason: "status_not_retryable", Source: "global"}},
|
|
{name: "attempt budget exhausted", err: upstream(http.StatusTooManyRequests), retries: 0, want: PolicyDecision{Action: "stop", Reason: "attempt_budget_exhausted", Source: "global"}},
|
|
{name: "always skipped status", err: upstream(http.StatusGatewayTimeout), retries: 1, want: PolicyDecision{Action: "stop", Reason: "system_retry_exclusion", Source: "system"}},
|
|
{name: "success status never retries", err: upstream(http.StatusOK), retries: 1, want: PolicyDecision{Action: "stop", Reason: "system_retry_exclusion", Source: "system"}},
|
|
{name: "skip retry error", err: types.NewErrorWithStatusCode(errors.New("local"), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry()), retries: 1, want: PolicyDecision{Action: "stop", Reason: "non_retryable_error", Source: "system"}},
|
|
{name: "channel error retries without budget", err: types.NewError(errors.New("no key"), types.ErrorCodeChannelNoAvailableKey), retries: 0, want: PolicyDecision{Action: "retry", Reason: "channel_error", Source: "system"}},
|
|
{name: "single attempt pin", err: upstream(http.StatusTooManyRequests), retries: 1, setup: func(c *gin.Context) {
|
|
GetChannelConstraints(c).AddPin(dto.ChannelPin{ChannelId: 1, Source: dto.PinSourceToken, Rank: dto.PinRankToken, RetryMode: dto.PinRetrySingleAttempt})
|
|
}, want: PolicyDecision{Action: "stop", Reason: "pinned_channel", Source: "channel_constraint"}},
|
|
{name: "strict session", err: upstream(http.StatusTooManyRequests), retries: 1, setup: func(c *gin.Context) {
|
|
c.Set(ginKeyChannelAffinitySkipRetry, true)
|
|
RequestPolicy(c).SessionModeSource = "global"
|
|
}, want: PolicyDecision{Action: "stop", Reason: "strict_session", Source: "global"}},
|
|
{name: "nil error", retries: 1, want: PolicyDecision{Action: "stop", Reason: "request_completed", Source: "system"}},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
if tc.setup != nil {
|
|
tc.setup(c)
|
|
}
|
|
decision := DecideRelayRetry(c, tc.err, tc.retries)
|
|
assert.Equal(t, tc.want, decision)
|
|
assert.Equal(t, tc.want.Action == "retry", ShouldRetryRelayError(c, tc.err, tc.retries))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRequestPolicyEventsReachLogAdminInfo(t *testing.T) {
|
|
previousAutoDisable := common.AutomaticDisableChannelEnabled
|
|
common.AutomaticDisableChannelEnabled = true
|
|
t.Cleanup(func() { common.AutomaticDisableChannelEnabled = previousAutoDisable })
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
|
|
c.Set("auto_ban", true)
|
|
c.Set("channel_id", 7)
|
|
state := RequestPolicy(c)
|
|
state.BeginAttempt(&model.Channel{Id: 7}, "default")
|
|
apiErr := types.NewOpenAIError(errors.New("invalid credential"), types.ErrorCodeBadResponseStatusCode, http.StatusUnauthorized)
|
|
RecordPolicyFailure(c, 7, apiErr, DecideRelayRetry(c, apiErr, 0))
|
|
|
|
failed := model.NewLogOther()
|
|
AppendRelayLogAdminInfo(c, nil, failed)
|
|
events, ok := failed.Snapshot()["admin_info"].(map[string]any)["request_policy"].([]PolicyEvent)
|
|
require.True(t, ok, "a failed relay exposes its decision events to administrators")
|
|
require.Len(t, events, 3)
|
|
assert.Equal(t, PolicyDecision{Action: "attempt", Reason: "channel_selected", Source: "routing"}, events[0].Decision)
|
|
assert.Equal(t, "default", events[0].Group)
|
|
assert.Equal(t, PolicyDecision{Action: "failure", Reason: "upstream_failure", Source: "upstream"}, events[1].Decision)
|
|
assert.Equal(t, http.StatusUnauthorized, events[1].Status)
|
|
assert.Equal(t, PolicyDecision{Action: "stop", Reason: "attempt_budget_exhausted", Source: "global"}, events[2].Decision)
|
|
assert.Equal(t, "channel_disable_requested", events[2].Health, "the health entry follows the automatic disable rules")
|
|
common.SetContextKey(c, constant.ContextKeyChannelIsMultiKey, true)
|
|
RecordPolicyFailure(c, 7, apiErr, DecideRelayRetry(c, apiErr, 0))
|
|
assert.Equal(t, "key_disable_requested", state.Events()[4].Health)
|
|
|
|
state.BeginAttempt(&model.Channel{Id: 8}, "default")
|
|
c.Set("channel_id", 8)
|
|
MarkRequestPolicySuccess(c, nil)
|
|
MarkRequestPolicySuccess(c, nil)
|
|
succeeded := model.NewLogOther()
|
|
AppendRelayLogAdminInfo(c, nil, succeeded)
|
|
events, ok = succeeded.Snapshot()["admin_info"].(map[string]any)["request_policy"].([]PolicyEvent)
|
|
require.True(t, ok, "a successful relay exposes its decision events to administrators")
|
|
require.Len(t, events, 7, "the outcome is recorded once")
|
|
assert.Equal(t, PolicyDecision{Action: "success", Reason: "request_completed", Source: "upstream"}, events[6].Decision)
|
|
assert.Equal(t, 8, events[6].ChannelID)
|
|
assert.Equal(t, 2, events[6].Attempt)
|
|
assert.True(t, state.Successful)
|
|
|
|
untouched, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
other := model.NewLogOther()
|
|
AppendRelayLogAdminInfo(untouched, nil, other)
|
|
assert.NotContains(t, other.Snapshot()["admin_info"], "request_policy", "requests without decisions do not carry an empty record")
|
|
}
|