fix: make TlsInsecureSkipVerify enable for all request (#4386)

drivers/115/util.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/SheltonZhu/115driver/pkg/driver"
+	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/pkg/errors"
 )
 
@@ -15,6 +16,7 @@ func (d *Pan115) login() error {
 		driver.UA(UserAgent),
 	}
 	d.client = driver.New(opts...)
+	d.client.SetHttpClient(base.HttpClient)
 	cr := &driver.Credential{}
 	if d.Addition.QRCodeToken != "" {
 		s := &driver.QRCodeSession{

drivers/base/client.go

@@ -9,28 +9,40 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
-var NoRedirectClient *resty.Client
+var (
-var RestyClient = NewRestyClient()
+	NoRedirectClient *resty.Client
-var HttpClient = &http.Client{}
+	RestyClient      *resty.Client
+	HttpClient       *http.Client
+)
 var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
 var DefaultTimeout = time.Second * 30
 
-func init() {
+func InitClient() {
 	NoRedirectClient = resty.New().SetRedirectPolicy(
 		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		}),
-	)
+	).SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 	NoRedirectClient.SetHeader("user-agent", UserAgent)
+
+	RestyClient = NewRestyClient()
+	HttpClient = NewHttpClient()
 }
 
 func NewRestyClient() *resty.Client {
 	client := resty.New().
 		SetHeader("user-agent", UserAgent).
 		SetRetryCount(3).
-		SetTimeout(DefaultTimeout)
+		SetTimeout(DefaultTimeout).
-	if conf.Conf != nil && conf.Conf.TlsInsecureSkipVerify {
+		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
-		client = client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
-	}
 	return client
 }
+
+func NewHttpClient() *http.Client {
+	return &http.Client{
+		Timeout: DefaultTimeout,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify},
+		},
+	}
+}

drivers/lanzou/driver.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
-	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -15,8 +14,6 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
-var upClient = base.NewRestyClient().SetTimeout(120 * time.Second)
-
 type LanZou struct {
 	Addition
 	model.Storage

drivers/lanzou/util.go

@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
@@ -16,6 +17,9 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+var upClient *resty.Client
+var once sync.Once
+
 func (d *LanZou) doupload(callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	return d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
 		req.SetQueryParam("uid", d.uid)
@@ -64,6 +68,9 @@ func (d *LanZou) _post(url string, callback base.ReqCallback, resp interface{},
 func (d *LanZou) request(url string, method string, callback base.ReqCallback, up bool) ([]byte, error) {
 	var req *resty.Request
 	if up {
+		once.Do(func() {
+			upClient = base.NewRestyClient().SetTimeout(120 * time.Second)
+		})
 		req = upClient.R()
 	} else {
 		req = base.RestyClient.R()

drivers/quark/driver.go

@@ -102,7 +102,7 @@ func (d *Quark) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 					req.Header.Set("User-Agent", ua)
 					req.Header.Set("Cookie", d.Cookie)
 					req.Header.Set("Referer", "https://pan.quark.cn")
-					resp, err := http.DefaultClient.Do(req)
+					resp, err := base.HttpClient.Do(req)
 					if err != nil {
 						return err
 					}

drivers/trainbit/driver.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
@@ -31,7 +32,7 @@ func (d *Trainbit) GetAddition() driver.Additional {
 }
 
 func (d *Trainbit) Init(ctx context.Context) error {
-	http.DefaultClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+	base.HttpClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 		return http.ErrUseLastResponse
 	}
 	var err error
@@ -119,7 +120,7 @@ func (d *Trainbit) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 	query := &url.Values{}
 	query.Add("q", strings.Split(dstDir.GetID(), "_")[1])
 	query.Add("guid", guid)
-	query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + "."))
+	query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)+"."))
 	endpoint.RawQuery = query.Encode()
 	var total int64
 	total = 0
@@ -135,7 +136,7 @@ func (d *Trainbit) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 		return err
 	}
 	req.Header.Set("Content-Type", "text/json; charset=UTF-8")
-	_, err = http.DefaultClient.Do(req)
+	_, err = base.HttpClient.Do(req)
 	return err
 }
 

drivers/trainbit/util.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/model"
 )
 
@@ -38,7 +39,7 @@ func get(url string, apiKey string, AUSHELLPORTAL string) (*http.Response, error
 		Value:  apiKey,
 		MaxAge: 2 * 60,
 	})
-	res, err := http.DefaultClient.Do(req)
+	res, err := base.HttpClient.Do(req)
 	return res, err
 }
 
@@ -65,7 +66,7 @@ func postForm(endpoint string, data url.Values, apiExpiredate string, apiKey str
 		Value:  apiKey,
 		MaxAge: 2 * 60,
 	})
-	res, err := http.DefaultClient.Do(req)
+	res, err := base.HttpClient.Do(req)
 	return res, err
 }
 

drivers/webdav/odrvcookie/fetch.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/alist-org/alist/v3/drivers/base"
 	"golang.org/x/net/publicsuffix"
 )
 
@@ -185,7 +186,7 @@ func (ca *CookieAuth) getSPToken() (*SuccessResponse, error) {
 		return nil, err
 	}
 
-	client := &http.Client{}
+	client := base.HttpClient
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err

internal/bootstrap/config.go

@@ -1,7 +1,6 @@
 package bootstrap
 
 import (
-	"crypto/tls"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -78,9 +77,7 @@ func InitConfig() {
 		log.Fatalf("create temp dir error: %+v", err)
 	}
 	log.Debugf("config: %+v", conf.Conf)
-	if conf.Conf.TlsInsecureSkipVerify {
+	base.InitClient()
-		base.RestyClient = base.RestyClient.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
-	}
 	initURL()
 }
 

internal/fs/util.go

@@ -8,6 +8,7 @@ import (
 	stdpath "path"
 	"strings"
 
+	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
@@ -33,8 +34,6 @@ func containsByName(files []model.Obj, file model.Obj) bool {
 	return false
 }
 
-var httpClient = &http.Client{}
-
 func getFileStreamFromLink(file model.Obj, link *model.Link) (*model.FileStream, error) {
 	var rc io.ReadCloser
 	mimetype := utils.GetMimeType(file.GetName())
@@ -60,7 +59,7 @@ func getFileStreamFromLink(file model.Obj, link *model.Link) (*model.FileStream,
 		for h, val := range link.Header {
 			req.Header[h] = val
 		}
-		res, err := httpClient.Do(req)
+		res, err := base.HttpClient.Do(req)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to get response for %s", link.URL)
 		}

server/common/proxy.go

@@ -8,7 +8,9 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"sync"
 
+	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -16,16 +18,23 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var HttpClient = &http.Client{
+func HttpClient() *http.Client {
-	CheckRedirect: func(req *http.Request, via []*http.Request) error {
+	once.Do(func() {
+		httpClient = base.NewHttpClient()
+		httpClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 			if len(via) >= 10 {
 				return errors.New("stopped after 10 redirects")
 			}
 			req.Header.Del("Referer")
 			return nil
-	},
+		}
+	})
+	return httpClient
 }
 
+var once sync.Once
+var httpClient *http.Client
+
 func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.Obj) error {
 	// read data with native
 	var err error
@@ -90,7 +99,7 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
 		for h, val := range link.Header {
 			req.Header[h] = val
 		}
-		res, err := HttpClient.Do(req)
+		res, err := HttpClient().Do(req)
 		if err != nil {
 			return err
 		}