set timeout when reading blocklist response

cenkalti · Feb 27, 2019 · a1a4c73 · a1a4c73
1 parent b166a14
commit a1a4c73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/torrent/blocklist.go b/torrent/blocklist.go
@@ -100,7 +100,11 @@ func (s *Session) reloadBlocklist() error {
 	}()
 	req = req.WithContext(ctx)
 
-	resp, err := http.DefaultClient.Do(req)
+	client := http.Client{
+		Timeout: s.config.BlocklistUpdateTimeout,
+	}
+
+	resp, err := client.Do(req)
 	if err != nil {
 		return err
 	}

diff --git a/torrent/config.go b/torrent/config.go
@@ -25,6 +25,8 @@ type Config struct {
 	BlocklistURL string
 	// When to refresh blocklist
 	BlocklistUpdateInterval time.Duration
+	// HTTP timeout for downloading blocklist
+	BlocklistUpdateTimeout time.Duration
 
 	// Enable RPC server
 	RPCEnabled bool
@@ -118,6 +120,7 @@ var DefaultConfig = Config{
 	PeerIDPrefix:                    "-RN" + Version + "-",
 	ExtensionHandshakeClientVersion: "Rain " + Version,
 	BlocklistUpdateInterval:         24 * time.Hour,
+	BlocklistUpdateTimeout:          10 * time.Minute,
 
 	// RPC Server
 	RPCEnabled:         true,