mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-29 08:20:42 +01:00
Chris Lu
0ae7874ed9
validateReplicaTarget resolves the source hostname once, but the gRPC client resolved it again at connect, leaving a DNS-rebinding window for hostname sources. The copy and tail source dials now run through the same guardedDialerPolicy the remote-storage path uses, so every resolved address is re-checked against the replica deny list (private peers allowed) immediately before the TCP connect. guardedDialerPolicy also moves to util.OutboundDialContext so the guarded path keeps the -ip.bind source binding the default gRPC dialer had. The Rust volume server mirrors this with connect_guarded, a tonic connector that resolves, re-checks each address, and connects to the first passing IP; handlers use it whenever the untrusted-endpoint opt-out is off. A handler-level test now exercises the enabled validation branches for all three source-taking RPCs.
36 lines
1.7 KiB
Go
36 lines
1.7 KiB
Go
package operation
|
|
|
|
import (
|
|
"context"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
|
|
)
|
|
|
|
func WithVolumeServerClient(streamingMode bool, volumeServer pb.ServerAddress, grpcDialOption grpc.DialOption, fn func(volume_server_pb.VolumeServerClient) error) error {
|
|
return WithVolumeServerClientOptions(streamingMode, volumeServer, fn, grpcDialOption)
|
|
}
|
|
|
|
// WithVolumeServerClientOptions is WithVolumeServerClient with extra dial
|
|
// options appended after the TLS option, so a caller dialing an untrusted
|
|
// source address can pin the validated endpoint at connect time.
|
|
func WithVolumeServerClientOptions(streamingMode bool, volumeServer pb.ServerAddress, fn func(volume_server_pb.VolumeServerClient) error, grpcDialOptions ...grpc.DialOption) error {
|
|
|
|
return pb.WithGrpcClient(context.Background(), streamingMode, 0, func(grpcConnection *grpc.ClientConn) error {
|
|
client := volume_server_pb.NewVolumeServerClient(grpcConnection)
|
|
return fn(client)
|
|
}, volumeServer.ToGrpcAddress(), false, grpcDialOptions...)
|
|
|
|
}
|
|
|
|
// WithMasterServerClient threads the caller's per-request context into the
|
|
// connection-invalidation decision, so a Canceled/DeadlineExceeded from the
|
|
// caller's own timeout does not invalidate the shared cached master connection.
|
|
// Pass context.Background() when there is no per-request deadline to honor.
|
|
func WithMasterServerClient(ctx context.Context, streamingMode bool, masterServer pb.ServerAddress, grpcDialOption grpc.DialOption, fn func(masterClient master_pb.SeaweedClient) error) error {
|
|
return pb.WithMasterClient(ctx, streamingMode, masterServer, grpcDialOption, false, fn)
|
|
}
|