hy/hyapp-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小优化

Browse Source
This commit is contained in:
zhx 2026-06-30 11:38:54 +08:00
parent 82dd3cc300
commit e953d55bc7
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/admin/internal/modules/regionblock/service.go
View File

@ -19,10 +19,10 @@ import (
) )
const ( const (
maxRegionBlockKeywords = 200 maxRegionBlockKeywords = 200
maxRegionBlockKeywordLength = 128 maxRegionBlockKeywordLength = 128
maxIPWhitelistItems = 500 maxIPWhitelistItems = 500
maxUserWhitelistItems = 500 maxUserWhitelistItems = 500
maxUserWhitelistLookupLength = 64 maxUserWhitelistLookupLength = 64
) )
@ -282,7 +282,10 @@ func (s *Service) normalizeUserIDWhitelist(ctx context.Context, requestID string
return nil, errInvalidPayload return nil, errInvalidPayload
} }
userID, err := s.resolveWhitelistUserID(ctx, requestID, value) userID, err := s.resolveWhitelistUserID(ctx, requestID, value)
if err != nil || userID <= 0 { if err != nil {
return nil, err
}
if userID <= 0 {
return nil, errInvalidPayload return nil, errInvalidPayload
} }
if _, ok := seen[userID]; ok { if _, ok := seen[userID]; ok {

16
server/admin/internal/modules/regionblock/service_test.go
View File

@ -17,6 +17,7 @@ type fakeWhitelistCacheUserClient struct {
called bool called bool
err error err error
resolveErr error
users map[int64]*userclient.User users map[int64]*userclient.User
identities map[string]*userclient.UserIdentity identities map[string]*userclient.UserIdentity
} }
@ -36,6 +37,9 @@ func (f *fakeWhitelistCacheUserClient) ResolveDisplayUserID(_ context.Context, r
if req.RequestID != "req-refresh" || req.Caller != "admin-server" { if req.RequestID != "req-refresh" || req.Caller != "admin-server" {
return nil, errors.New("unexpected resolve request") return nil, errors.New("unexpected resolve request")
} }
if f.resolveErr != nil {
return nil, f.resolveErr
}
if identity := f.identities[req.DisplayUserID]; identity != nil { if identity := f.identities[req.DisplayUserID]; identity != nil {
return identity, nil return identity, nil
} }
@ -81,6 +85,18 @@ func TestNormalizeUserIDWhitelistRejectsInvalidID(t *testing.T) {
} }
} }
func TestNormalizeUserIDWhitelistKeepsUserServiceError(t *testing.T) {
upstreamErr := status.Error(codes.Unavailable, "user-service unavailable")
service := NewService(nil, &fakeWhitelistCacheUserClient{resolveErr: upstreamErr})
_, err := service.normalizeUserIDWhitelist(context.Background(), "req-refresh", []string{"VIP2026"})
if !errors.Is(err, upstreamErr) {
t.Fatalf("normalize error = %v, want upstream error", err)
}
if errors.Is(err, errInvalidPayload) {
t.Fatalf("normalize error = %v, should not be mapped to invalid payload", err)
}
}
func TestRefreshWhitelistCacheMapsUserServiceError(t *testing.T) { func TestRefreshWhitelistCacheMapsUserServiceError(t *testing.T) {
client := &fakeWhitelistCacheUserClient{err: errors.New("rpc down")} client := &fakeWhitelistCacheUserClient{err: errors.New("rpc down")}
service := NewService(nil, client) service := NewService(nil, client)