Browse Source

Merge branch 'fredbcode-master'

* fredbcode-master:
  Fix bug tls renegociation problem in Notification channel (webhook) #14800
bergquist 7 years ago
parent
commit
db448b5d53
1 changed files with 4 additions and 0 deletions
  1. 4 0
      pkg/services/notifications/webhook.go

+ 4 - 0
pkg/services/notifications/webhook.go

@@ -3,6 +3,7 @@ package notifications
 import (
 import (
 	"bytes"
 	"bytes"
 	"context"
 	"context"
+	"crypto/tls"
 	"fmt"
 	"fmt"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"
@@ -26,6 +27,9 @@ type Webhook struct {
 }
 }
 
 
 var netTransport = &http.Transport{
 var netTransport = &http.Transport{
+	TLSClientConfig: &tls.Config{
+		Renegotiation: tls.RenegotiateFreelyAsClient,
+	},
 	Proxy: http.ProxyFromEnvironment,
 	Proxy: http.ProxyFromEnvironment,
 	Dial: (&net.Dialer{
 	Dial: (&net.Dialer{
 		Timeout:   30 * time.Second,
 		Timeout:   30 * time.Second,