fix(s3): don't bind s3 port if s3 is not enabled (AlistGo#6291)

EtherealAO · Apr 12, 2024 · 9b24a91 · 9b24a91
1 parent 9168bb2
commit 9b24a91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/cmd/server.go b/cmd/server.go
@@ -91,10 +91,10 @@ the address is defined in config file`,
 				}
 			}()
 		}
-		s3r := gin.New()
-		s3r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
-		server.InitS3(s3r)
-		if conf.Conf.S3.Port != -1 {
+		if conf.Conf.S3.Port != -1 && conf.Conf.S3.Enable {
+			s3r := gin.New()
+			s3r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
+			server.InitS3(s3r)
 			s3Base := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.S3.Port)
 			utils.Log.Infof("start S3 server @ %s", s3Base)
 			go func() {

diff --git a/server/s3.go b/server/s3.go
@@ -34,12 +34,6 @@ func S3(g *gin.RouterGroup) {
 }
 
 func S3Server(g *gin.RouterGroup) {
-	if !conf.Conf.S3.Enable {
-		g.Any("/*path", func(c *gin.Context) {
-			common.ErrorStrResp(c, "S3 server is not enabled", 403)
-		})
-		return
-	}
 	h, _ := s3.NewServer(context.Background())
 	g.Any("/*path", gin.WrapH(h))
 }