fix NAS gateway support for policy/notification (#9765)

Fixes #9764
This commit is contained in:
Harshavardhana
2020-06-03 13:18:54 -07:00
committed by GitHub
parent b91040f7fb
commit 5686a7e273
8 changed files with 79 additions and 73 deletions

View File

@@ -18,13 +18,12 @@ package cmd
import (
"bufio"
"context"
"crypto"
"crypto/tls"
"encoding/hex"
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"path/filepath"
@@ -409,19 +408,15 @@ const updateTimeout = 10 * time.Second
func getUpdateTransport(timeout time.Duration) http.RoundTripper {
var updateTransport http.RoundTripper = &http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
dialer := &net.Dialer{
Timeout: timeout,
KeepAlive: timeout,
DualStack: true,
}
return dialer.DialContext(ctx, network, addr)
},
Proxy: http.ProxyFromEnvironment,
DialContext: xhttp.NewCustomDialContext(timeout, timeout),
IdleConnTimeout: timeout,
TLSHandshakeTimeout: timeout,
ExpectContinueTimeout: timeout,
DisableCompression: true,
TLSClientConfig: &tls.Config{
RootCAs: globalRootCAs,
},
DisableCompression: true,
}
return updateTransport
}
@@ -502,7 +497,9 @@ func doUpdate(updateURL, sha256Hex, mode string) (err error) {
}
}
clnt := &http.Client{Transport: getUpdateTransport(30 * time.Second)}
clnt := &http.Client{
Transport: getUpdateTransport(30 * time.Second),
}
req, err := http.NewRequest(http.MethodGet, updateURL, nil)
if err != nil {
return AdminError{