Skip to content

refactor: 移除viper/remote引用以解决依赖安全问题，改用etcd client #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ACaiCat merged 2 commits into from
Aug 1, 2026
Merged

refactor: 移除viper/remote引用以解决依赖安全问题，改用etcd client #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9400cca
refactor: 移除viper/remote引用以解决依赖安全问题，改用etcd client
Penty-d Aug 1, 2026
2a009af
fix: ci
Penty-d Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ limitations under the License.
package config

import (
"errors"
"log"
"bytes"
"context"
"os"
"path/filepath"
"time"

"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
_ "github.com/spf13/viper/remote"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/west2-online/fzuhelper-server/pkg/constants"
"github.com/west2-online/fzuhelper-server/pkg/logger"
Expand Down Expand Up @@ -56,10 +57,13 @@ var (
)

const (
remoteProvider = "etcd3" // 使用 etcd3
remotePath = "/config"
remoteFileName = "config"
remoteFileType = "yaml"
// remotePath 是配置在 etcd 中的存储 key，value 为 yaml 内容。
// 原实现通过 viper/remote + sagikazarmark/crypt 读取，但该依赖链会引入
// golang.org/x/crypto/openpgp（GO-2026-5932，该包无人维护、无修复版本），
// 因此改为直接使用 etcd client/v3 读取，行为保持一致。
remotePath = "/config"
remoteFileType = "yaml"
etcdReadTimeout = 3 * time.Second
)

func Init(service string) {
Expand All @@ -82,17 +86,30 @@ func InitFromETCD(service string) {
Etcd = &etcd{Addr: etcdAddr}

// 配置存储在 etcd 中
err := runtimeViper.AddRemoteProvider(remoteProvider, Etcd.Addr, remotePath)
cli, err := clientv3.New(clientv3.Config{
Endpoints: []string{etcdAddr},
})
if err != nil {
logger.Fatalf("config.Init: add remote provider error: %v", err)
logger.Fatalf("config.Init: create etcd client error: %v", err)
}
runtimeViper.SetConfigName(remoteFileName)
runtimeViper.SetConfigType(remoteFileType)
if err := runtimeViper.ReadRemoteConfig(); err != nil {
var configFileNotFoundError viper.ConfigFileNotFoundError
if errors.As(err, &configFileNotFoundError) {
log.Fatal("config.Init: could not find config files")
defer func() {
if err := cli.Close(); err != nil {
logger.Errorf("config.Init: close etcd client error: %v", err)
}
}()

ctx, cancel := context.WithTimeout(context.Background(), etcdReadTimeout)
defer cancel()
resp, err := cli.Get(ctx, remotePath)
if err != nil {
logger.Fatalf("config.Init: read config from etcd error: %v", err)
}
if len(resp.Kvs) != 1 {
logger.Fatalf("config.Init: config not found in etcd, key: %s", remotePath)
}

runtimeViper.SetConfigType(remoteFileType)
if err := runtimeViper.ReadConfig(bytes.NewReader(resp.Kvs[0].Value)); err != nil {
logger.Fatalf("config.Init: read config error: %v", err)
}
configMapping(service)
Expand Down
38 changes: 1 addition & 37 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ require (
github.com/sashabaranov/go-openai v1.41.2
github.com/segmentio/kafka-go v0.4.50
github.com/spf13/viper v1.21.0
github.com/spf13/viper/remote v1.20.1
github.com/upyun/go-sdk/v3 v3.0.4
github.com/west2-online/jwch v0.2.44
github.com/west2-online/yjsy v0.0.10
Expand Down Expand Up @@ -77,16 +76,9 @@ require (
)

require (
cloud.google.com/go v0.123.0 // indirect
cloud.google.com/go/auth v0.18.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/firestore v1.21.0 // indirect
cloud.google.com/go/longrunning v0.8.0 // indirect
filippo.io/edwards25519 v1.2.0 // indirect
github.com/antchfx/htmlquery v1.3.6 // indirect
github.com/antchfx/xpath v1.3.6 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic/loader v0.5.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand All @@ -102,9 +94,7 @@ require (
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
Expand All @@ -115,22 +105,9 @@ require (
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/hashicorp/consul/api v1.33.4 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-metrics v0.5.4 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/hashicorp/serf v0.10.2 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/jhump/protoreflect v1.18.0 // indirect
github.com/jhump/protoreflect/v2 v2.0.0-beta.2 // indirect
Expand All @@ -141,15 +118,9 @@ require (
github.com/klauspost/compress v1.18.4 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nats-io/nats.go v1.49.0 // indirect
github.com/nats-io/nkeys v0.4.15 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/petermattis/goid v0.0.0-20260226131333-17d1149c6ac6 // indirect
github.com/pierrec/lz4/v4 v4.1.26 // indirect
Expand All @@ -160,7 +131,6 @@ require (
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/sagikazarmark/crypt v0.31.0 // indirect
github.com/sagikazarmark/locafero v0.12.0 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.7 // indirect
Expand All @@ -181,11 +151,9 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/etcd/api/v3 v3.6.8 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.6.8 // indirect
go.etcd.io/etcd/client/v2 v2.305.27 // indirect
go.etcd.io/etcd/client/v3 v3.6.8 // indirect
go.etcd.io/etcd/client/v3 v3.6.8
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.44.0
go.opentelemetry.io/otel/metric v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0
Expand All @@ -195,14 +163,10 @@ require (
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/arch v0.24.0 // indirect
golang.org/x/crypto v0.52.0 // indirect
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/text v0.39.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/api v0.270.0 // indirect
google.golang.org/genproto v0.0.0-20260226221140-a57be14db171 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/grpc v1.82.1 // indirect
Expand Down
Loading