proxy: add timeouts to client and server

main.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/signal"
 	"strings"
+	"time"
 )
 
 func makeSelfTestServers() (string, string) {
@@ -71,6 +72,7 @@ func main() {
 	dump := flag.String("dump", "", "Dump request/responses from mirrors in file; empty disables dumping, '-' means stdout")
 	dumpProxy := flag.Bool("dump-proxy", false, "Also dump proxied request to -dump file")
 	maxConn := flag.Int("max-conn", 200, "Maximum number of connections to upstream servers")
+	timeout := flag.Duration("mirror-timeout", 10*time.Second, "Timeout to send requests to mirrors")
 	retries := flag.Int("mirror-retries", 3, "Maximum number of retries against mirrors")
 
 	flag.VisitAll(prefixEnv("PRISM", os.Getenv))
@@ -100,7 +102,7 @@ func main() {
 		<-healthStarted
 	}
 
-	client := makeClient(*insecure, *maxConn)
+	client := makeClient(*insecure, *maxConn, *timeout)
 	proxy := newProxy(metrics, ms, *listen, *retries, client, *dump, *dumpProxy, proxyURL, proxyBuf)
 
 	exited := handleSigterm(func() {

proxy.go

@@ -15,6 +15,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"time"
 )
 
 func hostWithoutPort(host string) string {
@@ -227,14 +228,15 @@ func (m *mirrorTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	return resp, nil
 }
 
-func makeClient(insecure bool, maxConn int) *http.Client {
+func makeClient(insecure bool, maxConn int, timeout time.Duration) *http.Client {
 	transport := http.DefaultTransport.(*http.Transport).Clone()
 	transport.ForceAttemptHTTP2 = false
 	transport.MaxIdleConns = maxConn
 	if insecure {
 		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 	}
 	return &http.Client{
+		Timeout:   timeout,
 		Transport: transport,
 	}
 }
@@ -271,8 +273,11 @@ func newProxy(metrics *metrics, ms map[string]*url.URL, listen string, retries i
 	upstream := httputil.NewSingleHostReverseProxy(proxyURL)
 	upstream.Transport = mt
 	srv := &http.Server{
-		Addr:    listen,
-		Handler: upstream,
+		Addr:         listen,
+		Handler:      upstream,
+		ReadTimeout:  30 * time.Second,
+		WriteTimeout: 30 * time.Second,
+		IdleTimeout:  10 * time.Second,
 	}
 	return &proxy{
 		srv:       srv,