Partially revert global network configuration.

It's better to read the network configuration before each http request so
in case it is changed using "Settings" functions in daemon mode the changes
are immediately applied.

Author: cmaglie

arduino/cores/packagemanager/download.go

@@ -100,16 +100,16 @@ func (pm *PackageManager) FindPlatformReleaseDependencies(item *PlatformReferenc
 
 // DownloadToolRelease downloads a ToolRelease. If the tool is already downloaded a nil Downloader
 // is returned.
-func (pm *PackageManager) DownloadToolRelease(tool *cores.ToolRelease) (*downloader.Downloader, error) {
+func (pm *PackageManager) DownloadToolRelease(tool *cores.ToolRelease, config *downloader.Config) (*downloader.Downloader, error) {
 	resource := tool.GetCompatibleFlavour()
 	if resource == nil {
 		return nil, fmt.Errorf("tool not available for your OS")
 	}
-	return resource.Download(pm.DownloadDir)
+	return resource.Download(pm.DownloadDir, config)
 }
 
 // DownloadPlatformRelease downloads a PlatformRelease. If the platform is already downloaded a
 // nil Downloader is returned.
-func (pm *PackageManager) DownloadPlatformRelease(platform *cores.PlatformRelease) (*downloader.Downloader, error) {
-	return platform.Resource.Download(pm.DownloadDir)
+func (pm *PackageManager) DownloadPlatformRelease(platform *cores.PlatformRelease, config *downloader.Config) (*downloader.Downloader, error) {
+	return platform.Resource.Download(pm.DownloadDir, config)
 }

arduino/libraries/librariesmanager/download.go

@@ -25,8 +25,8 @@ import (
 var LibraryIndexURL, _ = url.Parse("https://downloads.arduino.cc/libraries/library_index.json")
 
 // UpdateIndex downloads the libraries index file from Arduino repository.
-func (lm *LibrariesManager) UpdateIndex() (*downloader.Downloader, error) {
+func (lm *LibrariesManager) UpdateIndex(config *downloader.Config) (*downloader.Downloader, error) {
 	lm.IndexFile.Parent().MkdirAll()
 	// TODO: Download from gzipped URL index
-	return downloader.Download(lm.IndexFile.String(), LibraryIndexURL.String(), downloader.NoResume)
+	return downloader.DownloadWithConfig(lm.IndexFile.String(), LibraryIndexURL.String(), *config, downloader.NoResume)
 }

arduino/resources/helpers.go

@@ -43,7 +43,7 @@ func (r *DownloadResource) IsCached(downloadDir *paths.Path) (bool, error) {
 }
 
 // Download a DownloadResource.
-func (r *DownloadResource) Download(downloadDir *paths.Path) (*downloader.Downloader, error) {
+func (r *DownloadResource) Download(downloadDir *paths.Path, config *downloader.Config) (*downloader.Downloader, error) {
 	cached, err := r.TestLocalArchiveIntegrity(downloadDir)
 	if err != nil {
 		return nil, fmt.Errorf("testing local archive integrity: %s", err)
@@ -71,5 +71,5 @@ func (r *DownloadResource) Download(downloadDir *paths.Path) (*downloader.Downlo
 		return nil, fmt.Errorf("getting archive file info: %s", err)
 	}
 
-	return downloader.Download(path.String(), r.URL)
+	return downloader.DownloadWithConfig(path.String(), r.URL, *config)
 }

arduino/resources/helpers_test.go

@@ -53,10 +53,7 @@ func TestDownloadApplyUserAgentHeaderUsingConfig(t *testing.T) {
 		URL:             srv.URL,
 	}
 
-	prev := downloader.GetDefaultConfig()
-	downloader.SetDefaultConfig(downloader.Config{RequestHeaders: http.Header{"User-Agent": []string{goldUserAgentValue}}})
-	d, err := r.Download(tmp)
-	downloader.SetDefaultConfig(prev)
+	d, err := r.Download(tmp, &downloader.Config{RequestHeaders: http.Header{"User-Agent": []string{goldUserAgentValue}}})
 	require.NoError(t, err)
 	err = d.Run()
 	require.NoError(t, err)

arduino/resources/resources_test.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
+	"go.bug.st/downloader"
 )
 
 func TestDownloadAndChecksums(t *testing.T) {
@@ -41,7 +42,7 @@ func TestDownloadAndChecksums(t *testing.T) {
 	require.NoError(t, err)
 
 	downloadAndTestChecksum := func() {
-		d, err := r.Download(tmp)
+		d, err := r.Download(tmp, &downloader.Config{})
 		require.NoError(t, err)
 		err = d.Run()
 		require.NoError(t, err)
@@ -57,7 +58,7 @@ func TestDownloadAndChecksums(t *testing.T) {
 	downloadAndTestChecksum()
 
 	// Download with cached file
-	d, err := r.Download(tmp)
+	d, err := r.Download(tmp, &downloader.Config{})
 	require.NoError(t, err)
 	require.Nil(t, d)
 

cli/cli.go

@@ -18,7 +18,6 @@ package cli
 import (
 	"fmt"
 	"io/ioutil"
-	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -46,7 +45,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"go.bug.st/downloader"
 )
 
 var (
@@ -256,21 +254,4 @@ func preRun(cmd *cobra.Command, args []string) {
 			os.Exit(errorcodes.ErrBadCall)
 		})
 	}
-
-	//
-	// Configure network
-	//
-	netConf := downloader.Config{
-		RequestHeaders: globals.NewHTTPClientHeader(""),
-	}
-	if viper.IsSet("network.proxy") {
-		proxy := viper.GetString("network.proxy")
-		if _, err := url.Parse(proxy); err != nil {
-			feedback.Error("Invalid network.proxy '" + proxy + "': " + err.Error())
-			os.Exit(errorcodes.ErrBadArgument)
-		}
-		netConf.ProxyURL = proxy
-		logrus.Infof("Using proxy %s", proxy)
-	}
-	downloader.SetDefaultConfig(netConf)
 }

cli/daemon/daemon.go

@@ -37,7 +37,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"go.bug.st/downloader"
 	"google.golang.org/grpc"
 )
 
@@ -66,14 +65,11 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
 		stats.Incr("daemon", stats.T("success", "true"))
 		defer stats.Flush()
 	}
-
 	port := viper.GetString("daemon.port")
 	s := grpc.NewServer()
 
 	// Set specific user-agent for the daemon
-	netConf := downloader.GetDefaultConfig()
-	netConf.RequestHeaders = globals.NewHTTPClientHeader("daemon")
-	downloader.SetDefaultConfig(netConf)
+	viper.Set("network.user_agent_ext", "daemon")
 
 	// register the commands service
 	srv_commands.RegisterArduinoCoreServer(s, &daemon.ArduinoCoreServerImpl{

commands/bundled_tools.go

@@ -25,7 +25,11 @@ import (
 
 // DownloadToolRelease downloads a ToolRelease
 func DownloadToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.ToolRelease, downloadCB DownloadProgressCB) error {
-	resp, err := pm.DownloadToolRelease(toolRelease)
+	config, err := GetDownloaderConfig()
+	if err != nil {
+		return err
+	}
+	resp, err := pm.DownloadToolRelease(toolRelease, config)
 	if err != nil {
 		return err
 	}

commands/core/download.go

@@ -64,7 +64,11 @@ func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadReq, downloa
 
 func downloadPlatform(pm *packagemanager.PackageManager, platformRelease *cores.PlatformRelease, downloadCB commands.DownloadProgressCB) error {
 	// Download platform
-	resp, err := pm.DownloadPlatformRelease(platformRelease)
+	config, err := commands.GetDownloaderConfig()
+	if err != nil {
+		return err
+	}
+	resp, err := pm.DownloadPlatformRelease(platformRelease, config)
 	if err != nil {
 		return err
 	}

commands/download.go

@@ -0,0 +1,71 @@
+// This file is part of arduino-cli.
+//
+// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
+//
+// This software is released under the GNU General Public License version 3,
+// which covers the main part of arduino-cli.
+// The terms of this license can be found at:
+// https://www.gnu.org/licenses/gpl-3.0.en.html
+//
+// You can be released from the requirements of the above licenses by purchasing
+// a commercial license. Buying such a license is mandatory if you want to
+// modify or otherwise use the software for commercial activities involving the
+// Arduino software without disclosing the source code of your own applications.
+// To purchase a commercial license, send an email to license@arduino.cc.
+
+package commands
+
+import (
+	"net/url"
+	"time"
+
+	"github.com/arduino/arduino-cli/cli/globals"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	"go.bug.st/downloader"
+)
+
+// GetDownloaderConfig returns the downloader configuration based on
+// current settings.
+func GetDownloaderConfig() (*downloader.Config, error) {
+	res := &downloader.Config{
+		RequestHeaders: globals.NewHTTPClientHeader(viper.GetString("network.user_agent_ext")),
+	}
+	if viper.IsSet("network.proxy") {
+		proxy := viper.GetString("network.proxy")
+		if _, err := url.Parse(proxy); err != nil {
+			return nil, errors.New("Invalid network.proxy '" + proxy + "': " + err.Error())
+		}
+		res.ProxyURL = proxy
+		logrus.Infof("Using proxy %s", proxy)
+	}
+	return res, nil
+}
+
+// Download performs a download loop using the provided downloader.Downloader.
+// Messages are passed back to the DownloadProgressCB using label as text for the File field.
+func Download(d *downloader.Downloader, label string, downloadCB DownloadProgressCB) error {
+	if d == nil {
+		// This signal means that the file is already downloaded
+		downloadCB(&rpc.DownloadProgress{
+			File:      label,
+			Completed: true,
+		})
+		return nil
+	}
+	downloadCB(&rpc.DownloadProgress{
+		File:      label,
+		Url:       d.URL,
+		TotalSize: d.Size(),
+	})
+	d.RunAndPoll(func(downloaded int64) {
+		downloadCB(&rpc.DownloadProgress{Downloaded: downloaded})
+	}, 250*time.Millisecond)
+	if d.Error() != nil {
+		return d.Error()
+	}
+	downloadCB(&rpc.DownloadProgress{Completed: true})
+	return nil
+}