mirror of
https://github.com/fatedier/frp.git
synced 2026-03-17 23:39:16 +08:00
* server/group: refactor group package with shared abstractions and fix concurrency issues Extract common patterns into reusable components: - groupRegistry[G]: generic concurrent map for group lifecycle management - baseGroup: shared plumbing for listener-based groups (TCP, HTTPS, TCPMux) - Listener: unified virtual listener replacing 3 identical implementations Fix concurrency issues: - Stale-pointer race: isCurrent check + errGroupStale + controller retry loops - Worker generation safety: pass realLn and acceptCh as params instead of reading mutable fields - Connection leak: close conn on worker panic recovery path - ABBA deadlock in HTTP UnRegister: consistent lock ordering (group.mu -> registry.mu) - Round-robin overflow in HTTPGroup: use unsigned modulo Add unit tests (17 tests) for registry, listener, and baseGroup. Add TCPMux group load balancing e2e test. * server/group: replace tautological assertion with require.NotPanics * server/group: remove blank line between doc comment and type declaration
130 lines
3.7 KiB
Go
130 lines
3.7 KiB
Go
// Copyright 2020 guylewin, guy@lewin.co.il
|
|
//
|
|
// 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 group
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
|
|
v1 "github.com/fatedier/frp/pkg/config/v1"
|
|
"github.com/fatedier/frp/pkg/util/tcpmux"
|
|
"github.com/fatedier/frp/pkg/util/vhost"
|
|
)
|
|
|
|
// TCPMuxGroupCtl manages all TCPMuxGroups.
|
|
type TCPMuxGroupCtl struct {
|
|
groupRegistry[*TCPMuxGroup]
|
|
tcpMuxHTTPConnectMuxer *tcpmux.HTTPConnectTCPMuxer
|
|
}
|
|
|
|
// NewTCPMuxGroupCtl returns a new TCPMuxGroupCtl.
|
|
func NewTCPMuxGroupCtl(tcpMuxHTTPConnectMuxer *tcpmux.HTTPConnectTCPMuxer) *TCPMuxGroupCtl {
|
|
return &TCPMuxGroupCtl{
|
|
groupRegistry: newGroupRegistry[*TCPMuxGroup](),
|
|
tcpMuxHTTPConnectMuxer: tcpMuxHTTPConnectMuxer,
|
|
}
|
|
}
|
|
|
|
// Listen is the wrapper for TCPMuxGroup's Listen.
|
|
// If there is no group, one will be created.
|
|
func (tmgc *TCPMuxGroupCtl) Listen(
|
|
ctx context.Context,
|
|
multiplexer, group, groupKey string,
|
|
routeConfig vhost.RouteConfig,
|
|
) (l net.Listener, err error) {
|
|
for {
|
|
tcpMuxGroup := tmgc.getOrCreate(group, func() *TCPMuxGroup {
|
|
return NewTCPMuxGroup(tmgc)
|
|
})
|
|
|
|
switch v1.TCPMultiplexerType(multiplexer) {
|
|
case v1.TCPMultiplexerHTTPConnect:
|
|
l, err = tcpMuxGroup.HTTPConnectListen(ctx, group, groupKey, routeConfig)
|
|
if err == errGroupStale {
|
|
continue
|
|
}
|
|
return
|
|
default:
|
|
return nil, fmt.Errorf("unknown multiplexer [%s]", multiplexer)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TCPMuxGroup routes connections to different proxies.
|
|
type TCPMuxGroup struct {
|
|
baseGroup
|
|
|
|
domain string
|
|
routeByHTTPUser string
|
|
username string
|
|
password string
|
|
ctl *TCPMuxGroupCtl
|
|
}
|
|
|
|
// NewTCPMuxGroup returns a new TCPMuxGroup.
|
|
func NewTCPMuxGroup(ctl *TCPMuxGroupCtl) *TCPMuxGroup {
|
|
return &TCPMuxGroup{
|
|
ctl: ctl,
|
|
}
|
|
}
|
|
|
|
// HTTPConnectListen will return a new Listener.
|
|
// If TCPMuxGroup already has a listener, just add a new Listener to the queues,
|
|
// otherwise listen on the real address.
|
|
func (tmg *TCPMuxGroup) HTTPConnectListen(
|
|
ctx context.Context,
|
|
group, groupKey string,
|
|
routeConfig vhost.RouteConfig,
|
|
) (ln *Listener, err error) {
|
|
tmg.mu.Lock()
|
|
defer tmg.mu.Unlock()
|
|
if !tmg.ctl.isCurrent(group, func(cur *TCPMuxGroup) bool { return cur == tmg }) {
|
|
return nil, errGroupStale
|
|
}
|
|
if len(tmg.lns) == 0 {
|
|
// the first listener, listen on the real address
|
|
tcpMuxLn, errRet := tmg.ctl.tcpMuxHTTPConnectMuxer.Listen(ctx, &routeConfig)
|
|
if errRet != nil {
|
|
return nil, errRet
|
|
}
|
|
|
|
tmg.domain = routeConfig.Domain
|
|
tmg.routeByHTTPUser = routeConfig.RouteByHTTPUser
|
|
tmg.username = routeConfig.Username
|
|
tmg.password = routeConfig.Password
|
|
tmg.initBase(group, groupKey, tcpMuxLn, func() {
|
|
tmg.ctl.removeIf(tmg.group, func(cur *TCPMuxGroup) bool {
|
|
return cur == tmg
|
|
})
|
|
})
|
|
ln = tmg.newListener(tcpMuxLn.Addr())
|
|
go tmg.worker(tcpMuxLn, tmg.acceptCh)
|
|
} else {
|
|
// route config in the same group must be equal
|
|
if tmg.group != group || tmg.domain != routeConfig.Domain ||
|
|
tmg.routeByHTTPUser != routeConfig.RouteByHTTPUser ||
|
|
tmg.username != routeConfig.Username ||
|
|
tmg.password != routeConfig.Password {
|
|
return nil, ErrGroupParamsInvalid
|
|
}
|
|
if tmg.groupKey != groupKey {
|
|
return nil, ErrGroupAuthFailed
|
|
}
|
|
ln = tmg.newListener(tmg.lns[0].Addr())
|
|
}
|
|
return
|
|
}
|