Added loadSecurityConfigOnce (#5792)

2025-09-22 20:53:32 +08:00 · 2024-07-16 19:15:55 +03:00
parent 67edf1d014
commit b796c21fa9
29 changed files with 35 additions and 28 deletions
--- a/weed/command/backup.go
+++ b/weed/command/backup.go
@@ -66,7 +66,7 @@ var cmdBackup = &Command{

 func runBackup(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")

 	if *s.volumeId == -1 {
--- a/weed/command/benchmark.go
+++ b/weed/command/benchmark.go
@@ -111,7 +111,7 @@ var (

 func runBenchmark(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	b.grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")

 	fmt.Printf("This is SeaweedFS version %s %s %s\n", util.Version(), runtime.GOOS, runtime.GOARCH)
--- a/weed/command/download.go
+++ b/weed/command/download.go
@@ -47,7 +47,7 @@ var cmdDownload = &Command{
 }

 func runDownload(cmd *Command, args []string) bool {
-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")

 	for _, fid := range args {
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -178,7 +178,7 @@ func runFiler(cmd *Command, args []string) bool {
 		go http.ListenAndServe(fmt.Sprintf(":%d", *f.debugPort), nil)
 	}

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	switch {
 	case *f.metricsHttpIp != "":
--- a/weed/command/filer_backup.go
+++ b/weed/command/filer_backup.go
@@ -59,7 +59,7 @@ var cmdFilerBackup = &Command{

 func runFilerBackup(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	util.LoadConfiguration("replication", true)

 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
--- a/weed/command/filer_cat.go
+++ b/weed/command/filer_cat.go
@@ -59,7 +59,7 @@ var cmdFilerCat = &Command{

 func runFilerCat(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	if len(args) == 0 {
 		return false
--- a/weed/command/filer_copy.go
+++ b/weed/command/filer_copy.go
@@ -83,7 +83,7 @@ var cmdFilerCopy = &Command{

 func runCopy(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	if len(args) <= 1 {
 		return false
--- a/weed/command/filer_meta_backup.go
+++ b/weed/command/filer_meta_backup.go
@@ -56,7 +56,7 @@ The backup writes to another filer store specified in a backup_filer.toml.

 func runFilerMetaBackup(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	metaBackup.grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")

 	// load backup_filer.toml
--- a/weed/command/filer_meta_tail.go
+++ b/weed/command/filer_meta_tail.go
@@ -45,7 +45,7 @@ var (

 func runFilerMetaTail(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
 	clientId := util.RandomInt32()

--- a/weed/command/filer_remote_gateway.go
+++ b/weed/command/filer_remote_gateway.go
@@ -78,7 +78,7 @@ var cmdFilerRemoteGateway = &Command{

 func runFilerRemoteGateway(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
 	remoteGatewayOptions.grpcDialOption = grpcDialOption

--- a/weed/command/filer_remote_sync.go
+++ b/weed/command/filer_remote_sync.go
@@ -73,7 +73,7 @@ var cmdFilerRemoteSynchronize = &Command{

 func runFilerRemoteSynchronize(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
 	remoteSyncOptions.grpcDialOption = grpcDialOption

--- a/weed/command/filer_replication.go
+++ b/weed/command/filer_replication.go
@@ -30,7 +30,7 @@ var cmdFilerReplicate = &Command{

 func runFilerReplicate(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	util.LoadConfiguration("replication", true)
 	util.LoadConfiguration("notification", true)
 	config := util.GetViper()
--- a/weed/command/filer_sync.go
+++ b/weed/command/filer_sync.go
@@ -118,7 +118,7 @@ var cmdFilerSynchronize = &Command{

 func runFilerSynchronize(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")

 	grace.SetupProfiling(*syncCpuProfile, *syncMemProfile)
--- a/weed/command/iam.go
+++ b/weed/command/iam.go
@@ -47,7 +47,7 @@ func runIam(cmd *Command, args []string) bool {
 func (iamopt *IamOptions) startIamServer() bool {
 	filerAddress := pb.ServerAddress(*iamopt.filer)

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
 	for {
 		err := pb.WithGrpcFilerClient(false, 0, filerAddress, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -105,7 +105,7 @@ var (

 func runMaster(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	util.LoadConfiguration("master", false)

 	grace.SetupProfiling(*masterCpuProfile, *masterMemProfile)
--- a/weed/command/master_follower.go
+++ b/weed/command/master_follower.go
@@ -68,7 +68,7 @@ var cmdMasterFollower = &Command{

 func runMasterFollower(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	util.LoadConfiguration("master", false)

 	if *mf.portGrpc == 0 {
--- a/weed/command/mount_std.go
+++ b/weed/command/mount_std.go
@@ -66,7 +66,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {

 	// try to connect to filer
 	filerAddresses := pb.ServerAddresses(*option.filer).ToAddresses()
-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
 	var cipher bool
 	var err error
--- a/weed/command/mq_broker.go
+++ b/weed/command/mq_broker.go
@@ -54,7 +54,7 @@ var cmdMqBroker = &Command{

 func runMqBroker(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	mqBrokerStandaloneOptions.masters = pb.ServerAddresses(*mqBrokerStandaloneOptions.mastersString).ToAddressMap()

--- a/weed/command/s3.go
+++ b/weed/command/s3.go
@@ -165,7 +165,7 @@ var cmdS3 = &Command{

 func runS3(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	switch {
 	case *s3StandaloneOptions.metricsHttpIp != "":
--- a/weed/command/server.go
+++ b/weed/command/server.go
@@ -179,7 +179,7 @@ func runServer(cmd *Command, args []string) bool {
 		go http.ListenAndServe(fmt.Sprintf(":%d", *serverOptions.debugPort), nil)
 	}

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	util.LoadConfiguration("master", false)

 	grace.SetupProfiling(*serverOptions.cpuprofile, *serverOptions.memprofile)
--- a/weed/command/shell.go
+++ b/weed/command/shell.go
@@ -35,7 +35,7 @@ var cmdShell = &Command{

 func runShell(command *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	shellOptions.GrpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")
 	shellOptions.Directory = "/"

--- a/weed/command/upload.go
+++ b/weed/command/upload.go
@@ -69,7 +69,7 @@ var cmdUpload = &Command{

 func runUpload(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")

 	defaultReplication, err := readMasterConfiguration(grpcDialOption, pb.ServerAddress(*upload.master))
--- a/weed/command/volume.go
+++ b/weed/command/volume.go
@@ -125,7 +125,7 @@ var (

 func runVolume(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	// If --pprof is set we assume the caller wants to be able to collect
 	// cpu and memory profiles via go tool pprof
--- a/weed/command/webdav.go
+++ b/weed/command/webdav.go
@@ -60,7 +60,7 @@ var cmdWebDav = &Command{

 func runWebDav(cmd *Command, args []string) bool {

-	util.LoadConfiguration("security", false)
+	util.LoadSecurityConfiguration()

 	glog.V(0).Infof("Starting Seaweed WebDav Server %s at https port %d", util.Version(), *webDavStandaloneOptions.port)