禁止Go客户端自动重定向 (#1030)

* close http.Response Body

* 禁止Go客户端自动重定向

* 请求为空时，defer r.Body.Close()panic

* 请求返回体为空时，defer r.Body.Close()panic

* Update rest_client.go

请求返回体为空时，defer r.Body.Close()panic

* 禁止Go客户端自动重定向

* 禁止Go客户端自动重定向

Co-authored-by: c30014156 <chenwei387@huawei.com>

client/rest/rest_client.go

@@ -63,8 +63,9 @@ func NewRestClient(opts client.Options) (client.ProtocolClient, error) {
 		opts: opts,
 
 		c: &http.Client{
-			Timeout:   opts.Timeout,
-			Transport: tp,
+			Timeout:       opts.Timeout,
+			Transport:     tp,
+			CheckRedirect: opts.CheckRedirect,
 		},
 	}
 	return rc, nil
@@ -91,6 +92,12 @@ func newTransport(opts client.Options) *http.Transport {
 
 // If a request fails, we generate an error.
 func (c *Client) failure2Error(e error, r *http.Response, addr string) error {
+	defer func() {
+		if r == nil || r.Body == nil {
+			return
+		}
+		r.Body.Close()
+	}()
 	if e != nil {
 		return e
 	}

core/client/client_manager.go

@@ -4,6 +4,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"net/http"
 	"strings"
 	"sync"
 	"time"
@@ -27,13 +28,14 @@ const DefaultPoolSize = 512
 
 //Options is configs for client creation
 type Options struct {
-	Service   string
-	PoolSize  int
-	Timeout   time.Duration
-	Endpoint  string
-	PoolTTL   time.Duration
-	TLSConfig *tls.Config
-	Failure   map[string]bool
+	Service       string
+	PoolSize      int
+	Timeout       time.Duration
+	Endpoint      string
+	PoolTTL       time.Duration
+	TLSConfig     *tls.Config
+	Failure       map[string]bool
+	CheckRedirect func(req *http.Request, via []*http.Request) error
 }
 
 // GetFailureMap return failure map
@@ -60,7 +62,7 @@ func GetMaxIdleCon(p string) int {
 }
 
 // CreateClient is for to create client based on protocol and the service name
-func CreateClient(protocol, service, endpoint string, sslEnable bool) (ProtocolClient, error) {
+func CreateClient(protocol, service, endpoint string, sslEnable bool, checkRedirect func(req *http.Request, via []*http.Request) error) (ProtocolClient, error) {
 	f, err := GetClientNewFunc(protocol)
 	if err != nil {
 		openlog.Error(fmt.Sprintf("do not support [%s] client", protocol))
@@ -86,12 +88,13 @@ func CreateClient(protocol, service, endpoint string, sslEnable bool) (ProtocolC
 		command = strings.Join([]string{common.Consumer, service}, ".")
 	}
 	return f(Options{
-		Service:   service,
-		TLSConfig: tlsConfig,
-		PoolSize:  GetMaxIdleCon(protocol),
-		Failure:   GetFailureMap(protocol),
-		Timeout:   config.GetTimeoutDurationFromArchaius(command, common.Consumer),
-		Endpoint:  endpoint,
+		Service:       service,
+		TLSConfig:     tlsConfig,
+		PoolSize:      GetMaxIdleCon(protocol),
+		Failure:       GetFailureMap(protocol),
+		Timeout:       config.GetTimeoutDurationFromArchaius(command, common.Consumer),
+		Endpoint:      endpoint,
+		CheckRedirect: checkRedirect,
 	})
 }
 func generateKey(protocol, service, endpoint string) string {
@@ -108,7 +111,7 @@ func GetClient(i *invocation.Invocation) (ProtocolClient, error) {
 	sl.RUnlock()
 	if !ok {
 		openlog.Info("Create client for " + i.Protocol + ":" + i.MicroServiceName + ":" + i.Endpoint)
-		c, err = CreateClient(i.Protocol, i.MicroServiceName, i.Endpoint, i.SSLEnable)
+		c, err = CreateClient(i.Protocol, i.MicroServiceName, i.Endpoint, i.SSLEnable, i.CheckRedirect)
 		if err != nil {
 			return nil, err
 		}
@@ -169,5 +172,6 @@ func EqualOpts(oldOpts, newOpts Options) Options {
 		oldOpts.TLSConfig = newOpts.TLSConfig
 	}
 	oldOpts.Failure = newOpts.Failure
+	oldOpts.CheckRedirect = newOpts.CheckRedirect
 	return oldOpts
 }

core/config/cd_config_test.go

@@ -40,7 +40,7 @@ servicecomb:
 ---
 servicecomb:
   service:
-	  name: Client
+    name: Client
 
 `)
 	d, _ = os.Getwd()

core/core_test.go

@@ -74,6 +74,9 @@ func TestOptions(t *testing.T) {
 	inv = core.WithMetadata(nil)
 	assert.NotEmpty(t, inv)
 
+	inv = core.WithCheckRedirect()
+	assert.NotEmpty(t, inv)
+
 	t.Log("with router tag")
 	testKey := "testKey"
 	testValue := "testValue"

core/invocation/invocation.go

@@ -2,6 +2,7 @@ package invocation
 
 import (
 	"context"
+	"net/http"
 
 	"github.com/go-chassis/go-chassis/v2/core/common"
 	"github.com/go-chassis/go-chassis/v2/pkg/runtime"
@@ -63,6 +64,8 @@ type Invocation struct {
 	Metadata map[string]interface{} // can save local data, will not send in header on network
 	Strategy string                 // load balancing strategy
 	Filters  []string
+	// http.CheckRedirect
+	CheckRedirect func(req *http.Request, via []*http.Request) error
 }
 
 // GetMark return match rule name that request matches

core/options.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"net/http"
 	"time"
 
 	"github.com/go-chassis/go-chassis/v2/core/invocation"
@@ -36,6 +37,8 @@ type InvokeOptions struct {
 	Metadata map[string]interface{}
 	// tags for router
 	RouteTags utiltags.Tags
+	//http.CheckRedirect
+	CheckRedirect func(req *http.Request, via []*http.Request) error
 }
 
 //TODO a lot of options
@@ -98,6 +101,15 @@ func WithProtocol(p string) InvocationOption {
 	}
 }
 
+// WithCheckRedirect is a request option
+func WithCheckRedirect() InvocationOption {
+	return func(o *InvokeOptions) {
+		o.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		}
+	}
+}
+
 // WithStrategy is a request option
 func WithStrategy(s string) InvocationOption {
 	return func(o *InvokeOptions) {
@@ -155,4 +167,5 @@ func wrapInvocationWithOpts(i *invocation.Invocation, opts InvokeOptions) {
 	}
 
 	i.RouteTags = opts.RouteTags
+	i.CheckRedirect = opts.CheckRedirect
 }