ginuerzh
9febb23bc9
Prevent data loss and nil panics across 5 parse functions: - chain: nil-guard hop entries to avoid deref on empty YAML lists - hop: build merged metadata map instead of writing inherited values into the original NodeConfig; swap+restore around ParseNode call - node: use local connCfg/dialCfg instead of overwriting cfg.Connector and cfg.Dialer fields; only fill in Type when empty - parser: preserve existing config file fields when env vars override Level/Addr (was replacing the entire struct) - router: only update ipNet from dst CIDR if parse succeeds, keeping the route.Net fallback instead of overwriting with nil
57 lines
1.1 KiB
Go
57 lines
1.1 KiB
Go
package chain
|
|
|
|
import (
|
|
"github.com/go-gost/core/chain"
|
|
"github.com/go-gost/core/hop"
|
|
"github.com/go-gost/core/logger"
|
|
"github.com/go-gost/core/metadata"
|
|
xchain "github.com/go-gost/x/chain"
|
|
"github.com/go-gost/x/config"
|
|
hop_parser "github.com/go-gost/x/config/parsing/hop"
|
|
mdx "github.com/go-gost/x/metadata"
|
|
"github.com/go-gost/x/registry"
|
|
)
|
|
|
|
func ParseChain(cfg *config.ChainConfig, log logger.Logger) (chain.Chainer, error) {
|
|
if cfg == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
chainLogger := log.WithFields(map[string]any{
|
|
"kind": "chain",
|
|
"chain": cfg.Name,
|
|
})
|
|
|
|
var md metadata.Metadata
|
|
if cfg.Metadata != nil {
|
|
md = mdx.NewMetadata(cfg.Metadata)
|
|
}
|
|
|
|
c := xchain.NewChain(cfg.Name,
|
|
xchain.MetadataChainOption(md),
|
|
xchain.LoggerChainOption(chainLogger),
|
|
)
|
|
|
|
for _, ch := range cfg.Hops {
|
|
if ch == nil {
|
|
continue
|
|
}
|
|
|
|
var hop hop.Hop
|
|
var err error
|
|
|
|
if ch.Nodes != nil || ch.Plugin != nil {
|
|
if hop, err = hop_parser.ParseHop(ch, log); err != nil {
|
|
return nil, err
|
|
}
|
|
} else {
|
|
hop = registry.HopRegistry().Get(ch.Name)
|
|
}
|
|
if hop != nil {
|
|
c.AddHop(hop)
|
|
}
|
|
}
|
|
|
|
return c, nil
|
|
}
|