diff --git a/go.mod b/go.mod index aaf6c496..29e26ab3 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,5 @@ require ( github.com/qdm12/ss-server v0.0.0-20200819124651-6428e626ee83 github.com/stretchr/testify v1.6.1 github.com/vishvananda/netlink v1.1.0 - golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 golang.org/x/sys v0.0.0-20201018121011-98379d014ca7 ) diff --git a/go.sum b/go.sum index 5585fe19..3161d4b3 100644 --- a/go.sum +++ b/go.sum @@ -102,7 +102,6 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= @@ -113,8 +112,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 h1:5kGOVHlq0euqwzgTC9Vu15p6fV1Wi0ArVi8da2urnVg= -golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -122,14 +119,11 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201018121011-98379d014ca7 h1:CNOpL+H7PSxBI7dF/EIUsfOguRSzWp6CQ91yxZE6PG4= golang.org/x/sys v0.0.0-20201018121011-98379d014ca7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= diff --git a/internal/cli/cli.go b/internal/cli/cli.go index d94eb44e..6670ebb9 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -17,7 +17,6 @@ import ( "github.com/qdm12/gluetun/internal/updater" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" - "golang.org/x/net/context/ctxhttp" ) func ClientKey(args []string) error { @@ -42,7 +41,11 @@ func ClientKey(args []string) error { func HealthCheck(ctx context.Context, client *http.Client) error { const url = "http://localhost:8000/health" - response, err := ctxhttp.Get(ctx, client, url) + request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + return err + } + response, err := client.Do(request) if err != nil { return err } diff --git a/internal/provider/piav3.go b/internal/provider/piav3.go index 409491aa..801e5b26 100644 --- a/internal/provider/piav3.go +++ b/internal/provider/piav3.go @@ -15,7 +15,6 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" - "golang.org/x/net/context/ctxhttp" ) type piaV3 struct { @@ -94,7 +93,12 @@ func (p *piaV3) PortForward(ctx context.Context, client *http.Client, } clientID := hex.EncodeToString(b) url := fmt.Sprintf("%s/?client_id=%s", constants.PIAPortForwardURL, clientID) - response, err := ctxhttp.Get(ctx, client, url) + request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + pfLogger.Error(err) + return + } + response, err := client.Do(request) if err != nil { pfLogger.Error(err) return diff --git a/internal/provider/piav4.go b/internal/provider/piav4.go index f542b115..65a091ba 100644 --- a/internal/provider/piav4.go +++ b/internal/provider/piav4.go @@ -21,7 +21,6 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/golibs/files" "github.com/qdm12/golibs/logging" - "golang.org/x/net/context/ctxhttp" ) type piaV4 struct { @@ -447,7 +446,11 @@ func fetchPIAPortForwardData(ctx context.Context, client *http.Client, gateway n Path: "/getSignature", RawQuery: queryParams.Encode(), } - response, err := ctxhttp.Get(ctx, client, url.String()) + request, err := http.NewRequestWithContext(ctx, http.MethodGet, url.String(), nil) + if err != nil { + return 0, "", expiration, fmt.Errorf("cannot obtain signature: %w", err) + } + response, err := client.Do(request) if err != nil { return 0, "", expiration, fmt.Errorf("cannot obtain signature: %w", err) } @@ -489,7 +492,11 @@ func bindPIAPort(ctx context.Context, client *http.Client, gateway net.IP, data RawQuery: queryParams.Encode(), } - response, err := ctxhttp.Get(ctx, client, url.String()) + request, err := http.NewRequestWithContext(ctx, http.MethodGet, url.String(), nil) + if err != nil { + return fmt.Errorf("cannot bind port: %w", err) + } + response, err := client.Do(request) if err != nil { return fmt.Errorf("cannot bind port: %w", err) } diff --git a/internal/version/github.go b/internal/version/github.go index 1c363513..0e0255a5 100644 --- a/internal/version/github.go +++ b/internal/version/github.go @@ -6,8 +6,6 @@ import ( "io/ioutil" "net/http" "time" - - "golang.org/x/net/context/ctxhttp" ) type githubRelease struct { @@ -28,7 +26,11 @@ type githubCommit struct { func getGithubReleases(ctx context.Context, client *http.Client) (releases []githubRelease, err error) { const url = "https://api.github.com/repos/qdm12/gluetun/releases" - response, err := ctxhttp.Get(ctx, client, url) + request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + return nil, err + } + response, err := client.Do(request) if err != nil { return nil, err } @@ -45,7 +47,11 @@ func getGithubReleases(ctx context.Context, client *http.Client) (releases []git func getGithubCommits(ctx context.Context, client *http.Client) (commits []githubCommit, err error) { const url = "https://api.github.com/repos/qdm12/gluetun/commits" - response, err := ctxhttp.Get(ctx, client, url) + request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + return nil, err + } + response, err := client.Do(request) if err != nil { return nil, err }