From 4696f0c487f33fedd949224f723555faf8967fa2 Mon Sep 17 00:00:00 2001 From: sfc-gh-ext-simba-lb Date: Mon, 14 Nov 2022 10:26:14 -0800 Subject: [PATCH] revert go-ieproxy back to version 0.0.1 --- go.mod | 2 +- go.sum | 5 +- vendor/github.com/mattn/go-ieproxy/README.md | 6 +- vendor/github.com/mattn/go-ieproxy/ieproxy.go | 5 - .../mattn/go-ieproxy/ieproxy_darwin.go | 123 --------------- .../mattn/go-ieproxy/ieproxy_unix.go | 7 +- .../mattn/go-ieproxy/ieproxy_windows.go | 8 +- .../github.com/mattn/go-ieproxy/pac_darwin.go | 141 ------------------ .../github.com/mattn/go-ieproxy/pac_unix.go | 3 +- .../go-ieproxy/proxy_middleman_darwin.go | 43 ------ .../mattn/go-ieproxy/proxy_middleman_unix.go | 3 +- vendor/modules.txt | 2 +- 12 files changed, 9 insertions(+), 339 deletions(-) delete mode 100644 vendor/github.com/mattn/go-ieproxy/ieproxy_darwin.go delete mode 100644 vendor/github.com/mattn/go-ieproxy/pac_darwin.go delete mode 100644 vendor/github.com/mattn/go-ieproxy/proxy_middleman_darwin.go diff --git a/go.mod b/go.mod index 202b491e9..36446d6f1 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/compress v1.15.11 // indirect - github.com/mattn/go-ieproxy v0.0.9 // indirect + github.com/mattn/go-ieproxy v0.0.1 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/pierrec/lz4/v4 v4.1.16 // indirect golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect diff --git a/go.sum b/go.sum index 7b1aaaf09..725f41ddb 100644 --- a/go.sum +++ b/go.sum @@ -151,9 +151,8 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= -github.com/mattn/go-ieproxy v0.0.9 h1:RvVbLiMv/Hbjf1gRaC2AQyzwbdVhdId7D2vPnXIml4k= -github.com/mattn/go-ieproxy v0.0.9/go.mod h1:eF30/rfdQUO9EnzNIZQr0r9HiLMlZNCpJkHbmMuOAE0= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -227,7 +226,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -253,7 +251,6 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 h1:nwzwVf0l2Y/lkov/+IYgMMbFyI+QypZDds9RxlSmsFQ= golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/vendor/github.com/mattn/go-ieproxy/README.md b/vendor/github.com/mattn/go-ieproxy/README.md index 3e3b4759c..fbc801ae5 100644 --- a/vendor/github.com/mattn/go-ieproxy/README.md +++ b/vendor/github.com/mattn/go-ieproxy/README.md @@ -1,10 +1,8 @@ # ieproxy -Go package to detect the proxy settings on Windows platform, and MacOS. +Go package to detect the proxy settings on Windows platform. -On Windows, the settings are initially attempted to be read from the [`WinHttpGetIEProxyConfigForCurrentUser` DLL call](https://docs.microsoft.com/en-us/windows/desktop/api/winhttp/nf-winhttp-winhttpgetieproxyconfigforcurrentuser), but falls back to the registry (`CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings`) in the event the DLL call fails. - -On MacOS, the settings are read from [`CFNetworkCopySystemProxySettings` method of CFNetwork](https://developer.apple.com/documentation/cfnetwork/1426754-cfnetworkcopysystemproxysettings?language=objc). +The settings are initially attempted to be read from the [`WinHttpGetIEProxyConfigForCurrentUser` DLL call](https://docs.microsoft.com/en-us/windows/desktop/api/winhttp/nf-winhttp-winhttpgetieproxyconfigforcurrentuser), but falls back to the registry (`CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings`) in the event the DLL call fails. For more information, take a look at the [documentation](https://godoc.org/github.com/mattn/go-ieproxy) diff --git a/vendor/github.com/mattn/go-ieproxy/ieproxy.go b/vendor/github.com/mattn/go-ieproxy/ieproxy.go index 0b5460bb8..51fe18e3d 100644 --- a/vendor/github.com/mattn/go-ieproxy/ieproxy.go +++ b/vendor/github.com/mattn/go-ieproxy/ieproxy.go @@ -36,11 +36,6 @@ func GetConf() ProxyConf { return getConf() } -// ReloadConf reloads the proxy configuration -func ReloadConf() ProxyConf { - return reloadConf() -} - // OverrideEnvWithStaticProxy writes new values to the // `http_proxy`, `https_proxy` and `no_proxy` environment variables. // The values are taken from the Windows Regedit (should be called in `init()` function - see example) diff --git a/vendor/github.com/mattn/go-ieproxy/ieproxy_darwin.go b/vendor/github.com/mattn/go-ieproxy/ieproxy_darwin.go deleted file mode 100644 index 5d5355570..000000000 --- a/vendor/github.com/mattn/go-ieproxy/ieproxy_darwin.go +++ /dev/null @@ -1,123 +0,0 @@ -package ieproxy - -/* -#cgo LDFLAGS: -framework CoreFoundation -#cgo LDFLAGS: -framework CFNetwork -#include -#include -*/ -import "C" - -import ( - "fmt" - "strings" - "sync" - "unsafe" -) - -var once sync.Once -var darwinProxyConf ProxyConf - -// GetConf retrieves the proxy configuration from the Windows Regedit -func getConf() ProxyConf { - once.Do(writeConf) - return darwinProxyConf -} - -// reloadConf forces a reload of the proxy configuration. -func reloadConf() ProxyConf { - writeConf() - return getConf() -} - -func cfStringGetGoString(cfStr C.CFStringRef) string { - retCString := (*C.char)(C.calloc(C.ulong(uint(128)), 1)) - defer C.free(unsafe.Pointer(retCString)) - - C.CFStringGetCString(cfStr, retCString, C.long(128), C.kCFStringEncodingUTF8) - return C.GoString(retCString) -} - -func cfNumberGetGoInt(cfNum C.CFNumberRef) int { - ret := 0 - C.CFNumberGetValue(cfNum, C.kCFNumberIntType, unsafe.Pointer(&ret)) - return ret -} - -func cfArrayGetGoStrings(cfArray C.CFArrayRef) []string { - var ret []string - for i := 0; i < int(C.CFArrayGetCount(cfArray)); i++ { - cfStr := C.CFStringRef(C.CFArrayGetValueAtIndex(cfArray, C.long(i))) - if unsafe.Pointer(cfStr) != C.NULL { - ret = append(ret, cfStringGetGoString(cfStr)) - } - } - return ret -} - -func writeConf() { - cfDictProxy := C.CFDictionaryRef(C.CFNetworkCopySystemProxySettings()) - defer C.CFRelease(C.CFTypeRef(cfDictProxy)) - darwinProxyConf = ProxyConf{} - - cfNumHttpEnable := C.CFNumberRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesHTTPEnable))) - if unsafe.Pointer(cfNumHttpEnable) != C.NULL && cfNumberGetGoInt(cfNumHttpEnable) > 0 { - darwinProxyConf.Static.Active = true - if darwinProxyConf.Static.Protocols == nil { - darwinProxyConf.Static.Protocols = make(map[string]string) - } - httpHost := C.CFStringRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesHTTPProxy))) - httpPort := C.CFNumberRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesHTTPPort))) - - httpProxy := fmt.Sprintf("%s:%d", cfStringGetGoString(httpHost), cfNumberGetGoInt(httpPort)) - darwinProxyConf.Static.Protocols["http"] = httpProxy - } - - cfNumHttpsEnable := C.CFNumberRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesHTTPSEnable))) - if unsafe.Pointer(cfNumHttpsEnable) != C.NULL && cfNumberGetGoInt(cfNumHttpsEnable) > 0 { - darwinProxyConf.Static.Active = true - if darwinProxyConf.Static.Protocols == nil { - darwinProxyConf.Static.Protocols = make(map[string]string) - } - httpsHost := C.CFStringRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesHTTPSProxy))) - httpsPort := C.CFNumberRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesHTTPSPort))) - - httpProxy := fmt.Sprintf("%s:%d", cfStringGetGoString(httpsHost), cfNumberGetGoInt(httpsPort)) - darwinProxyConf.Static.Protocols["https"] = httpProxy - } - - if darwinProxyConf.Static.Active { - cfArrayExceptionList := C.CFArrayRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesExceptionsList))) - if unsafe.Pointer(cfArrayExceptionList) != C.NULL { - exceptionList := cfArrayGetGoStrings(cfArrayExceptionList) - darwinProxyConf.Static.NoProxy = strings.Join(exceptionList, ",") - } - } - - cfNumPacEnable := C.CFNumberRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesProxyAutoConfigEnable))) - if unsafe.Pointer(cfNumPacEnable) != C.NULL && cfNumberGetGoInt(cfNumPacEnable) > 0 { - cfStringPac := C.CFStringRef(C.CFDictionaryGetValue(cfDictProxy, unsafe.Pointer(C.kCFNetworkProxiesProxyAutoConfigURLString))) - if unsafe.Pointer(cfStringPac) != C.NULL { - pac := cfStringGetGoString(cfStringPac) - darwinProxyConf.Automatic.PreConfiguredURL = pac - darwinProxyConf.Automatic.Active = true - } - } -} - -// OverrideEnvWithStaticProxy writes new values to the -// http_proxy, https_proxy and no_proxy environment variables. -// The values are taken from the MacOS System Preferences. -func overrideEnvWithStaticProxy(conf ProxyConf, setenv envSetter) { - if conf.Static.Active { - for _, scheme := range []string{"http", "https"} { - url := conf.Static.Protocols[scheme] - if url != "" { - setenv(scheme+"_proxy", url) - } - } - if conf.Static.NoProxy != "" { - setenv("no_proxy", conf.Static.NoProxy) - } - } -} diff --git a/vendor/github.com/mattn/go-ieproxy/ieproxy_unix.go b/vendor/github.com/mattn/go-ieproxy/ieproxy_unix.go index 86682f441..dc2bccfc2 100644 --- a/vendor/github.com/mattn/go-ieproxy/ieproxy_unix.go +++ b/vendor/github.com/mattn/go-ieproxy/ieproxy_unix.go @@ -1,5 +1,4 @@ -//go:build (!windows && !darwin) || !cgo -// +build !windows,!darwin !cgo +// +build !windows package ieproxy @@ -7,9 +6,5 @@ func getConf() ProxyConf { return ProxyConf{} } -func reloadConf() ProxyConf { - return getConf() -} - func overrideEnvWithStaticProxy(pc ProxyConf, setenv envSetter) { } diff --git a/vendor/github.com/mattn/go-ieproxy/ieproxy_windows.go b/vendor/github.com/mattn/go-ieproxy/ieproxy_windows.go index 7fd375017..c7b29c0b3 100644 --- a/vendor/github.com/mattn/go-ieproxy/ieproxy_windows.go +++ b/vendor/github.com/mattn/go-ieproxy/ieproxy_windows.go @@ -24,12 +24,6 @@ func getConf() ProxyConf { return windowsProxyConf } -// reloadConf forces a reload of the proxy configuration from the Windows registry -func reloadConf() ProxyConf { - writeConf() - return getConf() -} - func writeConf() { proxy := "" proxyByPass := "" @@ -48,7 +42,7 @@ func writeConf() { autoDetect = ieCfg.fAutoDetect } - if proxy == "" && !autoDetect { + if proxy == "" && !autoDetect{ // Try WinHTTP default proxy. if defaultCfg, err := getDefaultProxyConfiguration(); err == nil { defer globalFreeWrapper(defaultCfg.lpszProxy) diff --git a/vendor/github.com/mattn/go-ieproxy/pac_darwin.go b/vendor/github.com/mattn/go-ieproxy/pac_darwin.go deleted file mode 100644 index a8bf90e94..000000000 --- a/vendor/github.com/mattn/go-ieproxy/pac_darwin.go +++ /dev/null @@ -1,141 +0,0 @@ -package ieproxy - -/* -#cgo LDFLAGS: -framework CoreFoundation -#cgo LDFLAGS: -framework CFNetwork -#include -#include - -#define STR_LEN 128 - -void proxyAutoConfCallback(void* client, CFArrayRef proxies, CFErrorRef error) { - CFTypeRef* result_ptr = (CFTypeRef*)client; - if (error != NULL) { - *result_ptr = CFRetain(error); - } else { - *result_ptr = CFRetain(proxies); - } - CFRunLoopStop(CFRunLoopGetCurrent()); -} - -int intCFNumber(CFNumberRef num) { - int ret; - CFNumberGetValue(num, kCFNumberIntType, &ret); - return ret; -} - -char* _getProxyUrlFromPac(char* pac, char* reqCs) { - char* retCString = (char*)calloc(STR_LEN, sizeof(char)); - - CFStringRef reqStr = CFStringCreateWithCString(NULL, reqCs, kCFStringEncodingUTF8); - CFStringRef pacStr = CFStringCreateWithCString(NULL, pac, kCFStringEncodingUTF8); - CFURLRef pacUrl = CFURLCreateWithString(NULL, pacStr, NULL); - CFURLRef reqUrl = CFURLCreateWithString(NULL, reqStr, NULL); - - CFTypeRef result = NULL; - CFStreamClientContext context = { 0, &result, NULL, NULL, NULL }; - CFRunLoopSourceRef runloop_src = CFNetworkExecuteProxyAutoConfigurationURL(pacUrl, reqUrl, proxyAutoConfCallback, &context); - - if (runloop_src) { - const CFStringRef private_runloop_mode = CFSTR("go-ieproxy"); - CFRunLoopAddSource(CFRunLoopGetCurrent(), runloop_src, private_runloop_mode); - CFRunLoopRunInMode(private_runloop_mode, DBL_MAX, false); - CFRunLoopRemoveSource(CFRunLoopGetCurrent(), runloop_src, kCFRunLoopCommonModes); - - if (CFGetTypeID(result) == CFArrayGetTypeID()) { - CFArrayRef resultArray = (CFTypeRef)result; - if (CFArrayGetCount(resultArray) > 0) { - CFDictionaryRef pxy = (CFDictionaryRef)CFArrayGetValueAtIndex(resultArray, 0); - CFStringRef pxyType = CFDictionaryGetValue(pxy, kCFProxyTypeKey); - - if (CFEqual(pxyType, kCFProxyTypeNone)) { - // noop - } - - if (CFEqual(pxyType, kCFProxyTypeHTTP)) { - CFStringRef host = (CFStringRef)CFDictionaryGetValue(pxy, kCFProxyHostNameKey); - CFNumberRef port = (CFNumberRef)CFDictionaryGetValue(pxy, kCFProxyPortNumberKey); - - char host_str[STR_LEN - 16]; - CFStringGetCString(host, host_str, STR_LEN - 16, kCFStringEncodingUTF8); - - int port_int = 80; - if (port) { - CFNumberGetValue(port, kCFNumberIntType, &port_int); - } - - sprintf(retCString, "%s:%d", host_str, port_int); - } - } - } else { - // error - } - } - - CFRelease(result); - CFRelease(reqStr); - CFRelease(reqUrl); - CFRelease(pacStr); - CFRelease(pacUrl); - return retCString; -} - -char* _getPacUrl() { - char* retCString = (char*)calloc(STR_LEN, sizeof(char)); - CFDictionaryRef proxyDict = CFNetworkCopySystemProxySettings(); - CFNumberRef pacEnable = (CFNumberRef)CFDictionaryGetValue(proxyDict, kCFNetworkProxiesProxyAutoConfigEnable); - - if (pacEnable && intCFNumber(pacEnable)) { - CFStringRef pacUrlStr = (CFStringRef)CFDictionaryGetValue(proxyDict, kCFNetworkProxiesProxyAutoConfigURLString); - if (pacUrlStr) { - CFStringGetCString(pacUrlStr, retCString, STR_LEN, kCFStringEncodingUTF8); - } - } - - CFRelease(proxyDict); - return retCString; -} - -*/ -import "C" -import ( - "net/url" - "unsafe" -) - -func (psc *ProxyScriptConf) findProxyForURL(URL string) string { - if !psc.Active { - return "" - } - proxy := getProxyForURL(psc.PreConfiguredURL, URL) - return proxy -} - -func getProxyForURL(pacFileURL, targetURL string) string { - if pacFileURL == "" { - pacFileURL = getPacUrl() - } - if pacFileURL == "" { - return "" - } - if u, err := url.Parse(pacFileURL); err != nil || u.Scheme == "" { - return "" - } - - csUrl := C.CString(targetURL) - csPac := C.CString(pacFileURL) - csRet := C._getProxyUrlFromPac(csPac, csUrl) - - defer C.free(unsafe.Pointer(csUrl)) - defer C.free(unsafe.Pointer(csPac)) - defer C.free(unsafe.Pointer(csRet)) - - return C.GoString(csRet) -} - -func getPacUrl() string { - csRet := C._getPacUrl() - - defer C.free(unsafe.Pointer(csRet)) - return C.GoString(csRet) -} diff --git a/vendor/github.com/mattn/go-ieproxy/pac_unix.go b/vendor/github.com/mattn/go-ieproxy/pac_unix.go index 94a48f0fb..d44ec3cca 100644 --- a/vendor/github.com/mattn/go-ieproxy/pac_unix.go +++ b/vendor/github.com/mattn/go-ieproxy/pac_unix.go @@ -1,5 +1,4 @@ -//go:build (!windows && !darwin) || !cgo -// +build !windows,!darwin !cgo +// +build !windows package ieproxy diff --git a/vendor/github.com/mattn/go-ieproxy/proxy_middleman_darwin.go b/vendor/github.com/mattn/go-ieproxy/proxy_middleman_darwin.go deleted file mode 100644 index a89948dca..000000000 --- a/vendor/github.com/mattn/go-ieproxy/proxy_middleman_darwin.go +++ /dev/null @@ -1,43 +0,0 @@ -package ieproxy - -import ( - "net/http" - "net/url" - - "golang.org/x/net/http/httpproxy" -) - -func proxyMiddleman() func(req *http.Request) (i *url.URL, e error) { - // Get the proxy configuration - conf := GetConf() - envCfg := httpproxy.FromEnvironment() - - if envCfg.HTTPProxy != "" || envCfg.HTTPSProxy != "" { - // If the user manually specifies environment variables, prefer those over the MacOS config. - return http.ProxyFromEnvironment - } - - return func(req *http.Request) (i *url.URL, e error) { - if conf.Automatic.Active { - host := conf.Automatic.FindProxyForURL(req.URL.String()) - if host != "" { - return &url.URL{Host: host}, nil - } - } - if conf.Static.Active { - return staticProxy(conf, req) - } - // Should return no proxy; fallthrough. - return http.ProxyFromEnvironment(req) - } -} - -func staticProxy(conf ProxyConf, req *http.Request) (i *url.URL, e error) { - // If static proxy obtaining is specified - proxy := httpproxy.Config{ - HTTPSProxy: conf.Static.Protocols["https"], - HTTPProxy: conf.Static.Protocols["http"], - NoProxy: conf.Static.NoProxy, - } - return proxy.ProxyFunc()(req.URL) -} diff --git a/vendor/github.com/mattn/go-ieproxy/proxy_middleman_unix.go b/vendor/github.com/mattn/go-ieproxy/proxy_middleman_unix.go index fe227a12e..d0b16ec28 100644 --- a/vendor/github.com/mattn/go-ieproxy/proxy_middleman_unix.go +++ b/vendor/github.com/mattn/go-ieproxy/proxy_middleman_unix.go @@ -1,5 +1,4 @@ -//go:build !windows && !darwin -// +build !windows,!darwin +// +build !windows package ieproxy diff --git a/vendor/modules.txt b/vendor/modules.txt index 036227ebb..227f41d9e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -152,7 +152,7 @@ github.com/klauspost/compress/internal/cpuinfo github.com/klauspost/compress/internal/snapref github.com/klauspost/compress/zstd github.com/klauspost/compress/zstd/internal/xxhash -# github.com/mattn/go-ieproxy v0.0.9 +# github.com/mattn/go-ieproxy v0.0.1 ## explicit; go 1.14 github.com/mattn/go-ieproxy # github.com/mtibben/percent v0.2.1