CasaOS - A simple, easy-to-use, elegant open-source Personal Cloud system.
fix potential goroutine leak due to http request without a timeout (#656)
Tiger Wang29e701cb7ca5
diff --git a/go.mod b/go.modindex 737616a..b6ca74b 100644--- a/go.mod+++ b/go.mod@@ -4,7 +4,7 @@ go 1.16require (github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d- github.com/IceWhaleTech/CasaOS-Common v0.3.7-1+ github.com/IceWhaleTech/CasaOS-Common v0.3.7-5github.com/IceWhaleTech/CasaOS-Gateway v0.3.6github.com/Microsoft/go-winio v0.5.0 // indirectgithub.com/ambelovsky/go-structs v1.1.0 // indirectdiff --git a/go.sum b/go.sumindex 91fafb3..2443326 100644--- a/go.sum+++ b/go.sum@@ -84,8 +84,8 @@ github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63dgithub.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d/go.mod h1:lW9x+yEjqKdPbE3+cf2fGPJXCw/hChX3Omi9QHTLFsQ=github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=-github.com/IceWhaleTech/CasaOS-Common v0.3.7-1 h1:paay9dFGAWjNcjtCrN6ymvuU21KtxPoIpNG3wo10ufk=-github.com/IceWhaleTech/CasaOS-Common v0.3.7-1/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=+github.com/IceWhaleTech/CasaOS-Common v0.3.7-5 h1:CLPeUaFoGCA3WNnOWxtdFbBmLIg7odCQglZJ/c878uU=+github.com/IceWhaleTech/CasaOS-Common v0.3.7-5/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=github.com/IceWhaleTech/CasaOS-Gateway v0.3.6 h1:2tQQo85+jzbbjqIsKKn77QlAA73bc7vZsVCFvWnK4mg=github.com/IceWhaleTech/CasaOS-Gateway v0.3.6/go.mod h1:hnZwGUzcOyiufMpVO7l3gu2gAm6Ws4TY4Nlj3kMshXA=github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=diff --git a/route/v1/system.go b/route/v1/system.goindex 9872ee3..8f274f6 100644--- a/route/v1/system.go+++ b/route/v1/system.go@@ -12,6 +12,7 @@ import ("time""unsafe"+ http2 "github.com/IceWhaleTech/CasaOS-Common/utils/http""github.com/IceWhaleTech/CasaOS/model""github.com/IceWhaleTech/CasaOS/pkg/config""github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"@@ -342,7 +343,7 @@ func GetSystemNetInfo(c *gin.Context) {func GetSystemProxy(c *gin.Context) {url := c.Query("url")- resp, err := http.Get(url)+ resp, err := http2.Get(url, 30*time.Second)if err != nil {return}