Use Server struct to address gosec G114 (#305)

Author: andy-a-d-nguyen

src/code.cloudfoundry.org/bosh-dns-adapter/main.go

@@ -49,7 +49,7 @@ func main() {
 	}
 
 	address := fmt.Sprintf("%s:%s", config.Address, config.Port)
-	l, err := net.Listen("tcp", address)
+	listener, err := net.Listen("tcp", address)
 	if err != nil {
 		logger.Error(fmt.Sprintf("Address (%s) not available", address), err)
 		os.Exit(1)
@@ -93,7 +93,10 @@ func main() {
 	}
 
 	go func() {
-		err = http.Serve(l, metricsWrap("GetIPs", http.HandlerFunc(getIPsHandler.ServeHTTP)))
+		server := &http.Server{
+			Handler: metricsWrap("GetIPs", http.HandlerFunc(getIPsHandler.ServeHTTP)),
+		}
+		err = server.Serve(listener)
 		logger.Info("http-server-returned", lager.Data{"error": err})
 	}()
 
@@ -123,9 +126,9 @@ func main() {
 	logger.Info("server-started")
 	sig := <-signalChannel
 	monitor.Signal(sig)
-	err = l.Close()
+	err = listener.Close()
 	if err != nil {
-		logger.Error("erro-closing-server", err)
+		logger.Error("error-closing-server", err)
 	}
 	logger.Info("server-stopped")
 }

src/example-apps/proxy/main.go

@@ -40,7 +40,11 @@ func main() {
 	mux.Handle("/signal/", &handlers.SignalHandler{})
 	mux.Handle("/sleepy/", &handlers.SleepyHandler{SleepyInterval: sleepyInterval})
 
-	err := http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", port), mux)
+	server := &http.Server{
+		Addr:    fmt.Sprintf("0.0.0.0:%d", port),
+		Handler: mux,
+	}
+	err := server.ListenAndServe()
 	log.Printf("http server exited: %s", err)
 }
 

src/example-apps/smoke/main.go

@@ -35,7 +35,11 @@ func launchServer(port int) {
 	mux := http.NewServeMux()
 	mux.Handle("/selfproxy", selfProxyHandler)
 	mux.Handle("/", helloHandler)
-	err := http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", port), mux)
+	server := &http.Server{
+		Addr:    fmt.Sprintf("0.0.0.0:%d", port),
+		Handler: mux,
+	}
+	err := server.ListenAndServe()
 	log.Printf("http server exited: %s\n", err)
 }
 

src/example-apps/spammer/main.go

@@ -10,7 +10,10 @@ import (
 func main() {
 	http.HandleFunc(api.SpamPath, api.SpamHandler)
 
-	if err := http.ListenAndServe(":8080", nil); err != nil {
-		log.Fatalf("An error occured during serving: %s", err)
+	server := &http.Server{
+		Addr:    ":8080",
+		Handler: nil,
 	}
+	err := server.ListenAndServe()
+	log.Fatalf("An error occured during serving: %s", err)
 }