mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-30 08:50:48 +01:00
* remote: reuse one guarded remote storage client per configuration BuildGuardedRemoteStorageClient (the filer's lazy remote stat and list, remote deletes and renames, the volume server's cold reads, the S3 gateway's remote reads) built a new client, with its own http.Transport, on every call. Each transport kept its connection idle for IdleConnTimeout (60s) and was never reused or closed, so a steady stream of remote lookups held one open connection per request. An endpoint that caps connections per source then refuses every new connection. - remote_storage: GetRemoteStorage's per-name cache becomes a bounded LRU (WEED_REMOTE_CLIENT_CACHE_MAX, default 64) keyed by kind, name, a hash of the whole configuration and a credentials version, built outside the lock once per key (singleflight) from a copy of the configuration. A client leaving the cache has its idle connections closed. GetRemoteStorageWith exposes the cache to other builders. - BuildGuardedRemoteStorageClient caches the guarded client per configuration. The endpoint is checked against the deny-list when a client is built; every new connection still dials through the guarded dialer. A gcs credentials file, and for an S3-compatible remote using the default credential chain the shared credentials file and AWS_* variables, are part of the key by content. - The shared transport keeps 32 idle connections per host, caps connections per host (WEED_REMOTE_MAX_CONNS_PER_HOST, default 64) and has dial, TLS handshake and response header deadlines, so a hung remote frees its slots. - The filer drops the clients of removed remotes (and all but the newest client per name) on every /etc/remote reload, also when /etc/remote does not exist; reloads are serialized. * remote: drop clients whose build spans a reload or whose remote is gone * server: hash the shared AWS config file into the guarded credential version * server: bound a stalled body on the shared remote transport * remote: waive path-injection on the configured credentials file * remote: keep caching remotes the local filer does not name * remote: drop the inline codeql waiver the analyzer ignores * remote: version the plain gcs client's credentials file * remote: hash the environment's inline gcs credentials GOOGLE_APPLICATION_CREDENTIALS can hold the JSON itself, which the gcs client accepts; it is not in the configuration hash, so a changed value kept the old client. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * remote: version the well-known gcs credentials file With neither the configuration nor GOOGLE_APPLICATION_CREDENTIALS set, the SDK reads application_default_credentials.json; rotating it left the cache key unchanged and the old client behind. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * remote: share the gcs credentials version with the guarded client The guarded gcs client resolves the same environment and well-known credentials as the plain one; keying it only on a configured path left those rotations invisible to the cache. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * remote: version s3 keys resolved from the environment A remote whose access and secret keys both arrive through its type's environment fallback (aliyun, baidu, contabo, filebase, storj, tencent) never entered the default-chain branch of guardedCredentialsVersion, so an in-process environment change kept serving the stale cached client. The version now hashes the resolved keys for every S3-compatible remote. * volume: reuse one remote storage client per configuration (rust) fetch_and_write_needle built a fresh aws_sdk_s3::Client per request, so every cold read kept its connector's idle connections without ever reusing them — the same leak the Go side fixes. Cache clients keyed by the configuration's protobuf encoding in an LRU of WEED_REMOTE_CLIENT_CACHE_MAX entries (default 64), mirroring weed/remote_storage/client_cache.go. An evicted entry drops the client's last Arc and with it the connector's idle connections. The per-request endpoint validation is unchanged: Rust has no dial-time guard yet, so the up-front DNS check stays on every call. --------- Co-authored-by: user.email <chrislusf@users.noreply.github.com> Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
292 lines
11 KiB
Go
292 lines
11 KiB
Go
package filer
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"math"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/remote_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/remote_storage"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/viant/ptrie"
|
|
)
|
|
|
|
const REMOTE_STORAGE_CONF_SUFFIX = ".conf"
|
|
const REMOTE_STORAGE_MOUNT_FILE = "mount.mapping"
|
|
|
|
// RemoteStorageConfValidator rejects a RemoteConf whose endpoint resolves to
|
|
// an address the filer must not dial (loopback / link-local / private / IMDS).
|
|
// The filer server injects the volume server's SSRF deny-list validator so the
|
|
// filer package — which cannot import the server package — applies the same
|
|
// check the volume server's BuildGuardedRemoteStorageClient does. A nil
|
|
// validator leaves the historical unguarded behavior for unit tests that
|
|
// never dial.
|
|
type RemoteStorageConfValidator func(ctx context.Context, conf *remote_pb.RemoteConf) error
|
|
|
|
type FilerRemoteStorage struct {
|
|
// guards rules and storageNameToConf, which are replaced wholesale
|
|
// whenever /etc/remote changes
|
|
mu sync.RWMutex
|
|
reloadMu sync.Mutex // serializes reloads, so an older listing never overwrites a newer one
|
|
rules ptrie.Trie[*remote_pb.RemoteStorageLocation]
|
|
mountDirs []util.FullPath
|
|
storageNameToConf map[string]*remote_pb.RemoteConf
|
|
// confValidator, when set, is applied to every RemoteConf as it is loaded
|
|
// from /etc/remote. A conf that fails is dropped from storageNameToConf so
|
|
// the lazy-fetch, lazy-list, and remote-delete paths (which resolve clients
|
|
// by name) can never dial its endpoint. This closes the unauthenticated-plant
|
|
// SSRF: a conf written to /etc/remote with a loopback S3 endpoint is rejected
|
|
// at reload instead of being dialed on the next cache miss.
|
|
confValidator RemoteStorageConfValidator
|
|
}
|
|
|
|
// RemoteStorageClientBuilder builds a remote-storage client for a conf. The
|
|
// filer server sets it to the guarded builder (endpoint deny-list + DNS
|
|
// rebinding-safe dialer) so the lazy-remote paths apply the same SSRF checks
|
|
// as the volume and streaming read paths. When nil the lazy paths fall back to
|
|
// the shared unguarded cache.
|
|
type RemoteStorageClientBuilder func(ctx context.Context, remoteConf *remote_pb.RemoteConf, allowUntrusted bool) (remote_storage.RemoteStorageClient, error)
|
|
|
|
func NewFilerRemoteStorage() (rs *FilerRemoteStorage) {
|
|
rs = &FilerRemoteStorage{
|
|
rules: ptrie.New[*remote_pb.RemoteStorageLocation](),
|
|
storageNameToConf: make(map[string]*remote_pb.RemoteConf),
|
|
}
|
|
return rs
|
|
}
|
|
|
|
// SetConfValidator installs the SSRF deny-list validator applied to every
|
|
// RemoteConf loaded from /etc/remote. It is called once by the filer server
|
|
// after construction.
|
|
func (rs *FilerRemoteStorage) SetConfValidator(v RemoteStorageConfValidator) {
|
|
rs.mu.Lock()
|
|
rs.confValidator = v
|
|
rs.mu.Unlock()
|
|
}
|
|
|
|
func (rs *FilerRemoteStorage) LoadRemoteStorageConfigurationsAndMapping(filer *Filer) (err error) {
|
|
// execute this on filer
|
|
|
|
// reloads run one at a time, so the listing a reload applies (and the cached
|
|
// clients it retains) is never older than one already applied
|
|
rs.reloadMu.Lock()
|
|
defer rs.reloadMu.Unlock()
|
|
|
|
limit := int64(math.MaxInt32)
|
|
|
|
entries, _, err := filer.ListDirectoryEntries(context.Background(), DirectoryEtcRemote, "", false, limit, "", "", "")
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
// no /etc/remote: no remote is configured, so none keeps a client
|
|
remote_storage.RetainRemoteStorages(nil)
|
|
return nil
|
|
}
|
|
glog.Errorf("read remote storage %s: %v", DirectoryEtcRemote, err)
|
|
return
|
|
}
|
|
|
|
// build into fresh containers so an unmounted directory disappears instead
|
|
// of lingering in the trie, which has no way to drop a key
|
|
rules := ptrie.New[*remote_pb.RemoteStorageLocation]()
|
|
var mountDirs []util.FullPath
|
|
storageNameToConf := make(map[string]*remote_pb.RemoteConf)
|
|
|
|
for _, entry := range entries {
|
|
if entry.Name() == REMOTE_STORAGE_MOUNT_FILE {
|
|
mountDirs, err = loadRemoteStorageMountMapping(rules, entry.Content)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
continue
|
|
}
|
|
if !strings.HasSuffix(entry.Name(), REMOTE_STORAGE_CONF_SUFFIX) {
|
|
continue
|
|
}
|
|
conf := &remote_pb.RemoteConf{}
|
|
if err := proto.Unmarshal(entry.Content, conf); err != nil {
|
|
return fmt.Errorf("unmarshal %s/%s: %v", DirectoryEtcRemote, entry.Name(), err)
|
|
}
|
|
if rs.confValidator != nil {
|
|
if vErr := rs.confValidator(context.Background(), conf); vErr != nil {
|
|
// Drop the conf rather than fail the whole load: a single bad conf
|
|
// must not evict the rest of /etc/remote, and the mount mapping that
|
|
// references it resolves to "no client" on the lazy paths instead
|
|
// of dialing the blocked endpoint.
|
|
glog.Warningf("reject remote storage conf %s/%s: %v", DirectoryEtcRemote, entry.Name(), vErr)
|
|
continue
|
|
}
|
|
}
|
|
storageNameToConf[conf.Name] = conf
|
|
}
|
|
|
|
rs.mu.Lock()
|
|
rs.rules, rs.mountDirs, rs.storageNameToConf = rules, mountDirs, storageNameToConf
|
|
rs.mu.Unlock()
|
|
|
|
// a remote removed from /etc/remote keeps no cached client and no open connections
|
|
names := make(map[string]bool, len(storageNameToConf))
|
|
for name := range storageNameToConf {
|
|
names[name] = true
|
|
}
|
|
remote_storage.RetainRemoteStorages(names)
|
|
|
|
return nil
|
|
}
|
|
|
|
func loadRemoteStorageMountMapping(rules ptrie.Trie[*remote_pb.RemoteStorageLocation], data []byte) (mountDirs []util.FullPath, err error) {
|
|
mappings := &remote_pb.RemoteStorageMapping{}
|
|
if err := proto.Unmarshal(data, mappings); err != nil {
|
|
return nil, fmt.Errorf("unmarshal %s/%s: %v", DirectoryEtcRemote, REMOTE_STORAGE_MOUNT_FILE, err)
|
|
}
|
|
for dir, storageLocation := range mappings.Mappings {
|
|
putDirectoryToRemoteStorage(rules, util.FullPath(dir), storageLocation)
|
|
mountDirs = append(mountDirs, util.FullPath(dir))
|
|
}
|
|
return mountDirs, nil
|
|
}
|
|
|
|
func (rs *FilerRemoteStorage) mapDirectoryToRemoteStorage(dir util.FullPath, loc *remote_pb.RemoteStorageLocation) {
|
|
rs.mu.Lock()
|
|
defer rs.mu.Unlock()
|
|
putDirectoryToRemoteStorage(rs.rules, dir, loc)
|
|
found := false
|
|
for _, d := range rs.mountDirs {
|
|
if d == dir {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
rs.mountDirs = append(rs.mountDirs, dir)
|
|
}
|
|
}
|
|
|
|
// MountedDirectories returns the directories currently mapped to remote
|
|
// storage, for callers that must reason about every mount rather than one path.
|
|
func (rs *FilerRemoteStorage) MountedDirectories() []util.FullPath {
|
|
rs.mu.RLock()
|
|
defer rs.mu.RUnlock()
|
|
return append([]util.FullPath(nil), rs.mountDirs...)
|
|
}
|
|
|
|
func putDirectoryToRemoteStorage(rules ptrie.Trie[*remote_pb.RemoteStorageLocation], dir util.FullPath, loc *remote_pb.RemoteStorageLocation) {
|
|
rules.Put([]byte(dir+"/"), loc)
|
|
}
|
|
|
|
// FindMountDirectory returns the mount directory and location for p. When multiple
|
|
// mounts match (e.g. /buckets/b and /buckets/b/prefix), ptrie MatchPrefix visits
|
|
// shorter prefixes first, so the last match is the longest prefix.
|
|
func (rs *FilerRemoteStorage) FindMountDirectory(p util.FullPath) (mountDir util.FullPath, remoteLocation *remote_pb.RemoteStorageLocation) {
|
|
rs.mu.RLock()
|
|
defer rs.mu.RUnlock()
|
|
rs.rules.MatchPrefix([]byte(p), func(key []byte, value *remote_pb.RemoteStorageLocation) bool {
|
|
mountDir = util.FullPath(string(key[:len(key)-1]))
|
|
remoteLocation = value
|
|
return true
|
|
})
|
|
return
|
|
}
|
|
|
|
func (rs *FilerRemoteStorage) FindRemoteStorageClient(p util.FullPath) (client remote_storage.RemoteStorageClient, remoteConf *remote_pb.RemoteConf, found bool) {
|
|
_, storageLocation := rs.FindMountDirectory(p)
|
|
if storageLocation == nil {
|
|
return nil, nil, false
|
|
}
|
|
|
|
return rs.GetRemoteStorageClient(storageLocation.Name)
|
|
}
|
|
|
|
func (rs *FilerRemoteStorage) GetRemoteStorageClient(storageName string) (client remote_storage.RemoteStorageClient, remoteConf *remote_pb.RemoteConf, found bool) {
|
|
rs.mu.RLock()
|
|
remoteConf, found = rs.storageNameToConf[storageName]
|
|
rs.mu.RUnlock()
|
|
if !found {
|
|
return
|
|
}
|
|
|
|
var err error
|
|
if client, err = remote_storage.GetRemoteStorage(remoteConf); err == nil {
|
|
found = true
|
|
return
|
|
}
|
|
return
|
|
}
|
|
|
|
func (rs *FilerRemoteStorage) FindRemoteStorageConf(p util.FullPath) (*remote_pb.RemoteConf, bool) {
|
|
_, storageLocation := rs.FindMountDirectory(p)
|
|
if storageLocation == nil {
|
|
return nil, false
|
|
}
|
|
return rs.GetRemoteStorageConf(storageLocation.Name)
|
|
}
|
|
|
|
func (rs *FilerRemoteStorage) GetRemoteStorageConf(storageName string) (*remote_pb.RemoteConf, bool) {
|
|
rs.mu.RLock()
|
|
defer rs.mu.RUnlock()
|
|
conf, found := rs.storageNameToConf[storageName]
|
|
return conf, found
|
|
}
|
|
|
|
func UnmarshalRemoteStorageMappings(oldContent []byte) (mappings *remote_pb.RemoteStorageMapping, err error) {
|
|
mappings = &remote_pb.RemoteStorageMapping{
|
|
Mappings: make(map[string]*remote_pb.RemoteStorageLocation),
|
|
}
|
|
if len(oldContent) > 0 {
|
|
if err = proto.Unmarshal(oldContent, mappings); err != nil {
|
|
glog.Warningf("unmarshal existing mappings: %v", err)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func ReadRemoteStorageConf(grpcDialOption grpc.DialOption, filerAddress pb.ServerAddress, storageName string) (conf *remote_pb.RemoteConf, readErr error) {
|
|
var oldContent []byte
|
|
if readErr = pb.WithFilerClient(false, 0, filerAddress, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
|
|
oldContent, readErr = ReadInsideFiler(context.Background(), client, DirectoryEtcRemote, storageName+REMOTE_STORAGE_CONF_SUFFIX)
|
|
return readErr
|
|
}); readErr != nil {
|
|
return nil, readErr
|
|
}
|
|
|
|
// unmarshal storage configuration
|
|
conf = &remote_pb.RemoteConf{}
|
|
if unMarshalErr := proto.Unmarshal(oldContent, conf); unMarshalErr != nil {
|
|
readErr = fmt.Errorf("unmarshal %s/%s: %v", DirectoryEtcRemote, storageName+REMOTE_STORAGE_CONF_SUFFIX, unMarshalErr)
|
|
return
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func DetectMountInfo(grpcDialOption grpc.DialOption, filerAddress pb.ServerAddress, dir string) (*remote_pb.RemoteStorageMapping, string, *remote_pb.RemoteStorageLocation, *remote_pb.RemoteConf, error) {
|
|
|
|
mappings, listErr := ReadMountMappings(grpcDialOption, filerAddress)
|
|
if listErr != nil {
|
|
return nil, "", nil, nil, listErr
|
|
}
|
|
if dir == "" {
|
|
return mappings, "", nil, nil, fmt.Errorf("need to specify '-dir' option")
|
|
}
|
|
|
|
localMountedDir, remoteStorageMountedLocation, findErr := FindMountedRemoteMapping(mappings, dir)
|
|
if findErr != nil {
|
|
return mappings, localMountedDir, remoteStorageMountedLocation, nil, findErr
|
|
}
|
|
|
|
// find remote storage configuration
|
|
remoteStorageConf, err := ReadRemoteStorageConf(grpcDialOption, filerAddress, remoteStorageMountedLocation.Name)
|
|
if err != nil {
|
|
return mappings, localMountedDir, remoteStorageMountedLocation, remoteStorageConf, err
|
|
}
|
|
|
|
return mappings, localMountedDir, remoteStorageMountedLocation, remoteStorageConf, nil
|
|
}
|