From 297d6480d09aed2fabff6fa644a04b4c3dac3ffd Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Tue, 4 Aug 2026 22:26:37 +0000 Subject: [PATCH] fix(ipvanish): updater user agent to work again --- internal/provider/ipvanish/updater/servers.go | 3 +++ internal/provider/ipvanish/updater/servers_test.go | 5 +++-- internal/updater/unzip/fetch.go | 6 +++++- internal/updater/unzip/unzip.go | 11 +++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/internal/provider/ipvanish/updater/servers.go b/internal/provider/ipvanish/updater/servers.go index fa0d29c8..588838e3 100644 --- a/internal/provider/ipvanish/updater/servers.go +++ b/internal/provider/ipvanish/updater/servers.go @@ -9,6 +9,7 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/qdm12/gluetun/internal/updater/openvpn" + "github.com/qdm12/gluetun/internal/updater/unzip" "golang.org/x/text/cases" "golang.org/x/text/language" ) @@ -17,6 +18,8 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error, ) { const url = "https://configs.ipvanish.com/openvpn/v2.6.0-0/configs.zip" + //nolint:lll + ctx = unzip.WithUserAgent(ctx, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36") contents, err := u.unzipper.FetchAndExtract(ctx, url) if err != nil { return nil, err diff --git a/internal/provider/ipvanish/updater/servers_test.go b/internal/provider/ipvanish/updater/servers_test.go index b50f47c0..39c2c10f 100644 --- a/internal/provider/ipvanish/updater/servers_test.go +++ b/internal/provider/ipvanish/updater/servers_test.go @@ -195,12 +195,13 @@ func Test_Updater_GetServers(t *testing.T) { unzipper := common.NewMockUnzipper(ctrl) const zipURL = "https://configs.ipvanish.com/openvpn/v2.6.0-0/configs.zip" - unzipper.EXPECT().FetchAndExtract(ctx, zipURL). + // Context is wrapped with User-Agent for ipvanish, so use Any() for the ctx arg + unzipper.EXPECT().FetchAndExtract(gomock.Any(), zipURL). //nolint:dogsled Return(testCase.unzipContents, testCase.unzipErr) parallelResolver := common.NewMockParallelResolver(ctrl) if testCase.expectResolve { - parallelResolver.EXPECT().Resolve(ctx, testCase.resolverSettings). + parallelResolver.EXPECT().Resolve(gomock.Any(), testCase.resolverSettings). //nolint:dogsled Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr) } diff --git a/internal/updater/unzip/fetch.go b/internal/updater/unzip/fetch.go index ba928e1a..f918428a 100644 --- a/internal/updater/unzip/fetch.go +++ b/internal/updater/unzip/fetch.go @@ -14,7 +14,11 @@ func (u *Unzipper) FetchAndExtract(ctx context.Context, url string) ( if err != nil { return nil, err } - request.Header.Set("User-Agent", "gluetun") + if userAgent, ok := ctx.Value(userAgentContextKey).(string); ok && userAgent != "" { + request.Header.Set("User-Agent", userAgent) + } else { + request.Header.Set("User-Agent", "gluetun") + } response, err := u.client.Do(request) if err != nil { diff --git a/internal/updater/unzip/unzip.go b/internal/updater/unzip/unzip.go index 54aa7ca2..ea6b37cb 100644 --- a/internal/updater/unzip/unzip.go +++ b/internal/updater/unzip/unzip.go @@ -1,6 +1,7 @@ package unzip import ( + "context" "net/http" ) @@ -8,6 +9,16 @@ type Unzipper struct { client *http.Client } +type contextKey int + +const ( + userAgentContextKey contextKey = iota +) + +func WithUserAgent(ctx context.Context, userAgent string) context.Context { + return context.WithValue(ctx, userAgentContextKey, userAgent) +} + func New(client *http.Client) *Unzipper { return &Unzipper{ client: client,